Skip to content
Snippets Groups Projects
Commit f25fb52e authored by Emma Anholt's avatar Emma Anholt Committed by Emil Velikov
Browse files

vc4: Make sure we make ro scanout resources for create_with_modifiers.

The DRI3 create_with_modifiers paths don't set tmpl.bind to SCANOUT or
SHARED, with the theory that given that you've got modifiers, that's all
you need.  However, we were looking at the tmpl.bind for setting up the
KMS handle in the renderonly case, so we'd end up trying to use vc4's
handle on the hx8357d fd.

Fixes: 84ed8b67 ("vc4: Set shareable BOs as T tiled if possible")
(cherry picked from commit cc0bc76a)
parent 0b48c82a
No related branches found
Tags mesa-22.0.3
No related merge requests found
......@@ -572,7 +572,15 @@ vc4_resource_create_with_modifiers(struct pipe_screen *pscreen,
goto fail;
}
if (screen->ro && tmpl->bind & PIPE_BIND_SCANOUT) {
/* Set up the "scanout resource" (the dmabuf export of our buffer to
* the KMS handle) if the buffer might ever have
* resource_get_handle(WINSYS_HANDLE_TYPE_KMS) called on it.
* create_with_modifiers() doesn't give us usage flags, so we have to
* assume that all calls with modifiers are scanout-possible.
*/
if (screen->ro &&
((tmpl->bind & PIPE_BIND_SCANOUT) ||
!(count == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID))) {
rsc->scanout =
renderonly_scanout_for_resource(prsc, screen->ro, NULL);
if (!rsc->scanout)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment