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

i965: Improve same-buffer restriction for imports

Browse source 
Intel hardware requires that all planes of an image come from the same
buffer, which is currently implemented by testing that all FDs are
numerically the same.

However, when going through a winsys (e.g.) or anything which transits
FDs individually, the FDs may be different even if the underlying buffer
is the same.

Instead of checking the FDs for equality, we must check if they actually
point to the same buffer (Jason).

Reviewed-by: Varad Gautam <varad.gautam@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Daniel Stone 2017-05-30 17:23:48 +05:30
parent 37cdcaf386
commit f58e6358bf
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/drivers/dri/i965/intel_screen.c
View file

@ -841,11 +841,6 @@ intel_create_image_from_fds(__DRIscreen *dri_screen,
if (fds == NULL || num_fds < 1)
return NULL;
/* We only support all planes from the same bo */
for (i = 0; i < num_fds; i++)
if (fds[0] != fds[i])
return NULL;
f = intel_image_format_lookup(fourcc);
if (f == NULL)
return NULL;
@ -872,6 +867,19 @@ intel_create_image_from_fds(__DRIscreen *dri_screen,
return NULL;
}
/* We only support all planes from the same bo.
* brw_bo_gem_create_from_prime() should return the same pointer for all
* fds received here */
for (i = 1; i < num_fds; i++) {
struct brw_bo *aux = brw_bo_gem_create_from_prime(screen->bufmgr, fds[i]);
brw_bo_unreference(aux);
if (aux != image->bo) {
brw_bo_unreference(image->bo);
free(image);
return NULL;
}
}
image->modifier = tiling_to_modifier(image->bo->tiling_mode);
tiled_height = get_tiled_height(image->modifier, height);