[Intel-gfx] [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state

[Ander Conselvan De Oliveira]

On pe, 2015-01-30 at 12:15 +0200, Jani Nikula wrote:
> On Fri, 30 Jan 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com> wrote:
> > On the hardware state readout path, using crtc->config happens to work
> > since the proper value is written to it before encoder->get_config() is
> > called. However, in the check_crtc() path, the state will be read from
> > the cpu_transcoder in the software tracking, instead of the one just
> > read out from hw. Using the field in the supplied intel_crtc_state
> > should do the right thing in both cases.
> >
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> > ---
> >
> > I noticed this while reading the code. Patch is only compiled tested.

I did a quick search, but I didn't find anything that seems related.
This shouldn't fix anything but a hypothetical WARN() after modeset, due
to the state tracked in software being different from what is read out
off the hardware.

Ander

> 
> There might be a bug for this.
> 
> BR,
> Jani.
> 
> >
> > ---
> >  drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> > index 2856b0b..9f67a37 100644
> > --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> > @@ -226,7 +226,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
> >  	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> >  	struct drm_device *dev = encoder->base.dev;
> >  	struct drm_i915_private *dev_priv = dev->dev_private;
> > -	enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
> > +	enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> >  	u32 temp, flags = 0;
> >  
> >  	pipe_config->has_dp_encoder = true;
> > -- 
> > 2.1.0
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>