[PATCH v4 6/6] drm: move quirk_addfb_prefer_xbgr_30bpp handling to drm_driver_legacy_fb_format too

[Daniel Vetter]

On Fri, Sep 21, 2018 at 03:47:04PM +0200, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/drm_fourcc.c      | 5 +++++
>  drivers/gpu/drm/drm_framebuffer.c | 4 ----
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index 7c6d3922ed..90a1c846fc 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -121,6 +121,11 @@ uint32_t drm_driver_legacy_fb_format(struct drm_device *dev,
>  		if (fmt == DRM_FORMAT_XRGB1555)
>  			fmt = DRM_FORMAT_HOST_XRGB1555;
>  	}
> +
> +	if (dev->mode_config.quirk_addfb_prefer_xbgr_30bpp &&
> +	    fmt == DRM_FORMAT_XRGB2101010)
> +		fmt = DRM_FORMAT_XBGR2101010;
> +
>  	return fmt;
>  }
>  EXPORT_SYMBOL(drm_driver_legacy_fb_format);
> diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
> index 1e2126101c..3bf729d0aa 100644
> --- a/drivers/gpu/drm/drm_framebuffer.c
> +++ b/drivers/gpu/drm/drm_framebuffer.c
> @@ -129,10 +129,6 @@ int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,
>  	r.pitches[0] = or->pitch;
>  	r.handles[0] = or->handle;
>  
> -	if (dev->mode_config.quirk_addfb_prefer_xbgr_30bpp &&
> -	    r.pixel_format == DRM_FORMAT_XRGB2101010)
> -		r.pixel_format = DRM_FORMAT_XBGR2101010;
> -
>  	ret = drm_mode_addfb2(dev, &r, file_priv);
>  	if (ret)
>  		return ret;
> -- 
> 2.9.3
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch