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

It's only needed in dce11 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>

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index bebb879739c797c78597c4085c23111f2d36e75e..9690c02322c447adf5fceac1714c59b829cd5d37 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2514,8 +2514,7 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,
        return 0;
 }
 
-static int dce_v11_0_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *obj,
-                               int hot_x, int hot_y)
+static int dce_v11_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;
@@ -2537,19 +2536,6 @@ static int dce_v11_0_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *ob
        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_v11_0_cursor_move_locked(crtc, x, y);
-
-               amdgpu_crtc->cursor_hot_x = hot_x;
-               amdgpu_crtc->cursor_hot_y = hot_y;
-       }
-
        return 0;
 
 fail:
@@ -2605,7 +2591,21 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
        amdgpu_crtc->cursor_height = height;
 
        dce_v11_0_lock_cursor(crtc, true);
-       ret = dce_v11_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_v11_0_cursor_move_locked(crtc, x, y);
+
+               amdgpu_crtc->cursor_hot_x = hot_x;
+               amdgpu_crtc->cursor_hot_y = hot_y;
+       }
+
+       ret = dce_v11_0_set_cursor(crtc, obj);
        if (ret)
                DRM_ERROR("dce_v11_0_set_cursor returned %d, not changing cursor\n",
                          ret);
@@ -2640,9 +2640,7 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)
                dce_v11_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,
                                             amdgpu_crtc->cursor_y);
 
-               ret = dce_v11_0_set_cursor(crtc, amdgpu_crtc->cursor_bo,
-                                          amdgpu_crtc->cursor_hot_x,
-                                          amdgpu_crtc->cursor_hot_y);
+               ret = dce_v11_0_set_cursor(crtc, amdgpu_crtc->cursor_bo);
                if (ret)
                        DRM_ERROR("dce_v11_0_set_cursor returned %d, not showing "
                                  "cursor\n", ret);