Commit 568db4f2 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter

drm/i915: Don't use the intel_ prefix for gen-specific data

We now prefix our functions/enums/data with the first platform it has
been introduced. Do that for the primary plane formats.
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
[danvet: s/gen2/i8xx/ and s/gen4/i965/ ...]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d161cf7a
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
DRM_FORMAT_ARGB8888 DRM_FORMAT_ARGB8888
/* Primary plane formats for gen <= 3 */ /* Primary plane formats for gen <= 3 */
static const uint32_t intel_primary_formats_gen2[] = { static const uint32_t i8xx_primary_formats[] = {
COMMON_PRIMARY_FORMATS, COMMON_PRIMARY_FORMATS,
DRM_FORMAT_XRGB1555, DRM_FORMAT_XRGB1555,
DRM_FORMAT_ARGB1555, DRM_FORMAT_ARGB1555,
}; };
/* Primary plane formats for gen >= 4 */ /* Primary plane formats for gen >= 4 */
static const uint32_t intel_primary_formats_gen4[] = { static const uint32_t i965_primary_formats[] = {
COMMON_PRIMARY_FORMATS, \ COMMON_PRIMARY_FORMATS, \
DRM_FORMAT_XBGR8888, DRM_FORMAT_XBGR8888,
DRM_FORMAT_ABGR8888, DRM_FORMAT_ABGR8888,
...@@ -13288,11 +13288,11 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, ...@@ -13288,11 +13288,11 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
primary->plane = !pipe; primary->plane = !pipe;
if (INTEL_INFO(dev)->gen <= 3) { if (INTEL_INFO(dev)->gen <= 3) {
intel_primary_formats = intel_primary_formats_gen2; intel_primary_formats = i8xx_primary_formats;
num_formats = ARRAY_SIZE(intel_primary_formats_gen2); num_formats = ARRAY_SIZE(i8xx_primary_formats);
} else { } else {
intel_primary_formats = intel_primary_formats_gen4; intel_primary_formats = i965_primary_formats;
num_formats = ARRAY_SIZE(intel_primary_formats_gen4); num_formats = ARRAY_SIZE(i965_primary_formats);
} }
drm_universal_plane_init(dev, &primary->base, 0, drm_universal_plane_init(dev, &primary->base, 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment