diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-08 20:31:15 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-09 16:37:15 +0100 |
| commit | d169606c547796731f528c4649295c4c1c928ea4 (patch) | |
| tree | fb4023c0cf911b27614a03dec46417c57fead103 /meta/recipes-graphics/kmscube | |
| parent | 8edbb540be564cebb72d7af38429405aca662bc9 (diff) | |
| download | openembedded-core-d169606c547796731f528c4649295c4c1c928ea4.tar.gz | |
kmscube: address linux 5.19 fails
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/kmscube')
| -rw-r--r-- | meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-graphics/kmscube/kmscube_git.bb | 6 |
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch b/meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch new file mode 100644 index 0000000000..58ff3ba561 --- /dev/null +++ b/meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch @@ -0,0 +1,27 @@ +From bdde833c254092a47df6c7109a9751653c82aaae Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 8 Aug 2022 20:22:39 +0200 +Subject: [PATCH] drm-common.c: do not use invalid modifier + +Prior to kernel 5.19 this was a soft failure, but 5.19 +adds checks that result in a hard syscall fail. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/33] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + drm-common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drm-common.c b/drm-common.c +index 5c9cca2..964e1c3 100644 +--- a/drm-common.c ++++ b/drm-common.c +@@ -92,7 +92,7 @@ struct drm_fb * drm_fb_get_from_bo(struct gbm_bo *bo) + modifiers[i] = modifiers[0]; + } + +- if (modifiers[0]) { ++ if (modifiers[0] && modifiers[0] != DRM_FORMAT_MOD_INVALID) { + flags = DRM_MODE_FB_MODIFIERS; + printf("Using modifier %" PRIx64 "\n", modifiers[0]); + } diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 58ce26a3d5..f7ee6e4e10 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -11,8 +11,10 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" -SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" -SRC_URI += "file://0001-texturator-Use-correct-GL-extension-header.patch" +SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ + file://0001-texturator-Use-correct-GL-extension-header.patch \ + file://0001-drm-common.c-do-not-use-invalid-modifier.patch \ + " UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" |