From: Ville Syrjälä Date: Tue, 13 Nov 2018 17:23:30 +0000 (+0200) Subject: drm/i915: Remove dead update_wm_pre assignment from SKL wm code X-Git-Tag: v5.1-rc1~117^2~22^2~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b5b45a61d3ff60b270126f1b5825654a5f9bab5;p=thirdparty%2Fkernel%2Flinux.git drm/i915: Remove dead update_wm_pre assignment from SKL wm code SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no point it setting it. crtc_state->update_wm_pre only exists as a temporary hack for pre-g4x platforms until we redo their watermarks to be be atomic. Cc: Stanislav Lisovskiy Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20181113172330.26069-3-ville.syrjala@linux.intel.com Reviewed-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 8ed88b4a92201..9466c12364c47 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5568,12 +5568,6 @@ skl_compute_wm(struct drm_atomic_state *state) if (changed) results->dirty_pipes |= drm_crtc_mask(crtc); - - if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0) - /* This pipe's WM's did not change */ - continue; - - intel_cstate->update_wm_pre = true; } skl_print_wm_changes(intel_state);