[Intel-gfx] [PATCH 1/5] drm/i915: Signal drm events for atomic

[Daniel Vetter]

On Tue, Jun 14, 2016 at 10:21:02AM +0200, Maarten Lankhorst wrote:
> Op 13-06-16 om 16:13 schreef Daniel Vetter:
> > This is part of what atomic must implement. And it's also required
> > to be able to use the helper nonblocking support.
> >
> > v2: Always send out the drm event, remove the planes_changed check.
> Hey,
> 
> There used to be a patch to add a test in kms_atomic for testing vblank events, has this ever been committed?

Not sure, I'll ping Daniel Stone/Gustavo on irc a bit about this one.
-Daniel

> 
> ~Maarten
> > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 13 ++++++++++---
> >  drivers/gpu/drm/i915/intel_sprite.c  | 14 ++++++++++++++
> >  2 files changed, 24 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 801e4c17dd8d..a4ebf9df7dc3 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -13774,13 +13774,21 @@ static int intel_atomic_commit(struct drm_device *dev,
> >  		bool modeset = needs_modeset(crtc->state);
> >  		struct intel_crtc_state *pipe_config =
> >  			to_intel_crtc_state(crtc->state);
> > -		bool update_pipe = !modeset && pipe_config->update_pipe;
> >  
> >  		if (modeset && crtc->state->active) {
> >  			update_scanline_offset(to_intel_crtc(crtc));
> >  			dev_priv->display.crtc_enable(crtc);
> >  		}
> >  
> > +		/* Complete events for now disable pipes here. */
> > +		if (modeset && !crtc->state->active && crtc->state->event) {
> > +			spin_lock_irq(&dev->event_lock);
> > +			drm_crtc_send_vblank_event(crtc, crtc->state->event);
> > +			spin_unlock_irq(&dev->event_lock);
> > +
> > +			crtc->state->event = NULL;
> > +		}
> > +
> >  		if (!modeset)
> >  			intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
> >  
> > @@ -13788,8 +13796,7 @@ static int intel_atomic_commit(struct drm_device *dev,
> >  		    drm_atomic_get_existing_plane_state(state, crtc->primary))
> >  			intel_fbc_enable(intel_crtc);
> >  
> > -		if (crtc->state->active &&
> > -		    (crtc->state->planes_changed || update_pipe))
> > +		if (crtc->state->active)
> >  			drm_atomic_helper_commit_planes_on_crtc(old_crtc_state);
> >  
> >  		if (pipe_config->base.active && needs_vblank_wait(pipe_config))
> > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> > index 324ccb06397d..fc654173c491 100644
> > --- a/drivers/gpu/drm/i915/intel_sprite.c
> > +++ b/drivers/gpu/drm/i915/intel_sprite.c
> > @@ -166,6 +166,20 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
> >  
> >  	trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end);
> >  
> > +	/* We're still in the vblank-evade critical section, this can't race.
> > +	 * Would be slightly nice to just grab the vblank count and arm the
> > +	 * event outside of the critical section - the spinlock might spin for a
> > +	 * while ... */
> > +	if (crtc->base.state->event) {
> > +		WARN_ON(drm_crtc_vblank_get(&crtc->base) != 0);
> > +
> > +		spin_lock(&crtc->base.dev->event_lock);
> > +		drm_crtc_arm_vblank_event(&crtc->base, crtc->base.state->event);
> > +		spin_unlock(&crtc->base.dev->event_lock);
> > +
> > +		crtc->base.state->event = NULL;
> > +	}
> > +
> >  	local_irq_enable();
> >  
> >  	if (crtc->debug.start_vbl_count &&
> 
> 

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