diff mbox series

[SRU,B/OEM-B,v2,3/4] drm/i915: Remove redundant store of logical CDCLK state

Message ID 20190610071443.30577-4-hui.wang@canonical.com
State Accepted
Headers show
Series Audio doesn't work after s3 or s4 on cnl and glk machines | expand

Commit Message

Hui Wang June 10, 2019, 7:14 a.m. UTC 
From: Imre Deak <imre.deak@intel.com>

BugLink: https://launchpad.net/bugs/1826868

We copied the original state into the atomic state already earlier in
the function, so no need to do it a second time.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190320135439.12201-3-imre.deak@intel.com
(backported from commit 2b21dfbeee725778daed2c3dd45a3fc808176feb)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3294c13f8b8a..271685661745 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11980,8 +11980,6 @@  static int intel_modeset_checks(struct drm_atomic_state *state)
 		DRM_DEBUG_KMS("New cdclk calculated to be logical %u kHz, actual %u kHz\n",
 			      intel_state->cdclk.logical.cdclk,
 			      intel_state->cdclk.actual.cdclk);
-	} else {
-		to_intel_atomic_state(state)->cdclk.logical = dev_priv->cdclk.logical;
 	}
 
 	intel_modeset_clear_plls(state);