[PATCH v2] drm/i915: Enable DP audio for Haswell

[PATCH v2] drm/i915: Enable DP audio for Haswell

[Takashi Iwai]

This patch adds the missing code to send ELD for Haswell DisplayPort,
based on Xingchao's original patch.

A test was performed with HSW-D machine and NEC EA232Wmi DP monitor.

Cc: Xingchao Wang <xingchao.wang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
v1->v2: Fixed a typo

 drivers/gpu/drm/i915/intel_ddi.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 58f50eb..d706d53 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -669,6 +669,15 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
 			break;
 		}
 
+		if (intel_dp->has_audio) {
+			DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",
+					 pipe_name(intel_crtc->pipe));
+
+			/* write eld */
+			DRM_DEBUG_DRIVER("DP audio: write eld information\n");
+			intel_write_eld(encoder, adjusted_mode);
+		}
+
 		intel_dp_init_link_config(intel_dp);
 
 	} else if (type == INTEL_OUTPUT_HDMI) {
-- 
1.8.0

Re: [PATCH v2] drm/i915: Enable DP audio for Haswell

[Paulo Zanoni]

2012/11/19 Takashi Iwai <tiwai@suse.de>:
> This patch adds the missing code to send ELD for Haswell DisplayPort,
> based on Xingchao's original patch.
>
> A test was performed with HSW-D machine and NEC EA232Wmi DP monitor.
>
> Cc: Xingchao Wang <xingchao.wang@intel.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> ---
> v1->v2: Fixed a typo
>
>  drivers/gpu/drm/i915/intel_ddi.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 58f50eb..d706d53 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -669,6 +669,15 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
>                         break;
>                 }
>
> +               if (intel_dp->has_audio) {
> +                       DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",
> +                                        pipe_name(intel_crtc->pipe));
> +
> +                       /* write eld */
> +                       DRM_DEBUG_DRIVER("DP audio: write eld information\n");
> +                       intel_write_eld(encoder, adjusted_mode);
> +               }
> +
>                 intel_dp_init_link_config(intel_dp);
>
>         } else if (type == INTEL_OUTPUT_HDMI) {
> --
> 1.8.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni

Re: [PATCH v2] drm/i915: Enable DP audio for Haswell

[Daniel Vetter]

On Tue, Nov 20, 2012 at 12:54:02PM -0200, Paulo Zanoni wrote:
> 2012/11/19 Takashi Iwai <tiwai@suse.de>:
> > This patch adds the missing code to send ELD for Haswell DisplayPort,
> > based on Xingchao's original patch.
> >
> > A test was performed with HSW-D machine and NEC EA232Wmi DP monitor.
> >
> > Cc: Xingchao Wang <xingchao.wang@intel.com>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> 
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch