Skip to contentSkip to conversation

drm/i915/hdmi: call intel_hdmi_prepare for CHV

PATCH In review [email protected] 2 participants 5 messages Jul 30, 2014 – Aug 1, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/hdmi: call intel_hdmi_prepare for CHV

From: Libin Yang <[email protected]>

call the intel_hdmi_prepare() in chv_hdmi_pre_enable() for hdmi audio.

---
 drivers/gpu/drm/i915/intel_hdmi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 5f8f4ca..5a65e0c 100644
@@ -1374,6 +1374,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
 	int data, i;
 	u32 val;
 
+	intel_hdmi_prepare(encoder);
 	mutex_lock(&dev_priv->dpio_lock);
 
 	/* Deassert soft data lane reset*/
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · On Wed, Jul 30, 2014 at 10:43:48AM +0800, [email protected] wrote:

From: Libin Yang <[email protected]>

call the intel_hdmi_prepare() in chv_hdmi_pre_enable() for hdmi audio.

I've just merged a similar patch from Ville, please check that it works. -Daniel

Quoted 23 lines
---
 drivers/gpu/drm/i915/intel_hdmi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 5f8f4ca..5a65e0c 100644
@@ -1374,6 +1374,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
 	int data, i;
 	u32 val;
 
+	intel_hdmi_prepare(encoder);
 	mutex_lock(&dev_priv->dpio_lock);
 
 	/* Deassert soft data lane reset*/
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw

Hi Daniel,

Do you mean the patch 95eb62c8c? If yes, I will have a test on the patch.

BTW: I'm not familiar with gfx driver. But I see intel_hdmi_prepare() is called in the pre_pll_enable() for chv and vlv, but in others, it is called in pre_enable(). Could you tell me what's the difference between the two functions? I'm not sure if there is some impact on the audio function.

Regards,
Libin

Quoted 49 lines

-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, July 30, 2014 6:46 PM
To: Yang, Libin
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/hdmi: call intel_hdmi_prepare for CHV

Quoted 5 lines · On Wed, Jul 30, 2014 at 10:43:48AM +0800, [email protected] wrote:

From: Libin Yang <[email protected]>

call the intel_hdmi_prepare() in chv_hdmi_pre_enable() for hdmi audio.

I've just merged a similar patch from Ville, please check that it works. -Daniel

drivers/gpu/drm/i915/intel_hdmi.c static void chv_hdmi_pre_enable(struct

Quoted 10 lines
---
 drivers/gpu/drm/i915/intel_hdmi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 5f8f4ca..5a65e0c 100644
@@ -1374,6 +1374,7 @@ static void chv_hdmi_pre_enable(struct

intel_encoder *encoder)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
 	int data, i;
 	u32 val;
 
+	intel_hdmi_prepare(encoder);
 	mutex_lock(&dev_priv->dpio_lock);
 
 	/* Deassert soft data lane reset*/
--

1.9.1

Quoted 4 lines

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

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

#3 lore raw
Quoted 1 line · Libin

BTW: I'm not familiar with gfx driver. But I see intel_hdmi_prepare() is called in the pre_pll_enable() for chv and vlv, but in others, it is called in pre_enable(). Could you tell me what's the difference between the two functions? I'm not sure if there is some impact on the audio function.

Depending upon the platform the exact modeset sequence is not always the same. So we mix&match and put the different stages at the right step. Which means the hdmi_prepare step isn't called on all platforms from exactly the same functions - platforms other than vlv/chv don't even have a pre_pll_enable step in the hdmi encoder.

It's a bit complicated, but this way we can support pretty much all intel gfx ever shipped in one driver without massive amounts of duplicated code. I hope that explains the idea a bit. -Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#4 lore raw

Hi Daniel,

Get it. Thanks.

Regards,
Libin

Quoted 29 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Thursday, July 31, 2014 5:51 PM
To: Yang, Libin
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/hdmi: call intel_hdmi_prepare for CHV

Quoted 1 line · Libin

BTW: I'm not familiar with gfx driver. But I see intel_hdmi_prepare() is

called in the pre_pll_enable() for chv and vlv, but in others, it is called in pre_enable(). Could you tell me what's the difference between the two functions? I'm not sure if there is some impact on the audio function.

Depending upon the platform the exact modeset sequence is not always the same. So we mix&match and put the different stages at the right step. Which means the hdmi_prepare step isn't called on all platforms from exactly the same functions - platforms other than vlv/chv don't even have a pre_pll_enable step in the hdmi encoder.

It's a bit complicated, but this way we can support pretty much all intel gfx ever shipped in one driver without massive amounts of duplicated code. I hope that explains the idea a bit.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch