kmscube: address linux 5.19 fails

(From OE-Core rev: d169606c547796731f528c4649295c4c1c928ea4)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-08-08 20:31:15 +02:00
committed by Richard Purdie
parent 8bc77f0dc6
commit 8b99059878
2 changed files with 31 additions and 2 deletions

View File

@@ -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]);
}

View File

@@ -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"