diff options
| author |   Damien Lespiau <damien.lespiau@intel.com> | 2015-05-12 16:13:18 +0100 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-20 11:25:55 +0200 |
| commit | 568db4f2536fe5a1a9ce491b17c3d0011d5506d2 (patch) | |
| tree | cf3893f881d346f9b0dee154306af3226794f6ca /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/skl: Support the advertized index format (diff) | |
| download | linux-dev-568db4f2536fe5a1a9ce491b17c3d0011d5506d2.tar.xz linux-dev-568db4f2536fe5a1a9ce491b17c3d0011d5506d2.zip | |
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: Damien Lespiau <damien.lespiau@intel.com>
[danvet: s/gen2/i8xx/ and s/gen4/i965/ ...]
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dadb52a4c26c..23765d2c2ea4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -53,14 +53,14 @@ DRM_FORMAT_ARGB8888 /* Primary plane formats for gen <= 3 */ -static const uint32_t intel_primary_formats_gen2[] = { +static const uint32_t i8xx_primary_formats[] = { COMMON_PRIMARY_FORMATS, DRM_FORMAT_XRGB1555, DRM_FORMAT_ARGB1555, }; /* Primary plane formats for gen >= 4 */ -static const uint32_t intel_primary_formats_gen4[] = { +static const uint32_t i965_primary_formats[] = { COMMON_PRIMARY_FORMATS, \ DRM_FORMAT_XBGR8888, DRM_FORMAT_ABGR8888, @@ -13288,11 +13288,11 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->plane = !pipe; if (INTEL_INFO(dev)->gen <= 3) { - intel_primary_formats = intel_primary_formats_gen2; - num_formats = ARRAY_SIZE(intel_primary_formats_gen2); + intel_primary_formats = i8xx_primary_formats; + num_formats = ARRAY_SIZE(i8xx_primary_formats); } else { - intel_primary_formats = intel_primary_formats_gen4; - num_formats = ARRAY_SIZE(intel_primary_formats_gen4); + intel_primary_formats = i965_primary_formats; + num_formats = ARRAY_SIZE(i965_primary_formats); } drm_universal_plane_init(dev, &primary->base, 0, |