diff options
| author | Damien Lespiau | 2015-05-15 20:06:00 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-05-20 11:26:04 +0200 |
| commit | 67fe7dc5d928de6111062cf73cf13e287b2d55c4 (patch) | |
| tree | 9a31e08e7f838602e673c7b25edc97f728aeb8a3 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Use uninterruptible mutex_lock for userptr bo creation (diff) | |
| download | kernel-qcow2-linux-67fe7dc5d928de6111062cf73cf13e287b2d55c4.tar.gz kernel-qcow2-linux-67fe7dc5d928de6111062cf73cf13e287b2d55c4.tar.xz kernel-qcow2-linux-67fe7dc5d928de6111062cf73cf13e287b2d55c4.zip | |
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 24f9b3fc6d80..9543f947084a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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, |