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

Commit b4615730 authored by Gaurav K Singh's avatar Gaurav K Singh Committed by Joonas Lahtinen
Browse files

drm/i915/audio: Fix audio detection issue on GLK 



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> # b651bd2a ("drm/i915/audio: Fix audio enumeration issue on BXT")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGaurav K Singh <gaurav.k.singh@intel.com>
Reviewed-by: default avatarAbhay Kumar <abhay.Kumar@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1523989338-29677-1-git-send-email-gaurav.k.singh@intel.com


(cherry picked from commit 82212290)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 4a0559ed

drivers/gpu/drm/i915/intel_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev, 
	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);