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

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

[libin.yang]

From: Libin Yang <libin.yang@intel.com>

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

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 5f8f4ca..5a65e0c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -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*/
-- 
1.9.1

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

[Daniel Vetter]

On Wed, Jul 30, 2014 at 10:43:48AM +0800, libin.yang@intel.com wrote:
> From: Libin Yang <libin.yang@intel.com>
> 
> call the intel_hdmi_prepare() in chv_hdmi_pre_enable() for
> hdmi audio.
> 
> Signed-off-by: Libin Yang <libin.yang@intel.com>

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

> ---
>  drivers/gpu/drm/i915/intel_hdmi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 5f8f4ca..5a65e0c 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -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*/
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

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

[Yang, Libin]

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

> -----Original Message-----
> From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] On Behalf Of Daniel
> Vetter
> Sent: Wednesday, July 30, 2014 6:46 PM
> To: Yang, Libin
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/hdmi: call intel_hdmi_prepare
> for CHV
> 
> On Wed, Jul 30, 2014 at 10:43:48AM +0800, libin.yang@intel.com wrote:
> > From: Libin Yang <libin.yang@intel.com>
> >
> > call the intel_hdmi_prepare() in chv_hdmi_pre_enable() for hdmi audio.
> >
> > Signed-off-by: Libin Yang <libin.yang@intel.com>
> 
> I've just merged a similar patch from Ville, please check that it works.
> -Daniel
> 
> > ---
> >  drivers/gpu/drm/i915/intel_hdmi.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
> > b/drivers/gpu/drm/i915/intel_hdmi.c
> > index 5f8f4ca..5a65e0c 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -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*/
> > --
> > 1.9.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

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

[Daniel Vetter]

On Thu, Jul 31, 2014 at 9:16 AM, Yang, Libin <libin.yang@intel.com> wrote:
> 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

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

[Yang, Libin]

Hi Daniel,

Get it. Thanks.

Regards,
Libin

> -----Original Message-----
> From: daniel.vetter@ffwll.ch [mailto:daniel.vetter@ffwll.ch] On Behalf Of
> Daniel Vetter
> Sent: Thursday, July 31, 2014 5:51 PM
> To: Yang, Libin
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/hdmi: call intel_hdmi_prepare
> for CHV
> 
> On Thu, Jul 31, 2014 at 9:16 AM, Yang, Libin <libin.yang@intel.com> wrote:
> > 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