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

panfrost: Ensure we have ro before using it

Browse source 
Even through the resouce requested has a BIND_SCANOUT or related tag,
this does not mean that we have a render-only driver.

This can trivially happen as one requests such resource from GBM, while
using the panfrost fd (and hence panfrost_dri.so)

Forward port of !3000

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Closes: #2664
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5410>
This commit is contained in:
Alyssa Rosenzweig 2020-06-09 16:04:37 -04:00 • committed by Marge Bot
parent 64f2d45c3b
commit 5d547858da
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/panfrost/pan_resource.c
View file

@ -508,6 +508,8 @@ static struct pipe_resource *
panfrost_resource_create(struct pipe_screen *screen,
const struct pipe_resource *template)
{
struct panfrost_device *dev = pan_device(screen);
/* Make sure we're familiar */
switch (template->target) {
case PIPE_BUFFER:
@ -523,13 +525,11 @@ panfrost_resource_create(struct pipe_screen *screen,
assert(0);
}
if (template->bind &
(PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED))
if (dev->ro && (template->bind &
(PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED)))
return panfrost_create_scanout_res(screen, template);
struct panfrost_resource *so = rzalloc(screen, struct panfrost_resource);
struct panfrost_device *dev = pan_device(screen);
so->base = *template;
so->base.screen = screen;
so->internal_format = template->format;