[PATCH v3 10/23] drm/qxl: move qxl_primary_apply_cursor to correct place

[Noralf Trønnes]

Den 18.01.2019 13.20, skrev Gerd Hoffmann:
> The cursor must be set again after creating the primary surface.
> Also drop the error message.
> 
> Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
> ---
>  drivers/gpu/drm/qxl/qxl_display.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
> index 86bfc19bea..1b700ef503 100644
> --- a/drivers/gpu/drm/qxl/qxl_display.c
> +++ b/drivers/gpu/drm/qxl/qxl_display.c
> @@ -533,7 +533,6 @@ static void qxl_primary_atomic_update(struct drm_plane *plane,
>  	    .x2 = plane->state->fb->width,
>  	    .y2 = plane->state->fb->height
>  	};
> -	int ret;
>  	bool same_shadow = false;
>  
>  	if (old_state->fb) {
> @@ -554,16 +553,13 @@ static void qxl_primary_atomic_update(struct drm_plane *plane,
>  		if (!same_shadow)
>  			qxl_io_destroy_primary(qdev);
>  		bo_old->is_primary = false;
> -
> -		ret = qxl_primary_apply_cursor(plane);
> -		if (ret)
> -			DRM_ERROR(
> -			"could not set cursor after creating primary");
>  	}
>  
>  	if (!bo->is_primary) {
> -		if (!same_shadow)
> +		if (!same_shadow) {
>  			qxl_io_create_primary(qdev, 0, bo);
> +			qxl_primary_apply_cursor(plane);
> +		}
>  		bo->is_primary = true;
>  	}
>  
> 

I don't see how the commit message matches what you're doing. It gives
the impression that it must be applied under yet another condition, but
the condition for applying the cursor is changed from bo_old->is_primary
to !bo->is_primary.
It probably makes sense to someone that knows the driver.

Acked-by: Noralf Trønnes <noralf at tronnes.org>