* [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell
@ 2013-01-22 15:25 Wang Xingchao
2013-01-22 19:08 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Wang Xingchao @ 2013-01-22 15:25 UTC (permalink / raw)
To: intel-gfx, daniel.vetter; +Cc: paulo.r.zanoni
ELD info should be updated dynamically according to hot plug event.
For haswell chip, clear/set the eld valid bit and output enable bit
from callback intel_disable/eanble_ddi().
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 21 +++++++++++++++++++++
drivers/gpu/drm/i915/intel_display.c | 4 ++++
drivers/gpu/drm/i915/intel_drv.h | 1 +
3 files changed, 26 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index f02b3fe..821316c 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -650,6 +650,7 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
DRM_DEBUG_KMS("Preparing DDI mode for Haswell on port %c, pipe %c\n",
port_name(port), pipe_name(pipe));
+ intel_crtc->eld_vld = false;
if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
@@ -1274,10 +1275,14 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
static void intel_enable_ddi(struct intel_encoder *intel_encoder)
{
struct drm_encoder *encoder = &intel_encoder->base;
+ struct drm_crtc *crtc = encoder->crtc;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ int pipe = intel_crtc->pipe;
struct drm_device *dev = encoder->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
enum port port = intel_ddi_get_encoder_port(intel_encoder);
int type = intel_encoder->type;
+ uint32_t tmp;
if (type == INTEL_OUTPUT_HDMI) {
/* In HDMI/DVI mode, the port width, and swing/emphasis values
@@ -1290,18 +1295,34 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
ironlake_edp_backlight_on(intel_dp);
}
+
+ if (intel_crtc->eld_vld) {
+ tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
+ tmp |= ((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
+ I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp);
+ }
}
static void intel_disable_ddi(struct intel_encoder *intel_encoder)
{
struct drm_encoder *encoder = &intel_encoder->base;
+ struct drm_crtc *crtc = encoder->crtc;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ int pipe = intel_crtc->pipe;
int type = intel_encoder->type;
+ struct drm_device *dev = encoder->dev;
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ uint32_t tmp;
if (type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
ironlake_edp_backlight_off(intel_dp);
}
+
+ tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
+ tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
+ I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp);
}
int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1464e47..11fbe04 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3745,10 +3745,12 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
struct drm_device *dev = crtc->dev;
struct drm_connector *connector;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
/* crtc should still be enabled when we disable it. */
WARN_ON(!crtc->enabled);
+ intel_crtc->eld_vld = false;
dev_priv->display.crtc_disable(crtc);
intel_crtc_update_sarea(crtc, false);
dev_priv->display.off(crtc);
@@ -5622,6 +5624,7 @@ static void haswell_write_eld(struct drm_connector *connector,
struct drm_i915_private *dev_priv = connector->dev->dev_private;
uint8_t *eld = connector->eld;
struct drm_device *dev = crtc->dev;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
uint32_t eldv;
uint32_t i;
int len;
@@ -5663,6 +5666,7 @@ static void haswell_write_eld(struct drm_connector *connector,
DRM_DEBUG_DRIVER("ELD on pipe %c\n", pipe_name(pipe));
eldv = AUDIO_ELD_VALID_A << (pipe * 4);
+ intel_crtc->eld_vld = true;
if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 116580b..be588da 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -206,6 +206,7 @@ struct intel_crtc {
* some outputs connected to this crtc.
*/
bool active;
+ bool eld_vld;
bool primary_disabled; /* is the crtc obscured by a plane? */
bool lowfreq_avail;
struct intel_overlay *overlay;
--
1.7.9.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell
2013-01-22 15:25 [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell Wang Xingchao
@ 2013-01-22 19:08 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2013-01-22 19:08 UTC (permalink / raw)
To: Wang Xingchao; +Cc: daniel.vetter, intel-gfx, paulo.r.zanoni
On Tue, Jan 22, 2013 at 11:25:25PM +0800, Wang Xingchao wrote:
> ELD info should be updated dynamically according to hot plug event.
> For haswell chip, clear/set the eld valid bit and output enable bit
> from callback intel_disable/eanble_ddi().
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
> Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
Queued for -next, thanks for the patch. For further patches please include
an in-patch changelog for the different patch iterations, that way it's
really clear what (and why) something changed compared to a previous patch
submission. Otherwise if a patch later on causes issues or is unclear why
we need a given piece of code it's much more work to dig out the old
discussions and conclusions.
Cheers, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell
@ 2013-01-07 5:20 Wang Xingchao
2013-01-14 17:00 ` Rodrigo Vivi
0 siblings, 1 reply; 5+ messages in thread
From: Wang Xingchao @ 2013-01-07 5:20 UTC (permalink / raw)
To: daniel.vetter, intel-gfx, paulo.r.zanoni
ELD info should be updated dynamically according to hot plug event.
For haswell chip, clear/set the eld valid bit and output enable bit
from callback intel_disable/eanble_ddi().
Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index f02b3fe..a80125f 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1274,10 +1274,15 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
static void intel_enable_ddi(struct intel_encoder *intel_encoder)
{
struct drm_encoder *encoder = &intel_encoder->base;
+ struct drm_crtc *crtc = encoder->crtc;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ int pipe = intel_crtc->pipe;
struct drm_device *dev = encoder->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
enum port port = intel_ddi_get_encoder_port(intel_encoder);
int type = intel_encoder->type;
+ int aud_cntrl_st2 = HSW_AUD_PIN_ELD_CP_VLD;
+ int tmp;
if (type == INTEL_OUTPUT_HDMI) {
/* In HDMI/DVI mode, the port width, and swing/emphasis values
@@ -1290,18 +1295,33 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
ironlake_edp_backlight_on(intel_dp);
}
+
+ tmp = I915_READ(aud_cntrl_st2);
+ tmp |= ((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
+ I915_WRITE(aud_cntrl_st2, tmp);
}
static void intel_disable_ddi(struct intel_encoder *intel_encoder)
{
struct drm_encoder *encoder = &intel_encoder->base;
+ struct drm_crtc *crtc = encoder->crtc;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ int pipe = intel_crtc->pipe;
int type = intel_encoder->type;
+ int aud_cntrl_st2 = HSW_AUD_PIN_ELD_CP_VLD;
+ struct drm_device *dev = encoder->dev;
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ int tmp;
if (type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
ironlake_edp_backlight_off(intel_dp);
}
+
+ tmp = I915_READ(aud_cntrl_st2);
+ tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
+ I915_WRITE(aud_cntrl_st2, tmp);
}
int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell
2013-01-07 5:20 Wang Xingchao
@ 2013-01-14 17:00 ` Rodrigo Vivi
2013-01-18 2:49 ` Wang, Xingchao
0 siblings, 1 reply; 5+ messages in thread
From: Rodrigo Vivi @ 2013-01-14 17:00 UTC (permalink / raw)
To: Wang Xingchao; +Cc: Daniel Vetter, intel-gfx, Paulo Zanoni
Hi Wang,
I would prefer to use defined HSW_AUD_PIN_ELD_CP_VLD directly at
read/write macros instead of creating an variable aud_cntrl_st2.
But this is minor, the other question I have here, why are you doing
this only for pipe A instead of pipe in use?
On Mon, Jan 7, 2013 at 3:20 AM, Wang Xingchao <xingchao.wang@intel.com> wrote:
> ELD info should be updated dynamically according to hot plug event.
> For haswell chip, clear/set the eld valid bit and output enable bit
> from callback intel_disable/eanble_ddi().
>
> Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index f02b3fe..a80125f 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1274,10 +1274,15 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
> static void intel_enable_ddi(struct intel_encoder *intel_encoder)
> {
> struct drm_encoder *encoder = &intel_encoder->base;
> + struct drm_crtc *crtc = encoder->crtc;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> + int pipe = intel_crtc->pipe;
> struct drm_device *dev = encoder->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> enum port port = intel_ddi_get_encoder_port(intel_encoder);
> int type = intel_encoder->type;
> + int aud_cntrl_st2 = HSW_AUD_PIN_ELD_CP_VLD;
> + int tmp;
>
> if (type == INTEL_OUTPUT_HDMI) {
> /* In HDMI/DVI mode, the port width, and swing/emphasis values
> @@ -1290,18 +1295,33 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
>
> ironlake_edp_backlight_on(intel_dp);
> }
> +
> + tmp = I915_READ(aud_cntrl_st2);
> + tmp |= ((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
> + I915_WRITE(aud_cntrl_st2, tmp);
> }
>
> static void intel_disable_ddi(struct intel_encoder *intel_encoder)
> {
> struct drm_encoder *encoder = &intel_encoder->base;
> + struct drm_crtc *crtc = encoder->crtc;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> + int pipe = intel_crtc->pipe;
> int type = intel_encoder->type;
> + int aud_cntrl_st2 = HSW_AUD_PIN_ELD_CP_VLD;
> + struct drm_device *dev = encoder->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + int tmp;
>
> if (type == INTEL_OUTPUT_EDP) {
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>
> ironlake_edp_backlight_off(intel_dp);
> }
> +
> + tmp = I915_READ(aud_cntrl_st2);
> + tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
> + I915_WRITE(aud_cntrl_st2, tmp);
> }
>
> int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell
2013-01-14 17:00 ` Rodrigo Vivi
@ 2013-01-18 2:49 ` Wang, Xingchao
0 siblings, 0 replies; 5+ messages in thread
From: Wang, Xingchao @ 2013-01-18 2:49 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: Daniel Vetter, intel-gfx, Zanoni, Paulo R
Hi Vivi,
> -----Original Message-----
> From: Rodrigo Vivi [mailto:rodrigo.vivi@gmail.com]
> Sent: Tuesday, January 15, 2013 1:00 AM
> To: Wang, Xingchao
> Cc: Daniel Vetter; intel-gfx; Zanoni, Paulo R
> Subject: Re: [Intel-gfx] [PATCH] drm/i915: HDMI/DP - ELD info refresh support
> for Haswell
>
> Hi Wang,
>
> I would prefer to use defined HSW_AUD_PIN_ELD_CP_VLD directly at
> read/write macros instead of creating an variable aud_cntrl_st2.
Okay, will modify that in second version patch.
> But this is minor, the other question I have here, why are you doing this only for
> pipe A instead of pipe in use?
>
No, the patch is making fix for the current using pipe, not only for pipe A. please note below line:
tmp |= ((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
Thanks
--xingchao
> On Mon, Jan 7, 2013 at 3:20 AM, Wang Xingchao <xingchao.wang@intel.com>
> wrote:
> > ELD info should be updated dynamically according to hot plug event.
> > For haswell chip, clear/set the eld valid bit and output enable bit
> > from callback intel_disable/eanble_ddi().
> >
> > Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++++++++++++
> > 1 file changed, 20 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> > b/drivers/gpu/drm/i915/intel_ddi.c
> > index f02b3fe..a80125f 100644
> > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > @@ -1274,10 +1274,15 @@ static void intel_ddi_post_disable(struct
> > intel_encoder *intel_encoder) static void intel_enable_ddi(struct
> > intel_encoder *intel_encoder) {
> > struct drm_encoder *encoder = &intel_encoder->base;
> > + struct drm_crtc *crtc = encoder->crtc;
> > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > + int pipe = intel_crtc->pipe;
> > struct drm_device *dev = encoder->dev;
> > struct drm_i915_private *dev_priv = dev->dev_private;
> > enum port port = intel_ddi_get_encoder_port(intel_encoder);
> > int type = intel_encoder->type;
> > + int aud_cntrl_st2 = HSW_AUD_PIN_ELD_CP_VLD;
> > + int tmp;
> >
> > if (type == INTEL_OUTPUT_HDMI) {
> > /* In HDMI/DVI mode, the port width, and
> > swing/emphasis values @@ -1290,18 +1295,33 @@ static void
> > intel_enable_ddi(struct intel_encoder *intel_encoder)
> >
> > ironlake_edp_backlight_on(intel_dp);
> > }
> > +
> > + tmp = I915_READ(aud_cntrl_st2);
> > + tmp |= ((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) <<
> (pipe * 4));
> > + I915_WRITE(aud_cntrl_st2, tmp);
> > }
> >
> > static void intel_disable_ddi(struct intel_encoder *intel_encoder) {
> > struct drm_encoder *encoder = &intel_encoder->base;
> > + struct drm_crtc *crtc = encoder->crtc;
> > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > + int pipe = intel_crtc->pipe;
> > int type = intel_encoder->type;
> > + int aud_cntrl_st2 = HSW_AUD_PIN_ELD_CP_VLD;
> > + struct drm_device *dev = encoder->dev;
> > + struct drm_i915_private *dev_priv = dev->dev_private;
> > + int tmp;
> >
> > if (type == INTEL_OUTPUT_EDP) {
> > struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> >
> > ironlake_edp_backlight_off(intel_dp);
> > }
> > +
> > + tmp = I915_READ(aud_cntrl_st2);
> > + tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) <<
> (pipe * 4));
> > + I915_WRITE(aud_cntrl_st2, tmp);
> > }
> >
> > int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-22 19:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-22 15:25 [PATCH] drm/i915: HDMI/DP - ELD info refresh support for Haswell Wang Xingchao
2013-01-22 19:08 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2013-01-07 5:20 Wang Xingchao
2013-01-14 17:00 ` Rodrigo Vivi
2013-01-18 2:49 ` Wang, Xingchao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox