From be91292d155b734acbabb13501e4781a7211cdcb Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 9 Feb 2017 02:04:01 +1000 Subject: xf86-video-armsoc: Update to 1.4.1 Update to the 1.4.1 version of the armsoc driver to handle compatibility with newer versions of X11 as available in oe-core. Modify the driver patch to work with the new version which auto-detects which drmmode driver to use. Signed-off-by: Nathan Rossi --- ..._xilinx-Add-the-dumb-gem-support-for-Xili.patch | 65 ++++++++++++++++++---- .../0002-enable-subdir-objects.patch | 16 ------ .../xorg-driver/xf86-video-armsoc_git.bb | 9 ++- 3 files changed, 57 insertions(+), 33 deletions(-) delete mode 100644 recipes-graphics/xorg-driver/xf86-video-armsoc/0002-enable-subdir-objects.patch diff --git a/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch b/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch index c99392e3..50f43393 100644 --- a/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch +++ b/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch @@ -1,21 +1,65 @@ -From 622db2862220b8fc2ae56e9caceac70cbb0c15ce Mon Sep 17 00:00:00 2001 +From 630a8ea035fe2f075f6ea7f4bad0928f5b541c80 Mon Sep 17 00:00:00 2001 From: Hyun Kwon Date: Wed, 21 Jan 2015 11:53:19 -0800 -Subject: [PATCH 1/1] src: drmmode_xilinx: Add the dumb gem support for Xilinx +Subject: [PATCH] src: drmmode_xilinx: Add the dumb gem support for Xilinx Add the dumb gem support for Xilinx + +Signed-off-by: Hyun Kwon +Signed-off-by: Nathan Rossi Upstream-Status: Pending --- - src/drmmode_xilinx/drmmode_xilinx.c | 80 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 80 insertions(+) + src/Makefile.am | 3 +- + src/armsoc_driver.c | 1 + + src/drmmode_driver.h | 1 + + src/drmmode_xilinx/drmmode_xilinx.c | 76 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/drmmode_xilinx/drmmode_xilinx.c +diff --git a/src/Makefile.am b/src/Makefile.am +index 3b2601927c..db5f110fb2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -43,7 +43,8 @@ armsoc_drv_ladir = @moduledir@/drivers + DRMMODE_SRCS = drmmode_exynos/drmmode_exynos.c \ + drmmode_pl111/drmmode_pl111.c \ + drmmode_kirin/drmmode_kirin.c \ +- drmmode_sti/drmmode_sti.c ++ drmmode_sti/drmmode_sti.c \ ++ drmmode_xilinx/drmmode_xilinx.c + + + armsoc_drv_la_SOURCES = \ +diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c +index 83e74a7ed1..3ace3c7be5 100644 +--- a/src/armsoc_driver.c ++++ b/src/armsoc_driver.c +@@ -737,6 +737,7 @@ static struct drmmode_interface *get_drmmode_implementation(int drm_fd) + &pl111_interface, + &kirin_interface, + &sti_interface, ++ &xilinx_interface, + }; + int i; + +diff --git a/src/drmmode_driver.h b/src/drmmode_driver.h +index 879fc60ddc..18245d591a 100644 +--- a/src/drmmode_driver.h ++++ b/src/drmmode_driver.h +@@ -106,6 +106,7 @@ extern struct drmmode_interface exynos_interface; + extern struct drmmode_interface pl111_interface; + extern struct drmmode_interface kirin_interface; + extern struct drmmode_interface sti_interface; ++extern struct drmmode_interface xilinx_interface; + + + #endif diff --git a/src/drmmode_xilinx/drmmode_xilinx.c b/src/drmmode_xilinx/drmmode_xilinx.c new file mode 100644 -index 0000000..2cd4e35 +index 0000000000..f4faceb0b4 --- /dev/null +++ b/src/drmmode_xilinx/drmmode_xilinx.c -@@ -0,0 +1,80 @@ +@@ -0,0 +1,76 @@ +/* + * Xilinx X11 ARMSOC driver + * @@ -80,6 +124,7 @@ index 0000000..2cd4e35 +} + +struct drmmode_interface xilinx_interface = { ++ "xilinx_drm" /* name of drm driver */, + 1 /* use_page_flip_events */, + 1 /* use_early_display */, + 0 /* cursor width */, @@ -91,10 +136,6 @@ index 0000000..2cd4e35 + create_custom_gem /* create_custom_gem */, +}; + -+struct drmmode_interface *drmmode_interface_get_implementation(int drm_fd) -+{ -+ return &xilinx_interface; -+} -+ -- -2.1.4 +2.11.0 + diff --git a/recipes-graphics/xorg-driver/xf86-video-armsoc/0002-enable-subdir-objects.patch b/recipes-graphics/xorg-driver/xf86-video-armsoc/0002-enable-subdir-objects.patch deleted file mode 100644 index a8015ab8..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-armsoc/0002-enable-subdir-objects.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add foreign for automake -Upstream-Status: Pending ---- -diff --git a/configure.ac b/configure.ac -index eeffd92..88473a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,7 +32,7 @@ AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_INIT_AUTOMAKE([dist-bzip2 foreign subdir-objects]) - - AM_MAINTAINER_MODE - diff --git a/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb b/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb index 1186d948..2037f275 100644 --- a/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb +++ b/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb @@ -9,16 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" DEPENDS += "libx11 libdrm xf86driproto" RDEPENDS_${PN} += "xserver-xorg-module-exa" -PV = "1.3.0+git${SRCPV}" +PV = "1.4.1+git${SRCPV}" -SRCREV_pn-${PN} = "8ca8513880697f9a34d4006c43342b830bdd1ff2" +SRCREV = "8bbdb2ae3bb8ef649999a8da33ddbe11a04763b8" SRC_URI = " \ git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc \ - file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch \ - file://0002-enable-subdir-objects.patch \ + file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch \ " S = "${WORKDIR}/git" -EXTRA_OECONF = " --enable-maintainer-mode --with-drmmode=xilinx" +EXTRA_OECONF = " --enable-maintainer-mode" CFLAGS += " -I${STAGING_INCDIR}/xorg " -- cgit v1.2.3-54-g00ecf