drm/i915/audio: fix hdmi audio noise issue
Subsystems (2)
PATCH v3 1/1 drm/i915/audio: fix hdmi audio noise issue
From: Libin Yang <[email protected]>
Some 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 to disable Enable CTS or M Prog bit. This is the initial setting after HW reset.
--- drivers/gpu/drm/i915/intel_audio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +5 -2
@@ -351,10 +351,13 @@ 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_PROG_ENABLE ; tmp &= ~AUD_M_CTS_M_VALUE_INDEX ; - tmp |=AUD_M_CTS_M_PROG_ENABLE ;I915_WRITE (HSW_AUD_M_CTS_ENABLE (pipe), tmp); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915/audio: fix hdmi audio noise issue (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/audio: fix hdmi audio noise issue (rev3)
URL : https://patchwork.freedesktop.org/series/15012/
State : warning
== Summary ==
Series 15012v3 drm/i915/audio: fix hdmi audio noise issue
https://patchwork.freedesktop.org/api/1.0/series/15012/revisions/3/mbox/
Test drv_module_reload_basic:
pass -> DMESG-WARN (fi-skl-6770hq)
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-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-skl-6770hq total:244 pass:229 dwarn:1 dfail:0 fail:0 skip:14 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
0ecf26a8d5fc565fca1da9d66f65863de5e00ead drm-intel-nightly: 2016y-11m-11d-08h-21m-01s UTC integration manifest bfc1b19 drm/i915/audio: fix hdmi audio noise issue
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2961/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · On Fri, 11 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Some 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 to 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 <[email protected]>
If this works, I guess all I can say is,
Quoted 23 lines
--- drivers/gpu/drm/i915/intel_audio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_audio.c +5
-2@@ -351,10 +351,13 @@ 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_PROG_ENABLE ; tmp &= ~AUD_M_CTS_M_VALUE_INDEX ; - tmp |=AUD_M_CTS_M_PROG_ENABLE ;I915_WRITE (HSW_AUD_M_CTS_ENABLE (pipe), tmp); }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · On Fri, 11 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Some 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 to 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 <[email protected]>
Pushed to dinq, thanks for the patch.
BR,
Jani.
Quoted 23 lines
--- drivers/gpu/drm/i915/intel_audio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_audio.c +5
-2@@ -351,10 +351,13 @@ 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_PROG_ENABLE ; tmp &= ~AUD_M_CTS_M_VALUE_INDEX ; - tmp |=AUD_M_CTS_M_PROG_ENABLE ;I915_WRITE (HSW_AUD_M_CTS_ENABLE (pipe), tmp); }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx