[Intel-gfx] [PATCH 1/5] drm/core: Set legacy_cursor_update in drm_atomic_helper_disable_plane.

[Daniel Vetter]

On Wed, Nov 11, 2015 at 11:29:07AM +0100, Maarten Lankhorst wrote:
> From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> 
> legacy_cursor_update was being set in restore_fbdev_mode_atomic which was
> probably unintended. Fix this by only setting it in the function that needs it.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

This oversight was introduced in

commit bbb1e52402b2a288b09ae37e8182599931c7e9df
Author: Rob Clark <robdclark at gmail.com>
Date:   Tue Aug 25 15:35:58 2015 -0400

    drm/fb-helper: atomic restore_fbdev_mode()...

With that added to the commit message:

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

> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 0c6f62168776..02d363ad35c9 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1553,6 +1553,10 @@ retry:
>  		goto fail;
>  	}
>  
> +	if (plane_state->crtc && (plane == plane->crtc->cursor))
> +		plane_state->state->legacy_cursor_update = true;
> +
> +
>  	ret = __drm_atomic_helper_disable_plane(plane, plane_state);
>  	if (ret != 0)
>  		goto fail;
> @@ -1605,9 +1609,6 @@ int __drm_atomic_helper_disable_plane(struct drm_plane *plane,
>  	plane_state->src_h = 0;
>  	plane_state->src_w = 0;
>  
> -	if (plane->crtc && (plane == plane->crtc->cursor))
> -		plane_state->state->legacy_cursor_update = true;
> -
>  	return 0;
>  }
>  
> -- 
> 2.1.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

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