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

egl/dri2: Allow modifiers to add FDs to imports

Browse source 
When using dmabuf import, make sure that the modifier is actually
allowed to add planes to the base format, as implied by the comment.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Daniel Stone 2017-07-31 18:34:57 +01:00
parent 81615ad444
commit 7d26a52a7a
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/egl/drivers/dri2/egl_dri2.c
View file

@ -2155,6 +2155,24 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs)
return 0;
}
for (unsigned i = plane_n; i < DMA_BUF_MAX_PLANES; i++) {
/**
* The modifiers extension spec says:
*
* "Modifiers may modify any attribute of a buffer import, including
* but not limited to adding extra planes to a format which
* otherwise does not have those planes. As an example, a modifier
* may add a plane for an external compression buffer to a
* single-plane format. The exact meaning and effect of any
* modifier is canonically defined by drm_fourcc.h, not as part of
* this extension."
*/
if (attrs->DMABufPlaneModifiersLo[i].IsPresent &&
attrs->DMABufPlaneModifiersHi[i].IsPresent) {
plane_n = i + 1;
}
}
/**
* The spec says:
*
@ -2181,25 +2199,7 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs)
for (unsigned i = plane_n; i < DMA_BUF_MAX_PLANES; ++i) {
if (attrs->DMABufPlaneFds[i].IsPresent ||
attrs->DMABufPlaneOffsets[i].IsPresent ||
attrs->DMABufPlanePitches[i].IsPresent ||
attrs->DMABufPlaneModifiersLo[i].IsPresent ||
attrs->DMABufPlaneModifiersHi[i].IsPresent) {
/**
* The modifiers extension spec says:
*
* "Modifiers may modify any attribute of a buffer import, including
* but not limited to adding extra planes to a format which
* otherwise does not have those planes. As an example, a modifier
* may add a plane for an external compression buffer to a
* single-plane format. The exact meaning and effect of any
* modifier is canonically defined by drm_fourcc.h, not as part of
* this extension."
*/
if (attrs->DMABufPlaneModifiersLo[i].IsPresent &&
attrs->DMABufPlaneModifiersHi[i].IsPresent)
continue;
attrs->DMABufPlanePitches[i].IsPresent) {
_eglError(EGL_BAD_ATTRIBUTE, "too many plane attributes");
return 0;
}