[16/43] drm/i915: s/_CURACNTR/CURCNTR(PIPE_A)/
diff mbox

Message ID 1442595836-23981-17-git-send-email-ville.syrjala@linux.intel.com
State New
Headers show

Commit Message

Ville Syrjala Sept. 18, 2015, 5:03 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c  |  2 +-
 drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Jani Nikula Sept. 28, 2015, 11:49 a.m. UTC | #1
On Fri, 18 Sep 2015, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/i915_debugfs.c  |  2 +-
>  drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 24baa5a..47ef007 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2905,7 +2905,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 f385dd3..7343e14 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;
>  
> @@ -9850,8 +9850,8 @@ 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;
>  	}
>  
> @@ -9866,8 +9866,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;
>  	}
>  }
> -- 
> 2.4.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 24baa5a..47ef007 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2905,7 +2905,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 f385dd3..7343e14 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;
 
@@ -9850,8 +9850,8 @@  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;
 	}
 
@@ -9866,8 +9866,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;
 	}
 }