mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-02 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

lima: fail in get_handle(TYPE_KMS) without a scanout resource

Browse Source 
The previous logic was returning a handle valid for the render-only
device if rsc->scanout was NULL. However the caller doesn't expect
this: the caller will use the handle with the KMS device.

Instead of returning a handle for the wrong device, fail if we don't
have one.

Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12074>
(cherry picked from commit 47f000c170)
This commit is contained in:
Simon Ser 2021-07-27 09:04:14 +02:00 committed by Eric Engestrom
parent 7dd32352dd
commit a7158240c3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@ -1426,7 +1426,7 @@
"description": "lima: fail in get_handle(TYPE_KMS) without a scanout resource",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

5
src/gallium/drivers/lima/lima_resource.c
View File

@ -412,9 +412,8 @@ lima_resource_get_handle(struct pipe_screen *pscreen,
else
handle->modifier = DRM_FORMAT_MOD_LINEAR;
if (handle->type == WINSYS_HANDLE_TYPE_KMS && screen->ro &&
renderonly_get_handle(res->scanout, handle))
return true;
if (handle->type == WINSYS_HANDLE_TYPE_KMS && screen->ro)
return renderonly_get_handle(res->scanout, handle);
if (!lima_bo_export(res->bo, handle))
return false;