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

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

drm/amdgpu: Also call cursor_move_locked when the cursor size changes 



The cursor size also affects the register programming.

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 8e57ec61

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

+5 −4
Original line number Diff line number Diff line
@@ -2577,12 +2577,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		return ret;

	}



	amdgpu_crtc->cursor_width = width;

	amdgpu_crtc->cursor_height = height;



	dce_v10_0_lock_cursor(crtc, true);



	if (hot_x != amdgpu_crtc->cursor_hot_x ||

	if (width != amdgpu_crtc->cursor_width ||

	    height != amdgpu_crtc->cursor_height ||

	    hot_x != amdgpu_crtc->cursor_hot_x ||

	    hot_y != amdgpu_crtc->cursor_hot_y) {

		int x, y;
@@ -2591,6 +2590,8 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, 


		dce_v10_0_cursor_move_locked(crtc, x, y);



		amdgpu_crtc->cursor_width = width;

		amdgpu_crtc->cursor_height = height;

		amdgpu_crtc->cursor_hot_x = hot_x;

		amdgpu_crtc->cursor_hot_y = hot_y;

	}

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

+5 −4
Original line number Diff line number Diff line
@@ -2593,12 +2593,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		return ret;

	}



	amdgpu_crtc->cursor_width = width;

	amdgpu_crtc->cursor_height = height;



	dce_v11_0_lock_cursor(crtc, true);



	if (hot_x != amdgpu_crtc->cursor_hot_x ||

	if (width != amdgpu_crtc->cursor_width ||

	    height != amdgpu_crtc->cursor_height ||

	    hot_x != amdgpu_crtc->cursor_hot_x ||

	    hot_y != amdgpu_crtc->cursor_hot_y) {

		int x, y;
@@ -2607,6 +2606,8 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, 


		dce_v11_0_cursor_move_locked(crtc, x, y);



		amdgpu_crtc->cursor_width = width;

		amdgpu_crtc->cursor_height = height;

		amdgpu_crtc->cursor_hot_x = hot_x;

		amdgpu_crtc->cursor_hot_y = hot_y;

	}

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

+5 −4
Original line number Diff line number Diff line
@@ -1946,12 +1946,11 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		return ret;

	}



	amdgpu_crtc->cursor_width = width;

	amdgpu_crtc->cursor_height = height;



	dce_v6_0_lock_cursor(crtc, true);



	if (hot_x != amdgpu_crtc->cursor_hot_x ||

	if (width != amdgpu_crtc->cursor_width ||

	    height != amdgpu_crtc->cursor_height ||

	    hot_x != amdgpu_crtc->cursor_hot_x ||

	    hot_y != amdgpu_crtc->cursor_hot_y) {

		int x, y;
@@ -1960,6 +1959,8 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc, 


		dce_v6_0_cursor_move_locked(crtc, x, y);



		amdgpu_crtc->cursor_width = width;

		amdgpu_crtc->cursor_height = height;

		amdgpu_crtc->cursor_hot_x = hot_x;

		amdgpu_crtc->cursor_hot_y = hot_y;

	}

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

+5 −4
Original line number Diff line number Diff line
@@ -2428,12 +2428,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		return ret;

	}



	amdgpu_crtc->cursor_width = width;

	amdgpu_crtc->cursor_height = height;



	dce_v8_0_lock_cursor(crtc, true);



	if (hot_x != amdgpu_crtc->cursor_hot_x ||

	if (width != amdgpu_crtc->cursor_width ||

	    height != amdgpu_crtc->cursor_height ||

	    hot_x != amdgpu_crtc->cursor_hot_x ||

	    hot_y != amdgpu_crtc->cursor_hot_y) {

		int x, y;
@@ -2442,6 +2441,8 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 


		dce_v8_0_cursor_move_locked(crtc, x, y);



		amdgpu_crtc->cursor_width = width;

		amdgpu_crtc->cursor_height = height;

		amdgpu_crtc->cursor_hot_x = hot_x;

		amdgpu_crtc->cursor_hot_y = hot_y;

	}