4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaurav K Singh gaurav.k.singh@intel.com
commit b4615730530be85fc45ab4631c2ad6d8e2d0b97d upstream.
On Geminilake, sometimes audio card is not getting detected after reboot. This is a spurious issue happening on Geminilake. HW codec and HD audio controller link was going out of sync for which there was a fix in i915 driver but was not getting invoked for GLK. Extending this fix to GLK as well.
Tested by Du,Wenkai on GLK board.
Bspec: 21829
v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro (Jani N)
Cc: stable@vger.kernel.org # b651bd2a3ae3 ("drm/i915/audio: Fix audio enumeration issue on BXT") Cc: stable@vger.kernel.org Signed-off-by: Gaurav K Singh gaurav.k.singh@intel.com Reviewed-by: Abhay Kumar abhay.Kumar@intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com Link: https://patchwork.freedesktop.org/patch/msgid/1523989338-29677-1-git-send-em... (cherry picked from commit 8221229046e862977ae93ec9d34aa583fbd10397) Signed-off-by: Joonas Lahtinen joonas.lahtinen@linux.intel.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- drivers/gpu/drm/i915/intel_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -704,7 +704,7 @@ static void i915_audio_component_codec_w struct drm_i915_private *dev_priv = kdev_to_i915(kdev); u32 tmp;
- if (!IS_GEN9_BC(dev_priv)) + if (!IS_GEN9(dev_priv)) return;
i915_audio_component_get_power(kdev);