* [PATCH] drm/i915/audio: fix hdmi audio noise issue
@ 2016-11-09 8:27 libin.yang
2016-11-09 9:16 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-11-09 10:59 ` [PATCH] " Jani Nikula
0 siblings, 2 replies; 4+ messages in thread
From: libin.yang @ 2016-11-09 8:27 UTC (permalink / raw)
To: intel-gfx, jani.nikula, ville.syrjala, daniel.vetter, tiwai
From: Libin Yang <libin.yang@intel.com>
This issue is caused by:
6014ac12: drm/i915/audio: set proper N/M in modeset
Some special monitors will have noise or even no sound after
applying the patch 6014ac12.
In patch 6014ac12, it will reset the cts value to 0 for HDMI.
However, we need disable Enable CTS or M Prog bit. This is
the initial setting after HW reset.
Signed-off-by: Libin Yang <libin.yang@intel.com>
---
drivers/gpu/drm/i915/intel_audio.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 813fd74..a472d35 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -332,6 +332,13 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port,
int n;
u32 tmp;
+ /* reset CTS value to 0 */
+ tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(pipe));
+ tmp &= ~AUD_CONFIG_M_MASK;
+ tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
+ tmp |= AUD_M_CTS_M_PROG_ENABLE;
+ I915_WRITE(HSW_AUD_M_CTS_ENABLE(pipe), tmp);
+
tmp = I915_READ(HSW_AUD_CFG(pipe));
tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
@@ -351,10 +358,12 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port,
I915_WRITE(HSW_AUD_CFG(pipe), tmp);
+ /*
+ * Let's disable "Enable CTS or M Prog bit"
+ * and let HW calculate the value
+ */
tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(pipe));
- tmp &= ~AUD_CONFIG_M_MASK;
- tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
- tmp |= AUD_M_CTS_M_PROG_ENABLE;
+ tmp &= ~AUD_M_CTS_M_PROG_ENABLE;
I915_WRITE(HSW_AUD_M_CTS_ENABLE(pipe), tmp);
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/audio: fix hdmi audio noise issue
2016-11-09 8:27 [PATCH] drm/i915/audio: fix hdmi audio noise issue libin.yang
@ 2016-11-09 9:16 ` Patchwork
2016-11-09 10:59 ` [PATCH] " Jani Nikula
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-11-09 9:16 UTC (permalink / raw)
To: libin.yang; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/audio: fix hdmi audio noise issue
URL : https://patchwork.freedesktop.org/series/15012/
State : success
== Summary ==
Series 15012v1 drm/i915/audio: fix hdmi audio noise issue
https://patchwork.freedesktop.org/api/1.0/series/15012/revisions/1/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40
fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53
fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21
fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
d761364280c79ec14915166048d038b67e8a5477 drm-intel-nightly: 2016y-11m-08d-21h-38m-12s UTC integration manifest
abc7e21 drm/i915/audio: fix hdmi audio noise issue
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2939/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/audio: fix hdmi audio noise issue
2016-11-09 8:27 [PATCH] drm/i915/audio: fix hdmi audio noise issue libin.yang
2016-11-09 9:16 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2016-11-09 10:59 ` Jani Nikula
2016-11-10 1:48 ` Yang, Libin
1 sibling, 1 reply; 4+ messages in thread
From: Jani Nikula @ 2016-11-09 10:59 UTC (permalink / raw)
To: libin.yang, intel-gfx, ville.syrjala, daniel.vetter, tiwai
On Wed, 09 Nov 2016, libin.yang@intel.com wrote:
> From: Libin Yang <libin.yang@intel.com>
>
> This issue is caused by:
> 6014ac12: drm/i915/audio: set proper N/M in modeset
>
> Some special monitors will have noise or even no sound after
> applying the patch 6014ac12.
>
> In patch 6014ac12, it will reset the cts value to 0 for HDMI.
> However, we need disable Enable CTS or M Prog bit. This is
> the initial setting after HW reset.
>
Fixes: 6014ac122ed0 ("drm/i915/audio: set proper N/M in modeset")
> Signed-off-by: Libin Yang <libin.yang@intel.com>
> ---
> drivers/gpu/drm/i915/intel_audio.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 813fd74..a472d35 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -332,6 +332,13 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port,
> int n;
> u32 tmp;
>
> + /* reset CTS value to 0 */
> + tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(pipe));
> + tmp &= ~AUD_CONFIG_M_MASK;
> + tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
> + tmp |= AUD_M_CTS_M_PROG_ENABLE;
> + I915_WRITE(HSW_AUD_M_CTS_ENABLE(pipe), tmp);
> +
> tmp = I915_READ(HSW_AUD_CFG(pipe));
> tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
> tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
> @@ -351,10 +358,12 @@ hsw_hdmi_audio_config_update(struct intel_crtc *intel_crtc, enum port port,
>
> I915_WRITE(HSW_AUD_CFG(pipe), tmp);
>
> + /*
> + * Let's disable "Enable CTS or M Prog bit"
> + * and let HW calculate the value
> + */
> tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(pipe));
> - tmp &= ~AUD_CONFIG_M_MASK;
> - tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
> - tmp |= AUD_M_CTS_M_PROG_ENABLE;
> + tmp &= ~AUD_M_CTS_M_PROG_ENABLE;
> I915_WRITE(HSW_AUD_M_CTS_ENABLE(pipe), tmp);
Is it necessary to do the HSW_AUD_M_CTS_ENABLE updates in two places?
Why do you both enable and disable AUD_M_CTS_M_PROG_ENABLE bit here?
BR,
Jani.
> }
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/audio: fix hdmi audio noise issue
2016-11-09 10:59 ` [PATCH] " Jani Nikula
@ 2016-11-10 1:48 ` Yang, Libin
0 siblings, 0 replies; 4+ messages in thread
From: Yang, Libin @ 2016-11-10 1:48 UTC (permalink / raw)
To: Jani Nikula, intel-gfx@lists.freedesktop.org,
ville.syrjala@linux.intel.com, Vetter, Daniel, tiwai@suse.de
> -----Original Message-----
> From: Jani Nikula [mailto:jani.nikula@linux.intel.com]
> Sent: Wednesday, November 9, 2016 6:59 PM
> To: Yang, Libin <libin.yang@intel.com>; intel-gfx@lists.freedesktop.org;
> ville.syrjala@linux.intel.com; Vetter, Daniel <daniel.vetter@intel.com>;
> tiwai@suse.de
> Cc: Yang, Libin <libin.yang@intel.com>
> Subject: Re: [PATCH] drm/i915/audio: fix hdmi audio noise issue
>
> On Wed, 09 Nov 2016, libin.yang@intel.com wrote:
> > From: Libin Yang <libin.yang@intel.com>
> >
> > This issue is caused by:
> > 6014ac12: drm/i915/audio: set proper N/M in modeset
> >
> > Some special monitors will have noise or even no sound after applying
> > the patch 6014ac12.
> >
> > In patch 6014ac12, it will reset the cts value to 0 for HDMI.
> > However, we need disable Enable CTS or M Prog bit. This is the initial
> > setting after HW reset.
> >
>
> Fixes: 6014ac122ed0 ("drm/i915/audio: set proper N/M in modeset")
Get it. Thanks.
>
> > Signed-off-by: Libin Yang <libin.yang@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_audio.c | 15 ++++++++++++---
> > 1 file changed, 12 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c
> > b/drivers/gpu/drm/i915/intel_audio.c
> > index 813fd74..a472d35 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -332,6 +332,13 @@ hsw_hdmi_audio_config_update(struct intel_crtc
> *intel_crtc, enum port port,
> > int n;
> > u32 tmp;
> >
> > + /* reset CTS value to 0 */
> > + tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(pipe));
> > + tmp &= ~AUD_CONFIG_M_MASK;
> > + tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
> > + tmp |= AUD_M_CTS_M_PROG_ENABLE;
> > + I915_WRITE(HSW_AUD_M_CTS_ENABLE(pipe), tmp);
> > +
> > tmp = I915_READ(HSW_AUD_CFG(pipe));
> > tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
> > tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
> > @@ -351,10 +358,12 @@ hsw_hdmi_audio_config_update(struct intel_crtc
> > *intel_crtc, enum port port,
> >
> > I915_WRITE(HSW_AUD_CFG(pipe), tmp);
> >
> > + /*
> > + * Let's disable "Enable CTS or M Prog bit"
> > + * and let HW calculate the value
> > + */
> > tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(pipe));
> > - tmp &= ~AUD_CONFIG_M_MASK;
> > - tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
> > - tmp |= AUD_M_CTS_M_PROG_ENABLE;
> > + tmp &= ~AUD_M_CTS_M_PROG_ENABLE;
> > I915_WRITE(HSW_AUD_M_CTS_ENABLE(pipe), tmp);
>
> Is it necessary to do the HSW_AUD_M_CTS_ENABLE updates in two places?
> Why do you both enable and disable AUD_M_CTS_M_PROG_ENABLE bit here?
>
> BR,
> Jani.
>
>
> > }
>
> --
> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-10 1:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-09 8:27 [PATCH] drm/i915/audio: fix hdmi audio noise issue libin.yang
2016-11-09 9:16 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-11-09 10:59 ` [PATCH] " Jani Nikula
2016-11-10 1:48 ` Yang, Libin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).