drm/i915: s/_CURACNTR/CURCNTR(PIPE_A)/

v2: Deal with _CURABASE too

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 007d8920eb2f..7d88ecfe3e2b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2909,7 +2909,7 @@ static bool cursor_active(struct drm_device *dev, int pipe)
         u32 state;
 
         if (IS_845G(dev) || IS_I865G(dev))
-                state = I915_READ(_CURACNTR) & CURSOR_ENABLE;
+                state = I915_READ(CURCNTR(PIPE_A)) & CURSOR_ENABLE;
         else
                 state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 203406b75bfe..86f5a6ef11d8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1295,7 +1295,7 @@ static void assert_cursor(struct drm_i915_private *dev_priv,
         bool cur_state;
 
         if (IS_845G(dev) || IS_I865G(dev))
-                cur_state = I915_READ(_CURACNTR) & CURSOR_ENABLE;
+                cur_state = I915_READ(CURCNTR(PIPE_A)) & CURSOR_ENABLE;
         else
                 cur_state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
 
@@ -9890,13 +9890,13 @@ static void i845_update_cursor(struct drm_crtc *crtc, u32 base)
                 /* On these chipsets we can only modify the base/size/stride
                  * whilst the cursor is disabled.
                  */
-                I915_WRITE(_CURACNTR, 0);
-                POSTING_READ(_CURACNTR);
+                I915_WRITE(CURCNTR(PIPE_A), 0);
+                POSTING_READ(CURCNTR(PIPE_A));
                 intel_crtc->cursor_cntl = 0;
         }
 
         if (intel_crtc->cursor_base != base) {
-                I915_WRITE(_CURABASE, base);
+                I915_WRITE(CURBASE(PIPE_A), base);
                 intel_crtc->cursor_base = base;
         }
 
@@ -9906,8 +9906,8 @@ static void i845_update_cursor(struct drm_crtc *crtc, u32 base)
         }
 
         if (intel_crtc->cursor_cntl != cntl) {
-                I915_WRITE(_CURACNTR, cntl);
-                POSTING_READ(_CURACNTR);
+                I915_WRITE(CURCNTR(PIPE_A), cntl);
+                POSTING_READ(CURCNTR(PIPE_A));
                 intel_crtc->cursor_cntl = cntl;
         }
 }