diff mbox

[11/15] drm/i915: Explicitly use ddi bug trans entry 9 for hdmi

Message ID 1449597590-6971-12-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Dec. 8, 2015, 5:59 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

When the DDI port is in HDMI/DVI mode, it automagically uses the buffer
translations values from entry 9. Let's make that explicit in the code.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel Vetter Dec. 10, 2015, 1:48 p.m. UTC | #1 
On Tue, Dec 08, 2015 at 07:59:46PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> When the DDI port is in HDMI/DVI mode, it automagically uses the buffer
> translations values from entry 9. Let's make that explicit in the code.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Or WARN_ON(i != 9); Either way don't see that much benefit, but I guess
won't hurt either. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 5f008f0fdc13..f812607045d6 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -516,9 +516,9 @@ void intel_prepare_ddi_buffers(struct intel_encoder *encoder)
>  		hdmi_level = hdmi_default_entry;
>  
>  	/* Entry 9 is for HDMI: */
> -	I915_WRITE(DDI_BUF_TRANS_LO(port, i),
> +	I915_WRITE(DDI_BUF_TRANS_LO(port, 9),
>  		   ddi_translations_hdmi[hdmi_level].trans1 | iboost_bit);
> -	I915_WRITE(DDI_BUF_TRANS_HI(port, i),
> +	I915_WRITE(DDI_BUF_TRANS_HI(port, 9),
>  		   ddi_translations_hdmi[hdmi_level].trans2);
>  }
>  
> -- 
> 2.4.10
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä Dec. 10, 2015, 2:41 p.m. UTC | #2 
On Thu, Dec 10, 2015 at 02:48:48PM +0100, Daniel Vetter wrote:
> On Tue, Dec 08, 2015 at 07:59:46PM +0200, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > When the DDI port is in HDMI/DVI mode, it automagically uses the buffer
> > translations values from entry 9. Let's make that explicit in the code.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Or WARN_ON(i != 9); Either way don't see that much benefit, but I guess
> won't hurt either. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

I guess I could just squash this with the split DP vs. HDMI buffer
programming patch since the 'i' will be gone there anyway.

> 
> > ---
> >  drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> > index 5f008f0fdc13..f812607045d6 100644
> > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > @@ -516,9 +516,9 @@ void intel_prepare_ddi_buffers(struct intel_encoder *encoder)
> >  		hdmi_level = hdmi_default_entry;
> >  
> >  	/* Entry 9 is for HDMI: */
> > -	I915_WRITE(DDI_BUF_TRANS_LO(port, i),
> > +	I915_WRITE(DDI_BUF_TRANS_LO(port, 9),
> >  		   ddi_translations_hdmi[hdmi_level].trans1 | iboost_bit);
> > -	I915_WRITE(DDI_BUF_TRANS_HI(port, i),
> > +	I915_WRITE(DDI_BUF_TRANS_HI(port, 9),
> >  		   ddi_translations_hdmi[hdmi_level].trans2);
> >  }
> >  
> > -- 
> > 2.4.10
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
Daniel Vetter Dec. 11, 2015, 5:22 p.m. UTC | #3 
On Thu, Dec 10, 2015 at 04:41:54PM +0200, Ville Syrjälä wrote:
> On Thu, Dec 10, 2015 at 02:48:48PM +0100, Daniel Vetter wrote:
> > On Tue, Dec 08, 2015 at 07:59:46PM +0200, ville.syrjala@linux.intel.com wrote:
> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > 
> > > When the DDI port is in HDMI/DVI mode, it automagically uses the buffer
> > > translations values from entry 9. Let's make that explicit in the code.
> > > 
> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Or WARN_ON(i != 9); Either way don't see that much benefit, but I guess
> > won't hurt either. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> I guess I could just squash this with the split DP vs. HDMI buffer
> programming patch since the 'i' will be gone there anyway.

Ah, that explains things more. Maybe mention this in the commit message.
r-b stands.
-Daniel

> 
> > 
> > > ---
> > >  drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> > > index 5f008f0fdc13..f812607045d6 100644
> > > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > > @@ -516,9 +516,9 @@ void intel_prepare_ddi_buffers(struct intel_encoder *encoder)
> > >  		hdmi_level = hdmi_default_entry;
> > >  
> > >  	/* Entry 9 is for HDMI: */
> > > -	I915_WRITE(DDI_BUF_TRANS_LO(port, i),
> > > +	I915_WRITE(DDI_BUF_TRANS_LO(port, 9),
> > >  		   ddi_translations_hdmi[hdmi_level].trans1 | iboost_bit);
> > > -	I915_WRITE(DDI_BUF_TRANS_HI(port, i),
> > > +	I915_WRITE(DDI_BUF_TRANS_HI(port, 9),
> > >  		   ddi_translations_hdmi[hdmi_level].trans2);
> > >  }
> > >  
> > > -- 
> > > 2.4.10
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > 
> > -- 
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
> 
> -- 
> Ville Syrjälä
> Intel OTC
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 5f008f0fdc13..f812607045d6 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -516,9 +516,9 @@  void intel_prepare_ddi_buffers(struct intel_encoder *encoder)
 		hdmi_level = hdmi_default_entry;
 
 	/* Entry 9 is for HDMI: */
-	I915_WRITE(DDI_BUF_TRANS_LO(port, i),
+	I915_WRITE(DDI_BUF_TRANS_LO(port, 9),
 		   ddi_translations_hdmi[hdmi_level].trans1 | iboost_bit);
-	I915_WRITE(DDI_BUF_TRANS_HI(port, i),
+	I915_WRITE(DDI_BUF_TRANS_HI(port, 9),
 		   ddi_translations_hdmi[hdmi_level].trans2);
 }