[Mesa-dev] [PATCH 02/10] wayland: Fix the logic in disabling the prime capability

[Emil Velikov]

On 04/04/14 09:36, Ander Conselvan de Oliveira wrote:
> From: Neil Roberts <neil at linux.intel.com>
> 
> It looks like this bit of code is trying to disable the prime capability if
> the driver doesn't support createImageFromFds. However the logic looks a bit
> broken and what it would actually do is disable all other capabilities apart
> from prime. This patch fixes it to actually disable prime.
IMHO this fix can go independently from the series. Stable branches might need
it as well.

Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

> ---
>  src/egl/drivers/dri2/platform_wayland.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
> index 691f3e1..37dcf19 100644
> --- a/src/egl/drivers/dri2/platform_wayland.c
> +++ b/src/egl/drivers/dri2/platform_wayland.c
> @@ -1049,7 +1049,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
>  
>     if (dri2_dpy->image->base.version < 7 ||
>         dri2_dpy->image->createImageFromFds == NULL)
> -      dri2_dpy->capabilities &= WL_DRM_CAPABILITY_PRIME;
> +      dri2_dpy->capabilities &= ~WL_DRM_CAPABILITY_PRIME;
>  
>     types = EGL_WINDOW_BIT;
>     for (i = 0; dri2_dpy->driver_configs[i]; i++) {
>