[Intel-gfx] [PATCH 07/10] drm/i915/skl: Don't advertize ARGB2101010 and ABGR2101010

Daniel Vetter daniel at ffwll.ch
Tue May 12 09:13:25 PDT 2015


On Tue, May 12, 2015 at 04:13:19PM +0100, Damien Lespiau wrote:
> While we have been historically exposing those formats, but the hardware
> doesn't do anything with the alpha bits. The DDX doesn't seem to
> particularly care about those formats either, so just expose the
> XRGB/XBGR variants.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>

We have this problem with all the primary planes. Imo we should remove
this everywhere, since the ddx doesn't seem to care.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8adf3bf..13efade 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -70,6 +70,15 @@ static const uint32_t gen4_primary_formats[] = {
>  	DRM_FORMAT_ABGR2101010,
>  };
>  
> +
> +static const uint32_t skl_primary_formats[] = {
> +	COMMON_PRIMARY_FORMATS, \
> +	DRM_FORMAT_XBGR8888,
> +	DRM_FORMAT_ABGR8888,
> +	DRM_FORMAT_XRGB2101010,
> +	DRM_FORMAT_XBGR2101010,
> +};
> +
>  /* Cursor formats */
>  static const uint32_t intel_cursor_formats[] = {
>  	DRM_FORMAT_ARGB8888,
> @@ -13287,12 +13296,15 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
>  	if (HAS_FBC(dev) && INTEL_INFO(dev)->gen < 4)
>  		primary->plane = !pipe;
>  
> -	if (INTEL_INFO(dev)->gen <= 3) {
> -		intel_primary_formats = gen2_primary_formats;
> -		num_formats = ARRAY_SIZE(gen2_primary_formats);
> -	} else {
> +	if (INTEL_INFO(dev)->gen >= 9) {
> +		intel_primary_formats = skl_primary_formats;
> +		num_formats = ARRAY_SIZE(skl_primary_formats);
> +	} else if (INTEL_INFO(dev)->gen >= 4) {
>  		intel_primary_formats = gen4_primary_formats;
>  		num_formats = ARRAY_SIZE(gen4_primary_formats);
> +	} else {
> +		intel_primary_formats = gen2_primary_formats;
> +		num_formats = ARRAY_SIZE(gen2_primary_formats);
>  	}
>  
>  	drm_universal_plane_init(dev, &primary->base, 0,
> -- 
> 2.1.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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


More information about the Intel-gfx mailing list