[Mesa-dev] [PATCH] egl/dri2: Allow modifiers to add FDs to imports

[Philipp Zabel]

On Mon, 2017-07-31 at 18:35 +0100, Daniel Stone wrote:
> 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 at collabora.com>
> ---
>  src/egl/drivers/dri2/egl_dri2.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index b73dcd72b6..76294897a5 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -2166,8 +2166,10 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs)
>            *  this extension."
>            */
>           if (attrs->DMABufPlaneModifiersLo[i].IsPresent &&
> -             attrs->DMABufPlaneModifiersHi[i].IsPresent)
> +             attrs->DMABufPlaneModifiersHi[i].IsPresent) {
> +            plane_n = i + 1;

Since this increments plane_n, Should a check be added that the
corresponding DMABufPlanFds[i] is present?
What if there are holes in DMABufPlaneModifiersLo/Hi?

>              continue;
> +	}
>  
>           _eglError(EGL_BAD_ATTRIBUTE, "too many plane attributes");
>           return 0;

Reviewed-by: Philipp Zabel <p.zabel at pengutronix.de>

regards
Philipp