From 06863a43a034a1f58ba34205d89d7a8974132eb0 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 29 Apr 2019 20:29:05 +0200 Subject: [PATCH] libdrm: prevent warning on mx8 i.MX8 also uses the override imxgpu2d, so provide the patch for that override, not individual SoC Archs. Prevents: | .../meta/recipes-graphics/drm/libdrm_2.4.94.bb: Unable to get checksum for libdrm SRC_URI entry drm-update-arm.patch: file could not be found Note that __arm__ is not defined in aarch64 gcc, so applying the patch has no effect. Should it be needed one would have to rework to patch to also provide assembler code for aarch64 in an appropriate #ifdef section. Signed-off-by: Max Krummenacher --- .../{mx6 => imxgpu2d}/drm-update-arm.patch | 0 .../drm/libdrm/mx7/drm-update-arm.patch | 35 ------------------- 2 files changed, 35 deletions(-) rename recipes-graphics/drm/libdrm/{mx6 => imxgpu2d}/drm-update-arm.patch (100%) delete mode 100644 recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch diff --git a/recipes-graphics/drm/libdrm/mx6/drm-update-arm.patch b/recipes-graphics/drm/libdrm/imxgpu2d/drm-update-arm.patch similarity index 100% rename from recipes-graphics/drm/libdrm/mx6/drm-update-arm.patch rename to recipes-graphics/drm/libdrm/imxgpu2d/drm-update-arm.patch diff --git a/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch b/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch deleted file mode 100644 index 1160cd10..00000000 --- a/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 */ - -- 2.40.1