Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45e5f6a2 authored by Ilija Hadzic's avatar Ilija Hadzic Committed by Dave Airlie
Browse files

drm/radeon: fix order of doing things in radeon_crtc_cursor_set 



 if object pin or object lookup in radeon_cursor_set fail, the function
 could leave inconsistent mouse width and hight values in radeon_crtc
 fixed by moving cursor width and height assignments after all
 checks have passed

Signed-off-by: default avatarIlija Hadzic <ihadzic@research.bell-labs.com>
Reviewed-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2bbd4492

drivers/gpu/drm/radeon/radeon_cursor.c

+3 −3
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc, 
		return -EINVAL;

	}



	radeon_crtc->cursor_width = width;

	radeon_crtc->cursor_height = height;



	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);

	if (!obj) {

		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, radeon_crtc->crtc_id);
@@ -180,6 +177,9 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc, 
	if (ret)

		goto fail;



	radeon_crtc->cursor_width = width;

	radeon_crtc->cursor_height = height;



	radeon_lock_cursor(crtc, true);

	/* XXX only 27 bit offset for legacy cursor */

	radeon_set_cursor(crtc, obj, gpu_addr);