Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/i915/intel_display.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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;