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

Commit 8e57ec61 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu: Store CRTC relative amdgpu_crtc->cursor_x/y values 



We were storing viewport relative coordinates. However, crtc_cursor_set2
and cursor_reset pass amdgpu_crtc->cursor_x/y as the x/y parameters of
cursor_move_locked, which would break if the CRTC isn't located at
(0, 0).

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dd31ae9a

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+3 −3
Original line number Diff line number Diff line
@@ -2493,6 +2493,9 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc, 
	struct amdgpu_device *adev = crtc->dev->dev_private;

	int xorigin = 0, yorigin = 0;



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	/* avivo cursor are offset into the total surface */

	x += crtc->x;

	y += crtc->y;
@@ -2512,9 +2515,6 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc, 
	WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset,

	       ((amdgpu_crtc->cursor_width - 1) << 16) | (amdgpu_crtc->cursor_height - 1));



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	return 0;

}

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+3 −3
Original line number Diff line number Diff line
@@ -2509,6 +2509,9 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc, 
	struct amdgpu_device *adev = crtc->dev->dev_private;

	int xorigin = 0, yorigin = 0;



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	/* avivo cursor are offset into the total surface */

	x += crtc->x;

	y += crtc->y;
@@ -2528,9 +2531,6 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc, 
	WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset,

	       ((amdgpu_crtc->cursor_width - 1) << 16) | (amdgpu_crtc->cursor_height - 1));



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	return 0;

}

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+3 −2
Original line number Diff line number Diff line
@@ -1862,6 +1862,9 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc, 


	int w = amdgpu_crtc->cursor_width;



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	/* avivo cursor are offset into the total surface */

	x += crtc->x;

	y += crtc->y;
@@ -1881,8 +1884,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc, 
	WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset,

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



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;

	return 0;

}

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+3 −3
Original line number Diff line number Diff line
@@ -2344,6 +2344,9 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc, 
	struct amdgpu_device *adev = crtc->dev->dev_private;

	int xorigin = 0, yorigin = 0;



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	/* avivo cursor are offset into the total surface */

	x += crtc->x;

	y += crtc->y;
@@ -2363,9 +2366,6 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc, 
	WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset,

	       ((amdgpu_crtc->cursor_width - 1) << 16) | (amdgpu_crtc->cursor_height - 1));



	amdgpu_crtc->cursor_x = x;

	amdgpu_crtc->cursor_y = y;



	return 0;

}