drm/i915:Added HDMI Audio codec disable sequence for HSW.
Subsystems (2)
PATCH 1/1 drm/i915:Added HDMI Audio codec disable sequence for HSW.
From: Mukesh <[email protected]>
The code implements hsw_hdmi_audio_disable func which sets the relevant registers for disabling the audio codec in a call to intel_disable_ddi func.This audio codec disbale sequence is implemented as per the recommendation of the Bspec.
--- drivers/gpu/drm/i915/intel_ddi.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/gpu/drm/i915/intel_ddi.c +41 -0
@@ -1119,6 +1119,43 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)I915_WRITE (PORT_CLK_SEL (port),PORT_CLK_SEL_NONE ); } +/* Sets the registers for audio codec disable sequence as +* mentioned in the Haswell Bspec. +*/ +void hsw_hdmi_audio_disable (struct drm_encoder *encoder) +{ +u32 temp; +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); +struct drm_device *dev = encoder->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +int aud_config =HSW_AUD_CFG (intel_crtc->pipe); + +/* HDMI audio disable sequence for Haswell*/ +if (intel_crtc->eld_vld) { +/* disable timestamps */ + temp =I915_READ (aud_config); +/* write 0 for HDMI */ + temp &= ~AUD_CONFIG_N_VALUE_INDEX ; +/* Set N_programming_enable */ + temp |=AUD_CONFIG_N_PROG_ENABLE ; +/* Set Upper_N_value and Lower_N_value +(bits 27:20, 15:4) to all "0"s */ + temp &= ~(AUD_CONFIG_UPPER_N_VALUE |AUD_CONFIG_LOWER_N_VALUE ); +I915_WRITE (aud_config, temp); +/* Disable ELDV and ELD buffer */ + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + temp &= ~(AUDIO_ELD_VALID_A << (intel_crtc->pipe *4 )); +I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , temp); +/* Wait for 2 vertical blanks */ +intel_wait_for_vblank (dev, intel_crtc->pipe); +intel_wait_for_vblank (dev, intel_crtc->pipe); +/* Disable audio PD. This is optional as per Bspec. */ + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + temp &= ~(AUDIO_OUTPUT_ENABLE_A << (intel_crtc->pipe *4 )); +I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , temp); + } + +}static void intel_enable_ddi (struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base;
@@ -1173,6 +1210,10 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) tmp &= ~((AUDIO_OUTPUT_ENABLE_A |AUDIO_ELD_VALID_A ) << (pipe *4 ));I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , tmp); +if (IS_HASWELL (dev) && (type ==INTEL_OUTPUT_HDMI )) { +/*HDMI audio codec disable sequence. */ +hsw_hdmi_audio_disable (encoder); + } }if (type ==INTEL_OUTPUT_EDP ) {
Signature · 1 line
1.8.1.2
Hi Daniel and Mukesh,
This patch is submitted on behalf of Arora Mukesh. Please have a review.
And the 2nd version of patch is also submitted with subject: [PATCH v2] drm/i915/hsw: Add display Audio codec disable sequence for Haswell. Please also have a review.
http://lists.freedesktop.org/archives/intel-gfx/2013-August/032488.html
In the new patch, I did some modification to this original patch, to apply to both HDMI and DP port:
- rename the function from hsw_hdmi_audio_disable() to intel_disable_audio()
- let intel_disable_ddi() call this new function for both HDMI and DP port.
- remove redundant device check, since only Haswell and its successors use DDI port operations in intel_ddi.c
Thanks
Mengdong
Quoted 90 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: Friday, August 30, 2013 7:48 AM
To: [email protected]
Cc: Arora, MukeshX
Subject: [Intel-gfx] [PATCH] [VPG HSW-A] drm/i915:Added HDMI Audio codec disable sequence for HSW.From: Mukesh <[email protected]>
The code implements
hsw_hdmi_audio_disablefunc which sets the relevant registers for disabling the audio codec in a call tointel_disable_ddifunc.This audio codec disbale sequence is implemented as per the recommendation of the Bspec.Change-Id If6eefbfe5ef821db547c759caa9ff5dc18980738Signed-off-by Mukesh Arora <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)drivers/gpu/drm/i915/intel_ddi.c +37
-0@@ -1119,6 +1119,43 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)I915_WRITE (PORT_CLK_SEL (port ),PORT_CLK_SEL_NONE ); } +/* Sets the registers for audio codec disable sequence as +* mentioned in the Haswell Bspec. +*/ +void hsw_hdmi_audio_disable (struct drm_encoder *encoder) { +u32 temp; +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); +struct drm_device *dev = encoder->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +int aud_config =HSW_AUD_CFG (intel_crtc->pipe); + +/* HDMI audio disable sequence for Haswell*/ +if (intel_crtc->eld_vld) { +/* disable timestamps */ + temp =I915_READ (aud_config); +/* write 0 for HDMI */ + temp &= ~AUD_CONFIG_N_VALUE_INDEX ; +/* Set N_programming_enable */ + temp |=AUD_CONFIG_N_PROG_ENABLE ; +/* Set Upper_N_value and Lower_N_value +(bits 27:20, 15:4) to all "0"s */ + temp &= ~(AUD_CONFIG_UPPER_N_VALUE |AUD_CONFIG_LOWER_N_VALUE ); +I915_WRITE (aud_config, temp); +/* Disable ELDV and ELD buffer */ + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + temp &= ~(AUDIO_ELD_VALID_A << (intel_crtc->pipe *4 )); +I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , temp); +/* Wait for 2 vertical blanks */ +intel_wait_for_vblank (dev, intel_crtc->pipe); +intel_wait_for_vblank (dev, intel_crtc->pipe); +/* Disable audio PD. This is optional as per Bspec. */ + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + temp &= ~(AUDIO_OUTPUT_ENABLE_A << (intel_crtc->pipe *4 )); +I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , temp); + } + +}static void intel_enable_ddi (struct intel_encoder *intel_encoder) { struct drm_encoder *encoder = &intel_encoder->base; @@ -1173,6 +1210,10 @@ static void intel_disable_ddi(struct intel_encoder
*intel_encoder)drivers/gpu/drm/i915/intel_ddi.c +4
-1tmp &= ~((AUDIO_OUTPUT_ENABLE_A |AUDIO_ELD_VALID_A ) << (pipe *4 ));I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , tmp); +if (IS_HASWELL (dev) && (type ==INTEL_OUTPUT_HDMI )) { +/*HDMI audio codec disable sequence. */ +hsw_hdmi_audio_disable (encoder); + } }if (type ==INTEL_OUTPUT_EDP ) { --1.8.1.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx