Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67fe7dc5 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Remove the COMMON_PRIMARY_FORMATS defines 



That define makes it hard to figure out what is the actual list of
formats at a glance. Expand it then.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 281400ff

drivers/gpu/drm/i915/intel_display.c

+8 −9
Original line number Diff line number Diff line
@@ -45,24 +45,23 @@ 
#include <drm/drm_rect.h>

#include <linux/dma_remapping.h>



/* Primary plane formats supported by all gen */

#define COMMON_PRIMARY_FORMATS \

	DRM_FORMAT_C8, \

	DRM_FORMAT_RGB565, \

	DRM_FORMAT_XRGB8888, \

	DRM_FORMAT_ARGB8888



/* Primary plane formats for gen <= 3 */

static const uint32_t i8xx_primary_formats[] = {

	COMMON_PRIMARY_FORMATS,

	DRM_FORMAT_C8,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_ARGB1555,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

};



/* Primary plane formats for gen >= 4 */

static const uint32_t i965_primary_formats[] = {

	COMMON_PRIMARY_FORMATS, \

	DRM_FORMAT_C8,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_ARGB2101010,