From 563c41a44a2ba474a2281b6c15ff678d2afc5dba Mon Sep 17 00:00:00 2001 From: Jose Maria Casanova Crespo Date: Thu, 29 Apr 2021 18:37:25 +0200 Subject: [PATCH] v3d: YUV formats at query_dmabuf_modifiers are external_only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes Issue https://github.com/Igalia/meta-webkit/issues/185 "Issue Raspberry 4-64 + Mesa VC4 driver + Gstreamer = red Label on video" Fixes: 95c4f0f91098 "v3d: Enables DRM_FORMAT_MOD_BROADCOM_SAND128 support" Reviewed-by: Alejandro Piñeiro Part-of: (cherry picked from commit 9094ad7c6a0cb45fc1f4985878603055d7ddf453) --- .pick_status.json | 2 +- src/gallium/drivers/v3d/v3d_screen.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1338ed0683a..48f235ee6ca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -238,7 +238,7 @@ "description": "v3d: YUV formats at query_dmabuf_modifiers are external_only", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "95c4f0f91098a0da5a8e8ec76cb38f2c95bafe1c" }, diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c index d68e48e5688..a8742962b82 100644 --- a/src/gallium/drivers/v3d/v3d_screen.c +++ b/src/gallium/drivers/v3d/v3d_screen.c @@ -660,10 +660,8 @@ v3d_screen_query_dmabuf_modifiers(struct pipe_screen *pscreen, for (i = 0; i < *count; i++) { modifiers[i] = v3d_available_modifiers[i]; if (external_only) - external_only[i] = - v3d_available_modifiers[i] == - DRM_FORMAT_MOD_BROADCOM_SAND128; - } + external_only[i] = util_format_is_yuv(format); + } } static bool