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

Commit 02e6859e authored by Michel Dänzer's avatar Michel Dänzer Committed by Dave Airlie
Browse files

drm/radeon: Set cursor x/y to 0 when x/yorigin > 0. 



Apart from the obvious cleanup, this should make the line

			cursor_end = x - xorigin + w;

correct now.

Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b8aee294

drivers/gpu/drm/radeon/radeon_cursor.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -215,10 +215,14 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, 
	}

	}

	DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y);

	DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y);





	if (x < 0)

	if (x < 0) {

		xorigin = min(-x, CURSOR_WIDTH - 1);

		xorigin = min(-x, CURSOR_WIDTH - 1);

	if (y < 0)

		x = 0;

	}

	if (y < 0) {

		yorigin = min(-y, CURSOR_HEIGHT - 1);

		yorigin = min(-y, CURSOR_HEIGHT - 1);

		y = 0;

	}





	if (ASIC_IS_AVIVO(rdev)) {

	if (ASIC_IS_AVIVO(rdev)) {

		int i = 0;

		int i = 0;
@@ -251,16 +255,12 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, 




	radeon_lock_cursor(crtc, true);

	radeon_lock_cursor(crtc, true);

	if (ASIC_IS_DCE4(rdev)) {

	if (ASIC_IS_DCE4(rdev)) {

		WREG32(EVERGREEN_CUR_POSITION + radeon_crtc->crtc_offset,

		WREG32(EVERGREEN_CUR_POSITION + radeon_crtc->crtc_offset, (x << 16) | y);

		       ((xorigin ? 0 : x) << 16) |

		       (yorigin ? 0 : y));

		WREG32(EVERGREEN_CUR_HOT_SPOT + radeon_crtc->crtc_offset, (xorigin << 16) | yorigin);

		WREG32(EVERGREEN_CUR_HOT_SPOT + radeon_crtc->crtc_offset, (xorigin << 16) | yorigin);

		WREG32(EVERGREEN_CUR_SIZE + radeon_crtc->crtc_offset,

		WREG32(EVERGREEN_CUR_SIZE + radeon_crtc->crtc_offset,

		       ((w - 1) << 16) | (radeon_crtc->cursor_height - 1));

		       ((w - 1) << 16) | (radeon_crtc->cursor_height - 1));

	} else if (ASIC_IS_AVIVO(rdev)) {

	} else if (ASIC_IS_AVIVO(rdev)) {

		WREG32(AVIVO_D1CUR_POSITION + radeon_crtc->crtc_offset,

		WREG32(AVIVO_D1CUR_POSITION + radeon_crtc->crtc_offset, (x << 16) | y);

			     ((xorigin ? 0 : x) << 16) |

			     (yorigin ? 0 : y));

		WREG32(AVIVO_D1CUR_HOT_SPOT + radeon_crtc->crtc_offset, (xorigin << 16) | yorigin);

		WREG32(AVIVO_D1CUR_HOT_SPOT + radeon_crtc->crtc_offset, (xorigin << 16) | yorigin);

		WREG32(AVIVO_D1CUR_SIZE + radeon_crtc->crtc_offset,

		WREG32(AVIVO_D1CUR_SIZE + radeon_crtc->crtc_offset,

		       ((w - 1) << 16) | (radeon_crtc->cursor_height - 1));

		       ((w - 1) << 16) | (radeon_crtc->cursor_height - 1));
@@ -274,8 +274,8 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, 
			| yorigin));

			| yorigin));

		WREG32(RADEON_CUR_HORZ_VERT_POSN + radeon_crtc->crtc_offset,

		WREG32(RADEON_CUR_HORZ_VERT_POSN + radeon_crtc->crtc_offset,

		       (RADEON_CUR_LOCK

		       (RADEON_CUR_LOCK

			| ((xorigin ? 0 : x) << 16)

			| (x << 16)

			| (yorigin ? 0 : y)));

			| y));

		/* offset is from DISP(2)_BASE_ADDRESS */

		/* offset is from DISP(2)_BASE_ADDRESS */

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, (radeon_crtc->legacy_cursor_offset +

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, (radeon_crtc->legacy_cursor_offset +

								      (yorigin * 256)));

								      (yorigin * 256)));