Skip to contentSkip to conversation

drm/i915/audio: apply SKL codec wake up patch to BXT

PATCH Superseded [email protected] 3 participants 5 messages Nov 19, 2015

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/audio: apply SKL codec wake up patch to BXT

From: "Lu, Han" <[email protected]>

drivers/gpu/drm/i915/intel_audio.c +2 -1
index 63d4706..8310bf3 100644
@@ -591,7 +591,8 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 	struct drm_i915_private *dev_priv = dev_to_i915(dev);
 	u32 tmp;
 
-	if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
+	if (!IS_SKYLAKE(dev_priv) && !IS_BROXTON(dev_priv) &&
+			!IS_KABYLAKE(dev_priv))
 		return;
 
 	/*
Signature · 1 line
2.5.0
#1 lore raw
Quoted 9 lines · On Thu, 19 Nov 2015, [email protected] wrote:

From: "Lu, Han" <[email protected]>

drivers/gpu/drm/i915/intel_audio.c +0 -0
index 63d4706..8310bf3 100644

drivers/gpu/drm/i915/intel_audio.c static void i915_audio_component_codec_wake_override(struct device *dev, · line 595

Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +2 -1
@@ -591,7 +591,8 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 	struct drm_i915_private *dev_priv = dev_to_i915(dev);
 	u32 tmp;
 
-	if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
+	if (!IS_SKYLAKE(dev_priv) && !IS_BROXTON(dev_priv) &&
+			!IS_KABYLAKE(dev_priv))

How about if (INTEL_INFO(dev_priv)->gen < 9)?

BR,
Jani.

Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +0 -0
 		return;
 
 	/*
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 13 lines · Jani Nikula
Quoted 12 lines · On Thu, 19 Nov 2015, [email protected] wrote:

From: "Lu, Han" <[email protected]>

drivers/gpu/drm/i915/intel_audio.c +0 -0
index 63d4706..8310bf3 100644
@@ -591,7 +591,8 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 	struct drm_i915_private *dev_priv = dev_to_i915(dev);
 	u32 tmp;
 
Quoted 5 lines

drivers/gpu/drm/i915/intel_audio.c static void i915_audio_component_codec_wake_override(struct device *dev, · line 595

Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +2 -1
-	if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
+	if (!IS_SKYLAKE(dev_priv) && !IS_BROXTON(dev_priv) &&
+			!IS_KABYLAKE(dev_priv))

How about if (INTEL_INFO(dev_priv)->gen < 9)?

Oh, and I guess we also wonder why this is only relevant for the latest platforms?

Quoted 7 lines

BR,
Jani.

Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +0 -0
 		return;
 
 	/*
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 15 lines · Jani Nikula
Quoted 13 lines · Jani Nikula
Quoted 12 lines · On Thu, 19 Nov 2015, [email protected] wrote:

From: "Lu, Han" <[email protected]>

drivers/gpu/drm/i915/intel_audio.c +0 -0
index 63d4706..8310bf3 100644
@@ -591,7 +591,8 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 	struct drm_i915_private *dev_priv = dev_to_i915(dev);
 	u32 tmp;
 
Quoted 8 lines
Quoted 5 lines

drivers/gpu/drm/i915/intel_audio.c static void i915_audio_component_codec_wake_override(struct device *dev, · line 595

Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +2 -1
-	if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
+	if (!IS_SKYLAKE(dev_priv) && !IS_BROXTON(dev_priv) &&
+			!IS_KABYLAKE(dev_priv))

How about if (INTEL_INFO(dev_priv)->gen < 9)?

Oh, and I guess we also wonder why this is only relevant for the latest platforms?

My understanding is that it's a workaround specific to HSW/BDW. It's issued only during the audio controller initialization and at the resume. But I never know why it's needed, it's a black magic :)

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#4 lore raw
Quoted 38 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Thursday, November 19, 2015 6:29 PM
To: Nikula, Jani
Cc: Lu, Han; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/1] drm/i915/audio: apply SKL codec wake up patch to BXT

Quoted 5 lines · Jani Nikula
Quoted 3 lines · Jani Nikula
Quoted 2 lines · On Thu, 19 Nov 2015, [email protected] wrote:

From: "Lu, Han" <[email protected]>

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_audio.c static void

Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +0 -0
index 63d4706..8310bf3 100644
@@ -591,7 +591,8 @@ static void

i915_audio_component_codec_wake_override(struct device *dev,

Quoted 11 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_audio.c static void i915_audio_component_codec_wake_override(struct device *dev, · line 595

Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +2 -1
 	struct drm_i915_private *dev_priv = dev_to_i915(dev);
 	u32 tmp;
 
-	if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
+	if (!IS_SKYLAKE(dev_priv) && !IS_BROXTON(dev_priv) &&
+			!IS_KABYLAKE(dev_priv))

How about if (INTEL_INFO(dev_priv)->gen < 9)?

Oh, and I guess we also wonder why this is only relevant for the latest platforms?

Quoted 6 lines

My understanding is that it's a workaround specific to HSW/BDW. It's issued only during the audio controller initialization and at the resume. But I never know why it's needed, it's a black magic :)

Takashi

Sorry, I should have made it more clear.
For SKL we added a patch (commit 632f3ab95fe2ffebf09969a57ab21), in order to enable codec wakeup override signal, to allow re-enumeration of the controller on SKL after resume from low power state.
In SKL, HDMI/DP codec and PCH HD Audio Controller are in different power wells, so it's necessary to reset display audio codecs when power well on, otherwise display audio codecs will disappear when resume from low power state.
Reset steps when power on:

    enable codec wakeup -> azx_init_chip() -> disable codec wakeup

Since the power well design didn't change from SKL to BXT, we need to apply the workaround to BXT also.
I'll re-submit the patch with these info added on.

Regards,
Han Lu
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx