panfrost: Unset shared/scanout binding flags for staging resources

Fixes Xwayland crashes when starting non-GL applications.

Fixes: e00d94f14f ("panfrost: Enable AFBC buffer sharing")
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10266>
(cherry picked from commit 3af12216e3)
This commit is contained in:
Icecream95 2021-04-16 09:45:48 +12:00 committed by Eric Engestrom
parent 48f8188985
commit c94c36ece0
2 changed files with 2 additions and 1 deletions

View file

@ -787,7 +787,7 @@
"description": "panfrost: Unset shared/scanout binding flags for staging resources",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "e00d94f14f7f75d4974c1d48b4ec177f052723d3"
},

View file

@ -732,6 +732,7 @@ pan_alloc_staging(struct panfrost_context *ctx, struct panfrost_resource *rsc,
}
tmpl.last_level = 0;
tmpl.bind |= PIPE_BIND_LINEAR;
tmpl.bind &= ~(PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED);
struct pipe_resource *pstaging =
pctx->screen->resource_create(pctx->screen, &tmpl);