Commit 032b612e authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Remove update_sprite_watermarks.

Commit 791a32be ("drm/i915: Drop intel_update_sprite_watermarks")
removes the use of this variable, but forgot to remove it.
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455108583-29227-5-git-send-email-maarten.lankhorst@linux.intel.com
parent e8861675
...@@ -11788,7 +11788,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, ...@@ -11788,7 +11788,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
struct intel_plane_state *old_plane_state = struct intel_plane_state *old_plane_state =
to_intel_plane_state(plane->state); to_intel_plane_state(plane->state);
int idx = intel_crtc->base.base.id, ret; int idx = intel_crtc->base.base.id, ret;
int i = drm_plane_index(plane);
bool mode_changed = needs_modeset(crtc_state); bool mode_changed = needs_modeset(crtc_state);
bool was_crtc_enabled = crtc->state->active; bool was_crtc_enabled = crtc->state->active;
bool is_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, ...@@ -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(to_intel_plane_state(plane_state)) &&
!needs_scaling(old_plane_state)) !needs_scaling(old_plane_state))
pipe_config->disable_lp_wm = true; pipe_config->disable_lp_wm = true;
else if (turn_off && !mode_changed)
intel_crtc->atomic.update_sprite_watermarks |=
1 << i;
break; break;
} }
......
...@@ -549,7 +549,6 @@ struct intel_crtc_atomic_commit { ...@@ -549,7 +549,6 @@ struct intel_crtc_atomic_commit {
/* Sleepable operations to perform after commit */ /* Sleepable operations to perform after commit */
unsigned fb_bits; unsigned fb_bits;
bool post_enable_primary; bool post_enable_primary;
unsigned update_sprite_watermarks;
/* Sleepable operations to perform before and after commit */ /* Sleepable operations to perform before and after commit */
bool update_fbc; bool update_fbc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment