fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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: 84ed8b67c5 ("vc4: Set shareable BOs as T tiled if possible")
This commit is contained in:
Eric Anholt 2018-10-25 09:12:50 -07:00
parent f9fd0cf479
commit cc0bc76a38
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/vc4/vc4_resource.c
View file

@ -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)