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

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>
This commit is contained in:
Simon Ser 2021-07-27 09:04:14 +02:00
parent 4c092947df
commit 47f000c170

View file

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