diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf index c08356d8b..c2cd21f54 100644 --- a/meta-digi-dey/conf/layer.conf +++ b/meta-digi-dey/conf/layer.conf @@ -14,6 +14,8 @@ BBFILE_COLLECTIONS += "digi-dey" BBFILE_PATTERN_digi-dey := "^${LAYERDIR}/" BBFILE_PRIORITY_digi-dey = "6" +BBMASK += "meta-freescale/recipes-graphics/drm/libdrm_%.bbappend" + LAYERDEPENDS_digi-dey = "core digi-arm" LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate" diff --git a/meta-digi-dey/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/meta-digi-dey/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch index bf526370b..fa7b218e0 100644 --- a/meta-digi-dey/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch +++ b/meta-digi-dey/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch @@ -1,22 +1,23 @@ -From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001 +From 9be904a70e6b7e6b3cc4e1b270bca02d14a4179b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 5 Sep 2016 14:41:37 +0300 -Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests +Subject: [PATCH] configure.ac: Allow explicit enabling of cunit tests Add --with-cunit to make it easier to do reproducible builds. Default is still to probe cunit and build opportunistically. Signed-off-by: Jussi Kukkonen Upstream-Status: Submitted [mailing list] + --- configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index e3048c7..918d21d 100644 +index 1341f51..bef46e0 100644 --- a/configure.ac +++ b/configure.ac -@@ -137,6 +137,12 @@ AC_ARG_ENABLE(install-test-programs, +@@ -168,6 +168,12 @@ AC_ARG_ENABLE(install-test-programs, [Install test programs (default: no)]), [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) @@ -29,8 +30,8 @@ index e3048c7..918d21d 100644 dnl =========================================================================== dnl check compiler flags AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ -@@ -372,7 +378,7 @@ if test "x$RADEON" = xyes; then - AC_DEFINE(HAVE_RADEON, 1, [Have radeon support]) +@@ -416,7 +422,7 @@ else + AC_DEFINE(HAVE_RADEON, 0) fi -if test "x$AMDGPU" != xno; then @@ -38,8 +39,8 @@ index e3048c7..918d21d 100644 # Detect cunit library PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We -@@ -399,7 +406,11 @@ if test "x$AMDGPU" = xyes; then - AC_DEFINE(HAVE_CUNIT, [test "x$have_cunit" != "xno"], [Enable CUNIT Have amdgpu support]) +@@ -441,7 +447,11 @@ if test "x$AMDGPU" = xyes; then + AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support]) if test "x$have_cunit" = "xno"; then - AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) @@ -49,8 +50,5 @@ index e3048c7..918d21d 100644 + AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) + fi fi - fi - --- -2.1.4 - + else + AC_DEFINE(HAVE_AMDGPU, 0) diff --git a/meta-digi-dey/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch b/meta-digi-dey/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch index 4708bf1eb..ab9729b74 100644 --- a/meta-digi-dey/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch +++ b/meta-digi-dey/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch @@ -1,4 +1,7 @@ -drmdevice.c: define _GNU_SOURCE +From 860a227277ab425b0377875adc7ff5bdf3fa206e Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Fri, 13 Oct 2017 10:52:35 -0500 +Subject: [PATCH] drmdevice.c: define _GNU_SOURCE Include config.h to fix this build error with uclibc: @@ -10,10 +13,15 @@ fd = open(devices[i]->nodes[j],O_RDONLY | O_CLOEXEC, 0); Upstream-Status: Pending Signed-off-by: Maxin B. John + --- -diff -Naur libdrm-2.4.66-orig/tests/drmdevice.c libdrm-2.4.66/tests/drmdevice.c ---- libdrm-2.4.66-orig/tests/drmdevice.c 2016-02-23 11:34:02.054904502 +0200 -+++ libdrm-2.4.66/tests/drmdevice.c 2016-02-23 11:35:34.371750383 +0200 + tests/drmdevice.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/drmdevice.c b/tests/drmdevice.c +index 9dd5098..78fcc39 100644 +--- a/tests/drmdevice.c ++++ b/tests/drmdevice.c @@ -21,6 +21,7 @@ * */ diff --git a/meta-digi-dey/recipes-graphics/drm/libdrm/installtests.patch b/meta-digi-dey/recipes-graphics/drm/libdrm/installtests.patch index ec1fb0236..b5456dec2 100644 --- a/meta-digi-dey/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta-digi-dey/recipes-graphics/drm/libdrm/installtests.patch @@ -1,4 +1,4 @@ -From 5c6eb43c2f6e7f2ee7c25c92e42f4e4403fa0527 Mon Sep 17 00:00:00 2001 +From 14e42311309712228588fc9adf612b2ab3f0097f Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 21 Feb 2017 14:37:52 +0200 Subject: [PATCH] tests: also install test apps @@ -7,6 +7,7 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Yu Ke Signed-off-by: Jussi Kukkonen + --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) @@ -20,6 +21,3 @@ index 0355a92..b4882cd 100644 $(TESTS) \ drmdevice +bin_PROGRAMS = $(check_PROGRAMS) --- -2.1.4 - diff --git a/meta-digi-dey/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch b/meta-digi-dey/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch deleted file mode 100644 index 1160cd10a..000000000 --- a/meta-digi-dey/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch +++ /dev/null @@ -1,35 +0,0 @@ -Add ARM support into xf86arm.h. This provides support for Xorg interface. -Without this the vivante samples will hang during close requiring a reboot - -Upstream-Status: Pending - -Signed-off-by: Lauren Post -Signed-off-by: Evan Kotara - -diff --git a/xf86drm.h b/xf86drm.h ---- a/xf86drm.h -+++ b/xf86drm.h -@@ -461,6 +461,23 @@ do { register unsigned int __old __asm(" - : "cr0", "memory"); \ - } while (0) - -+#elif defined(__arm__) -+ #undef DRM_DEV_MODE -+ #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) -+ -+ #define DRM_CAS(lock,old,new,__ret) \ -+ do { \ -+ __asm__ __volatile__ ( \ -+ "1: ldrex %0, [%1]\n" \ -+ " teq %0, %2\n" \ -+ " ite eq\n" \ -+ " strexeq %0, %3, [%1]\n" \ -+ " movne %0, #1\n" \ -+ : "=&r" (__ret) \ -+ : "r" (lock), "r" (old), "r" (new) \ -+ : "cc","memory"); \ -+ } while (0) -+ - #endif /* architecture */ - #endif /* __GNUC__ >= 2 */ - diff --git a/meta-digi-dey/recipes-graphics/drm/libdrm_%.bbappend b/meta-digi-dey/recipes-graphics/drm/libdrm_%.bbappend deleted file mode 100644 index 3b3641066..000000000 --- a/meta-digi-dey/recipes-graphics/drm/libdrm_%.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https" -IMX_LIBDRM_BRANCH = "libdrm-imx-2.4.84" -SRC_URI_remove = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2" -SRC_URI_remove_mx8 = "file://drm-update-arm.patch" -SRC_URI_prepend = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} " -SRCREV = "c70adff9b5b8ffd98217c51e0c9b9bb424c9ae16" - -S = "${WORKDIR}/git" - -EXTRA_OECONF_append_imxgpu = " --enable-vivante-experimental-api" - -PACKAGES_prepend_imxgpu = "${PN}-vivante " - -RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante" - -FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*" diff --git a/meta-digi-dey/recipes-graphics/drm/libdrm_2.4.84.bb b/meta-digi-dey/recipes-graphics/drm/libdrm_2.4.91.imx.bb similarity index 73% rename from meta-digi-dey/recipes-graphics/drm/libdrm_2.4.84.bb rename to meta-digi-dey/recipes-graphics/drm/libdrm_2.4.91.imx.bb index 2ea2216f0..dad9a5198 100644 --- a/meta-digi-dey/recipes-graphics/drm/libdrm_2.4.84.bb +++ b/meta-digi-dey/recipes-graphics/drm/libdrm_2.4.91.imx.bb @@ -10,18 +10,18 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs libpciaccess" -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ +IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https" +IMX_LIBDRM_BRANCH = "libdrm-imx-2.4.91" +SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ file://installtests.patch \ file://fix_O_CLOEXEC_undeclared.patch \ file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ " +SRCREV = "49cca25f6319f3607b121093e46e474fe528aa39" -SRC_URI[md5sum] = "35b9544bc2ad864acd1abaa1a2b99092" -SRC_URI[sha256sum] = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa" +DEFAULT_PREFERENCE = "-1" -# IMX: Remove manpages which is added in pyro -#inherit autotools pkgconfig manpages -inherit autotools pkgconfig +inherit autotools pkgconfig manpages EXTRA_OECONF += "--disable-cairo-tests \ --without-cunit \ @@ -30,9 +30,7 @@ EXTRA_OECONF += "--disable-cairo-tests \ --enable-install-test-programs \ --disable-valgrind \ " -# IMX: Remove manpages which is added in pyro -#PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -EXTRA_OECONF += "--disable-manpages" +PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ @@ -53,3 +51,15 @@ FILES_${PN}-kms = "${libdir}/libkms*.so.*" FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" + +EXTRA_OECONF_append_imxgpu = " --enable-vivante-experimental-api" + +PACKAGES_prepend_imxgpu = "${PN}-vivante " + +RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante" + +FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*" + +S = "${WORKDIR}/git" + +PACKAGE_ARCH_imxgpu2d = "${MACHINE_SOCARCH}"