[Intel-gfx] [PATCH 4/4] drm/i915: Move scanline_offset and timestamping constant setup to intel_modeset_readout_hw_state()

[Daniel Vetter]

On Mon, Sep 14, 2015 at 02:04:31PM +0200, Patrik Jakobsson wrote:
> On Thu, Sep 10, 2015 at 06:59:10PM +0300, ville.syrjala at linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > intel_modeset_readout_hw_state() seems like the more appropriate place
> > for populating the scanline_offset and timestamping constants than
> > intel_sanitize_crtc() since they are basically part of the state we
> > read out.
> > 
> > Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > Cc: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Makes sense to move it.
> 
> Reviewed-by: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>

Merged all but patch 3 (since that one seems to still be contended) to
dinq.

Thanks, Daniel

> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 5fed120..88d9466 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -14918,8 +14918,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
> >  	if (crtc->active) {
> >  		struct intel_plane *plane;
> >  
> > -		drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode);
> > -		update_scanline_offset(crtc);
> >  		drm_crtc_vblank_on(&crtc->base);
> >  
> >  		/* Disable everything but the primary plane */
> > @@ -15216,6 +15214,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
> >  			 * recalculation.
> >  			 */
> >  			crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED;
> > +
> > +			drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode);
> > +			update_scanline_offset(crtc);
> >  		}
> >  	}
> >  }
> > -- 
> > 2.4.6
> > 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch