drm/i915: Use enum plane_id in VLV/CHV sprite code

Use intel_plane->id to derive the VLV/CHV sprite register offsets
instead of abusing plane->plane which is really meant to for
primary planes only.

v2: Convert assert_sprites_disabled() over as well
v3: Rename the reg macro parameter to 'plane_id' as well (Paulo)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479830524-7882-6-git-send-email-ville.syrjala@linux.intel.com

1 files changed, 37 insertions, 37 deletions

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 4ddb17cbe45f..91bcaff28f35 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -296,7 +296,7 @@ static void
 chv_update_csc(struct intel_plane *intel_plane, uint32_t format)
 {
         struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);
-        int plane = intel_plane->plane;
+        enum plane_id plane_id = intel_plane->id;
 
         /* Seems RGB data bypasses the CSC always */
         if (!format_is_yuv(format))
@@ -312,23 +312,23 @@ chv_update_csc(struct intel_plane *intel_plane, uint32_t format)
          * Cb and Cr apparently come in as signed already, so no
          * need for any offset. For Y we need to remove the offset.
          */
-        I915_WRITE(SPCSCYGOFF(plane), SPCSC_OOFF(0) | SPCSC_IOFF(-64));
-        I915_WRITE(SPCSCCBOFF(plane), SPCSC_OOFF(0) | SPCSC_IOFF(0));
-        I915_WRITE(SPCSCCROFF(plane), SPCSC_OOFF(0) | SPCSC_IOFF(0));
-
-        I915_WRITE(SPCSCC01(plane), SPCSC_C1(4769) | SPCSC_C0(6537));
-        I915_WRITE(SPCSCC23(plane), SPCSC_C1(-3330) | SPCSC_C0(0));
-        I915_WRITE(SPCSCC45(plane), SPCSC_C1(-1605) | SPCSC_C0(4769));
-        I915_WRITE(SPCSCC67(plane), SPCSC_C1(4769) | SPCSC_C0(0));
-        I915_WRITE(SPCSCC8(plane), SPCSC_C0(8263));
-
-        I915_WRITE(SPCSCYGICLAMP(plane), SPCSC_IMAX(940) | SPCSC_IMIN(64));
-        I915_WRITE(SPCSCCBICLAMP(plane), SPCSC_IMAX(448) | SPCSC_IMIN(-448));
-        I915_WRITE(SPCSCCRICLAMP(plane), SPCSC_IMAX(448) | SPCSC_IMIN(-448));
-
-        I915_WRITE(SPCSCYGOCLAMP(plane), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
-        I915_WRITE(SPCSCCBOCLAMP(plane), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
-        I915_WRITE(SPCSCCROCLAMP(plane), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
+        I915_WRITE(SPCSCYGOFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(-64));
+        I915_WRITE(SPCSCCBOFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
+        I915_WRITE(SPCSCCROFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
+
+        I915_WRITE(SPCSCC01(plane_id), SPCSC_C1(4769) | SPCSC_C0(6537));
+        I915_WRITE(SPCSCC23(plane_id), SPCSC_C1(-3330) | SPCSC_C0(0));
+        I915_WRITE(SPCSCC45(plane_id), SPCSC_C1(-1605) | SPCSC_C0(4769));
+        I915_WRITE(SPCSCC67(plane_id), SPCSC_C1(4769) | SPCSC_C0(0));
+        I915_WRITE(SPCSCC8(plane_id), SPCSC_C0(8263));
+
+        I915_WRITE(SPCSCYGICLAMP(plane_id), SPCSC_IMAX(940) | SPCSC_IMIN(64));
+        I915_WRITE(SPCSCCBICLAMP(plane_id), SPCSC_IMAX(448) | SPCSC_IMIN(-448));
+        I915_WRITE(SPCSCCRICLAMP(plane_id), SPCSC_IMAX(448) | SPCSC_IMIN(-448));
+
+        I915_WRITE(SPCSCYGOCLAMP(plane_id), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
+        I915_WRITE(SPCSCCBOCLAMP(plane_id), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
+        I915_WRITE(SPCSCCROCLAMP(plane_id), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
 }
 
 static void
@@ -340,8 +340,8 @@ vlv_update_plane(struct drm_plane *dplane,
         struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_plane *intel_plane = to_intel_plane(dplane);
         struct drm_framebuffer *fb = plane_state->base.fb;
-        int pipe = intel_plane->pipe;
-        int plane = intel_plane->plane;
+        enum pipe pipe = intel_plane->pipe;
+        enum plane_id plane_id = intel_plane->id;
         u32 sprctl;
         u32 sprsurf_offset, linear_offset;
         unsigned int rotation = plane_state->base.rotation;
@@ -434,9 +434,9 @@ vlv_update_plane(struct drm_plane *dplane,
         linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);
 
         if (key->flags) {
-                I915_WRITE(SPKEYMINVAL(pipe, plane), key->min_value);
-                I915_WRITE(SPKEYMAXVAL(pipe, plane), key->max_value);
-                I915_WRITE(SPKEYMSK(pipe, plane), key->channel_mask);
+                I915_WRITE(SPKEYMINVAL(pipe, plane_id), key->min_value);
+                I915_WRITE(SPKEYMAXVAL(pipe, plane_id), key->max_value);
+                I915_WRITE(SPKEYMSK(pipe, plane_id), key->channel_mask);
         }
 
         if (key->flags & I915_SET_COLORKEY_SOURCE)
@@ -445,21 +445,21 @@ vlv_update_plane(struct drm_plane *dplane,
         if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B)
                 chv_update_csc(intel_plane, fb->pixel_format);
 
-        I915_WRITE(SPSTRIDE(pipe, plane), fb->pitches[0]);
-        I915_WRITE(SPPOS(pipe, plane), (crtc_y << 16) | crtc_x);
+        I915_WRITE(SPSTRIDE(pipe, plane_id), fb->pitches[0]);
+        I915_WRITE(SPPOS(pipe, plane_id), (crtc_y << 16) | crtc_x);
 
         if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
-                I915_WRITE(SPTILEOFF(pipe, plane), (y << 16) | x);
+                I915_WRITE(SPTILEOFF(pipe, plane_id), (y << 16) | x);
         else
-                I915_WRITE(SPLINOFF(pipe, plane), linear_offset);
+                I915_WRITE(SPLINOFF(pipe, plane_id), linear_offset);
 
-        I915_WRITE(SPCONSTALPHA(pipe, plane), 0);
+        I915_WRITE(SPCONSTALPHA(pipe, plane_id), 0);
 
-        I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w);
-        I915_WRITE(SPCNTR(pipe, plane), sprctl);
-        I915_WRITE(SPSURF(pipe, plane),
+        I915_WRITE(SPSIZE(pipe, plane_id), (crtc_h << 16) | crtc_w);
+        I915_WRITE(SPCNTR(pipe, plane_id), sprctl);
+        I915_WRITE(SPSURF(pipe, plane_id),
                    intel_fb_gtt_offset(fb, rotation) + sprsurf_offset);
-        POSTING_READ(SPSURF(pipe, plane));
+        POSTING_READ(SPSURF(pipe, plane_id));
 }
 
 static void
@@ -468,13 +468,13 @@ vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)
         struct drm_device *dev = dplane->dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_plane *intel_plane = to_intel_plane(dplane);
-        int pipe = intel_plane->pipe;
-        int plane = intel_plane->plane;
+        enum pipe pipe = intel_plane->pipe;
+        enum plane_id plane_id = intel_plane->id;
 
-        I915_WRITE(SPCNTR(pipe, plane), 0);
+        I915_WRITE(SPCNTR(pipe, plane_id), 0);
 
-        I915_WRITE(SPSURF(pipe, plane), 0);
-        POSTING_READ(SPSURF(pipe, plane));
+        I915_WRITE(SPSURF(pipe, plane_id), 0);
+        POSTING_READ(SPSURF(pipe, plane_id));
 }
 
 static void