diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-04-22 16:06:39 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-03-04 17:15:24 +0100 |
| commit | 9117fc4e71b63a1b0bbdde1a16830033a52082e7 (patch) | |
| tree | a729fbfcfa27528fa193f55e43ae486c0fc0c14e /recipes-graphics | |
| parent | ae16ab7662a4b2b265f4a9f474b2a1e197995df6 (diff) | |
libdrm: drop upstreamed patch
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/drm/files/0001-sync-kernel-UAPI.patch | 51 | ||||
| -rw-r--r-- | recipes-graphics/drm/libdrm_%.bbappend | 3 |
2 files changed, 0 insertions, 54 deletions
diff --git a/recipes-graphics/drm/files/0001-sync-kernel-UAPI.patch b/recipes-graphics/drm/files/0001-sync-kernel-UAPI.patch deleted file mode 100644 index 19e69aa..0000000 --- a/recipes-graphics/drm/files/0001-sync-kernel-UAPI.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9bfdb183a7c50266caa97e5fcbabeaf54db6c2a1 Mon Sep 17 00:00:00 2001 -From: Alexandre Courbot <acourbot@nvidia.com> -Date: Tue, 20 Sep 2016 11:33:51 +0900 -Subject: [PATCH] sync kernel UAPI - ---- - include/drm/drm_fourcc.h | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h -index 4d8da69..7fed8a2 100644 ---- a/include/drm/drm_fourcc.h -+++ b/include/drm/drm_fourcc.h -@@ -26,6 +26,10 @@ - - #include "drm.h" - -+#if defined(__cplusplus) -+extern "C" { -+#endif -+ - #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ - ((__u32)(c) << 16) | ((__u32)(d) << 24)) - -@@ -229,4 +233,23 @@ - */ - #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) - -+ -+/* NVIDIA Frame buffer modifiers */ -+ -+#define NV_FORMAT_MOD_TEGRA_SHIFT 32 -+ -+#define NV_FORMAT_MOD_TEGRA_TILED \ -+ fourcc_mod_code(NV, 1ULL << NV_FORMAT_MOD_TEGRA_SHIFT) -+ -+#define NV_FORMAT_MOD_TEGRA_BLOCK_MASK \ -+ fourcc_mod_code(NV, 2ULL << NV_FORMAT_MOD_TEGRA_SHIFT) -+#define NV_FORMAT_MOD_TEGRA_BLOCK_VALUE(m) \ -+ (m & ((1ULL << NV_FORMAT_MOD_TEGRA_SHIFT) - 1)) -+#define NV_FORMAT_MOD_TEGRA_BLOCK(v) \ -+ (NV_FORMAT_MOD_TEGRA_BLOCK_MASK | NV_FORMAT_MOD_TEGRA_BLOCK_VALUE(v)) -+ -+#if defined(__cplusplus) -+} -+#endif -+ - #endif /* DRM_FOURCC_H */ --- -2.9.3 - diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend index e08bd43..ccba7c9 100644 --- a/recipes-graphics/drm/libdrm_%.bbappend +++ b/recipes-graphics/drm/libdrm_%.bbappend @@ -1,6 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += " file://0001-sync-kernel-UAPI.patch" PACKAGES += " ${PN}-tegra" FILES_${PN}-tegra = "${libdir}/libdrm_tegra.so.*" |