[Intel-gfx] [PATCH v2 3/6] drm/atomic: Clean up wait_for_vblanks, v2.

[Daniel Vetter]

On Thu, Dec 15, 2016 at 12:51:42PM +0100, Maarten Lankhorst wrote:
> Stop relying on a per crtc_state last_vblank_count, we shouldn't touch
> crtc_state after commit. Move it to atomic_state->crtcs.
> 
> Also stop re-using new_crtc_state->enable, we can now simply set a
> bitmask with crtc_crtc_mask.
> 
> Changes since v1:
> - Keep last_vblank_count in __drm_crtc_state.

Just noticed: sob is missing.

With that fixed Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>


> ---
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index d19563651e07..88c0986d226a 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1110,19 +1110,19 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
>  	struct drm_crtc *crtc;
>  	struct drm_crtc_state *old_crtc_state;
>  	int i, ret;
> +	unsigned crtc_mask = 0;
>  
> -	for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
> -		/* No one cares about the old state, so abuse it for tracking
> -		 * and store whether we hold a vblank reference (and should do a
> -		 * vblank wait) in the ->enable boolean. */
> -		old_crtc_state->enable = false;
> +	 /*
> +	  * Legacy cursor ioctls are completely unsynced, and userspace
> +	  * relies on that (by doing tons of cursor updates).
> +	  */
> +	if (old_state->legacy_cursor_update)
> +		return;
>  
> -		if (!crtc->state->active)
> -			continue;
> +	for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
> +		struct drm_crtc_state *new_crtc_state = crtc->state;
>  
> -		/* Legacy cursor ioctls are completely unsynced, and userspace
> -		 * relies on that (by doing tons of cursor updates). */
> -		if (old_state->legacy_cursor_update)
> +		if (!new_crtc_state->active)
>  			continue;
>  
>  		if (!drm_atomic_helper_framebuffer_changed(dev,
> @@ -1133,16 +1133,16 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
>  		if (ret != 0)
>  			continue;
>  
> -		old_crtc_state->enable = true;
> -		old_crtc_state->last_vblank_count = drm_crtc_vblank_count(crtc);
> +		crtc_mask |= drm_crtc_mask(crtc);
> +		old_state->crtcs[i].last_vblank_count = drm_crtc_vblank_count(crtc);
>  	}
>  
>  	for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
> -		if (!old_crtc_state->enable)
> +		if (!(crtc_mask & drm_crtc_mask(crtc)))
>  			continue;
>  
>  		ret = wait_event_timeout(dev->vblank[i].queue,
> -				old_crtc_state->last_vblank_count !=
> +				old_state->crtcs[i].last_vblank_count !=
>  					drm_crtc_vblank_count(crtc),
>  				msecs_to_jiffies(50));
>  
> diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
> index d6d241f63b9f..617f095e31ba 100644
> --- a/include/drm/drm_atomic.h
> +++ b/include/drm/drm_atomic.h
> @@ -145,6 +145,7 @@ struct __drm_crtcs_state {
>  	struct drm_crtc_state *state;
>  	struct drm_crtc_commit *commit;
>  	s64 __user *out_fence_ptr;
> +	unsigned last_vblank_count;
>  };
>  
>  struct __drm_connnectors_state {
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 946672f97e1e..e03d194be086 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -93,8 +93,6 @@ struct drm_plane_helper_funcs;
>   * @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes
>   * @connector_mask: bitmask of (1 << drm_connector_index(connector)) of attached connectors
>   * @encoder_mask: bitmask of (1 << drm_encoder_index(encoder)) of attached encoders
> - * @last_vblank_count: for helpers and drivers to capture the vblank of the
> - * 	update to ensure framebuffer cleanup isn't done too early
>   * @adjusted_mode: for use by helpers and drivers to compute adjusted mode timings
>   * @mode: current mode timings
>   * @mode_blob: &drm_property_blob for @mode
> @@ -140,9 +138,6 @@ struct drm_crtc_state {
>  	u32 connector_mask;
>  	u32 encoder_mask;
>  
> -	/* last_vblank_count: for vblank waits before cleanup */
> -	u32 last_vblank_count;
> -
>  	/* adjusted_mode: for use by helpers and drivers */
>  	struct drm_display_mode adjusted_mode;
>  
> 

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