]> code.ossystems Code Review - meta-freescale.git/commitdiff
libdrm: Remove unused patches
authorOtavio Salvador <otavio@ossystems.com.br>
Fri, 29 Jun 2018 17:02:25 +0000 (14:02 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Fri, 29 Jun 2018 17:16:32 +0000 (14:16 -0300)
Since we are using the NXP's fork of libdrm, we can now drop the fork
and as consequence the SoC architecture setting for it.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
recipes-graphics/drm/libdrm/mx6/drm-update-arm.patch [deleted file]
recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch [deleted file]
recipes-graphics/drm/libdrm_%.bbappend [deleted file]

diff --git a/recipes-graphics/drm/libdrm/mx6/drm-update-arm.patch b/recipes-graphics/drm/libdrm/mx6/drm-update-arm.patch
deleted file mode 100644 (file)
index 1160cd1..0000000
+++ /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 <lauren.post@freescale.com>
-Signed-off-by: Evan Kotara <evan.kotara@freescale.com>
-
-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/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch b/recipes-graphics/drm/libdrm/mx7/drm-update-arm.patch
deleted file mode 100644 (file)
index 1160cd1..0000000
+++ /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 <lauren.post@freescale.com>
-Signed-off-by: Evan Kotara <evan.kotara@freescale.com>
-
-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/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend
deleted file mode 100644 (file)
index 97b6df9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append_imxgpu2d = " file://drm-update-arm.patch"
-
-PACKAGE_ARCH_imxgpu2d = "${MACHINE_SOCARCH}"