Hi,
To make it more clearly, I re-send this patch series again.
To fix "the audio playback does not work anymore after suspend & resume" on ASUS E406MA, we need rediffed commit "drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled". However, after apply the commit "drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled", it induces the screen to flicker when the CDCLK changes on the laptop. [1]
So, we need these commits to prevent that:
commit 48d9f87ddd21 drm/i915: Save the old CDCLK atomic state commit 2b21dfbeee72 drm/i915: Remove redundant store of logical CDCLK state commit 59f9e9cab3a1 drm/i915: Skip modeset for cdclk changes if possible
This issue is also reconfirmed on the list. [2][3]
[1] https://bugzilla.kernel.org/show_bug.cgi?id=203623 [2] https://bugs.freedesktop.org/show_bug.cgi?id=110916 [3] https://www.spinics.net/lists/stable/msg310910.html
Thank you, Jian-Hong Pan
Imre Deak (2): drm/i915: Save the old CDCLK atomic state drm/i915: Remove redundant store of logical CDCLK state
Ville Syrjälä (2): drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled drm/i915: Skip modeset for cdclk changes if possible
drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/intel_audio.c | 62 ++++++++- drivers/gpu/drm/i915/intel_cdclk.c | 185 ++++++++++++++++++++------- drivers/gpu/drm/i915/intel_display.c | 57 +++++++-- drivers/gpu/drm/i915/intel_drv.h | 21 ++- 5 files changed, 269 insertions(+), 62 deletions(-)