fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 17:10:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

etnaviv: 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: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12074>
(cherry picked from commit 9da901d2b2)
This commit is contained in:
Simon Ser 2021-07-27 08:55:02 +02:00 • committed by Dylan Baker
parent 1396ddcc4e
commit bda17c7388
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -274,7 +274,7 @@
"description": "etnaviv: 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/etnaviv/etnaviv_resource.c
View file

@ -580,6 +580,7 @@ etna_resource_get_handle(struct pipe_screen *pscreen,
struct pipe_resource *prsc,
struct winsys_handle *handle, unsigned usage)
{
struct etna_screen *screen = etna_screen(pscreen);
struct etna_resource *rsc = etna_resource(prsc);
struct renderonly_scanout *scanout;
@ -607,8 +608,8 @@ etna_resource_get_handle(struct pipe_screen *pscreen,
if (handle->type == WINSYS_HANDLE_TYPE_SHARED) {
return etna_bo_get_name(rsc->bo, &handle->handle) == 0;
} else if (handle->type == WINSYS_HANDLE_TYPE_KMS) {
if (renderonly_get_handle(scanout, handle)) {
return true;
if (screen->ro) {
return renderonly_get_handle(scanout, handle);
} else {
handle->handle = etna_bo_handle(rsc->bo);
return true;