[Intel-gfx] [PATCH v2 16/43] drm/i915: s/_CURACNTR/CURCNTR(PIPE_A)/

[Jani Nikula]

On Tue, 22 Sep 2015, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> v2: Deal with _CURABASE too

Yeah better, though I was happy with v1 too. :)

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


>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c  |  2 +-
>  drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
>  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 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..6732733 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,13 +9850,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;
>  	}
>  
> @@ -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 at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center