From: Maarten Lankhorst Date: Wed, 10 Feb 2016 12:49:39 +0000 (+0100) Subject: drm/i915: Remove update_sprite_watermarks. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=032b612e055ecc52dc67aaf04dace8534d94ac80;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Remove update_sprite_watermarks. Commit 791a32be6eb2 ("drm/i915: Drop intel_update_sprite_watermarks") removes the use of this variable, but forgot to remove it. Reviewed-by: Matt Roper Signed-off-by: Maarten Lankhorst Link: http://patchwork.freedesktop.org/patch/msgid/1455108583-29227-5-git-send-email-maarten.lankhorst@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2e883eded122..8b7b8b64b008 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11788,7 +11788,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; @@ -11867,9 +11866,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, needs_scaling(to_intel_plane_state(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 35301664a908..4c027d69fac9 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -549,7 +549,6 @@ struct intel_crtc_atomic_commit { /* Sleepable operations to perform after commit */ unsigned fb_bits; bool post_enable_primary; - unsigned update_sprite_watermarks; /* Sleepable operations to perform before and after commit */ bool update_fbc;