commit ef67e38cfe63c70b7901bd5fdb8a170a94b2ef69
author Alex Deucher <alexander.deucher@amd.com> Thu Sep 24 17:46:19 2015 -0400
committer Alex Deucher <alexander.deucher@amd.com> Wed Oct 14 16:16:26 2015 -0400
tree 63add930447b1afb1995a412b2ded6c3b51a7170
parent dd0b5d2f886daced723c374fdb0e013e6186493b

drm/amdgpu/dce10: Move hotspot handling out of set_cursor

It's only needed in dce10 crtc_cursor_set2.

Port of radeon commit:
2e007e611bc0a46dfed1547e0228a57f800e703d

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 75fcad6..f2f93b3 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2537,8 +2537,7 @@
 	return 0;
 }
 
-static int dce_v10_0_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *obj,
-				int hot_x, int hot_y)
+static int dce_v10_0_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *obj)
 {
 	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
 	struct amdgpu_device *adev = crtc->dev->dev_private;
@@ -2560,19 +2559,6 @@
 	WREG32(mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,
 	       lower_32_bits(gpu_addr));
 
-	if (hot_x != amdgpu_crtc->cursor_hot_x ||
-	    hot_y != amdgpu_crtc->cursor_hot_y) {
-		int x, y;
-
-		x = amdgpu_crtc->cursor_x + amdgpu_crtc->cursor_hot_x - hot_x;
-		y = amdgpu_crtc->cursor_y + amdgpu_crtc->cursor_hot_y - hot_y;
-
-		dce_v10_0_cursor_move_locked(crtc, x, y);
-
-		amdgpu_crtc->cursor_hot_x = hot_x;
-		amdgpu_crtc->cursor_hot_y = hot_y;
-	}
-
 	return 0;
 
 fail:
@@ -2628,7 +2614,21 @@
 	amdgpu_crtc->cursor_height = height;
 
 	dce_v10_0_lock_cursor(crtc, true);
-	ret = dce_v10_0_set_cursor(crtc, obj, hot_x, hot_y);
+
+	if (hot_x != amdgpu_crtc->cursor_hot_x ||
+	    hot_y != amdgpu_crtc->cursor_hot_y) {
+		int x, y;
+
+		x = amdgpu_crtc->cursor_x + amdgpu_crtc->cursor_hot_x - hot_x;
+		y = amdgpu_crtc->cursor_y + amdgpu_crtc->cursor_hot_y - hot_y;
+
+		dce_v10_0_cursor_move_locked(crtc, x, y);
+
+		amdgpu_crtc->cursor_hot_x = hot_x;
+		amdgpu_crtc->cursor_hot_y = hot_y;
+	}
+
+	ret = dce_v10_0_set_cursor(crtc, obj);
 	if (ret)
 		DRM_ERROR("dce_v10_0_set_cursor returned %d, not changing cursor\n",
 			  ret);
@@ -2663,9 +2663,7 @@
 		dce_v10_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,
 					     amdgpu_crtc->cursor_y);
 
-		ret = dce_v10_0_set_cursor(crtc, amdgpu_crtc->cursor_bo,
-					   amdgpu_crtc->cursor_hot_x,
-					   amdgpu_crtc->cursor_hot_y);
+		ret = dce_v10_0_set_cursor(crtc, amdgpu_crtc->cursor_bo);
 		if (ret)
 			DRM_ERROR("dce_v10_0_set_cursor returned %d, not showing "
 				  "cursor\n", ret);