[Intel-gfx] [PATCH v2 10/14] drm/i915: Remove update_sprite_watermarks.

[Matt Roper]

On Tue, Nov 03, 2015 at 08:31:49AM +0100, Maarten Lankhorst wrote:
> Commit 791a32be6eb2 ("drm/i915: Drop intel_update_sprite_watermarks")
> removes the use of this variable, but forgot to remove it.
> 
> Cc: Matt Roper <matthew.d.roper at intel.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 6 +-----
>  drivers/gpu/drm/i915/intel_drv.h     | 1 -
>  2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b1d6ce80daaf..77fe1d75404b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11632,7 +11632,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
>  	struct intel_plane_state *old_plane_state =
>  		to_intel_plane_state(plane->state);
>  	int idx = intel_crtc->base.base.id, ret;
> -	int i = drm_plane_index(plane);
>  	bool mode_changed = needs_modeset(crtc_state);
>  	bool was_crtc_enabled = crtc->state->active;
>  	bool is_crtc_enabled = crtc_state->active;
> @@ -11726,11 +11725,8 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
>  		 */
>  		if (IS_IVYBRIDGE(dev) &&
>  		    needs_scaling(to_intel_plane_state(plane_state)) &&
> -		    !needs_scaling(old_plane_state)) {
> +		    !needs_scaling(old_plane_state))
>  			pipe_config->disable_lp_wm = true;
> -		} else if (turn_off && !mode_changed)
> -			intel_crtc->atomic.update_sprite_watermarks |=
> -				1 << i;
>  
>  		break;
>  	}
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 8d86627069e5..dc024c27ca1e 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -542,7 +542,6 @@ struct intel_crtc_atomic_commit {
>  	unsigned fb_bits;
>  	bool update_fbc;
>  	bool post_enable_primary;
> -	unsigned update_sprite_watermarks;
>  };
>  
>  struct intel_crtc {
> -- 
> 2.1.0
> 

-- 
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795