From 50594727bd01adbd3b5ac609d0f86da66048943b Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Thu, 3 Apr 2025 13:18:24 +0200 Subject: [PATCH] v3dv: don't check if DRM device is master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was added to ensure we can get its resources, but they can be obtained also from non master. Fixes: 2af12c5b36e ("v3dv: Check multiple DRM primary nodes before picking the display fd") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12641 Signed-off-by: Juan A. Suarez Romero Reviewed-by: Maíra Canal Reviewed-by: Iago Toral Quiroga Part-of: (cherry picked from commit 8742927d8f7bd65a529957230efd6d853e4fc4c9) --- .pick_status.json | 2 +- src/broadcom/vulkan/v3dv_device.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 02092edc5b1..3d3c8c47570 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1724,7 +1724,7 @@ "description": "v3dv: don't check if DRM device is master", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2af12c5b36ec8591cff812e91cb117929de5f84e", "notes": null diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index f9181fda0ec..09448f20f77 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -1508,10 +1508,6 @@ try_display_device(struct v3dv_instance *instance, const char *path, goto fail; } - /* If the display device isn't the DRM master, we can't get its resources */ - if (!drmIsMaster(*fd)) - goto fail; - drmModeResPtr mode_res = drmModeGetResources(*fd); if (!mode_res) { mesa_loge("Failed to get DRM mode resources: %s\n", strerror(errno));