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

commit 8e57ec613df7d6bfa8ffe7512290c5415ebb8657 upstream.

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).

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 12 insertions, 11 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 9260caef74fa..e5af57318f34 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2577,6 +2577,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;
@@ -2596,9 +2599,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;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 367739bd1927..5b2fa17a5589 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2593,6 +2593,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;
@@ -2612,9 +2615,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;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 15f9fc0514b2..b2447db693c0 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1933,6 +1933,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;
@@ -1952,8 +1955,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,
         WREG32(EVERGREEN_CUR_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;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 8c4d808db0f1..80e71d100d58 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2465,6 +2465,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;
@@ -2484,9 +2487,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;
 }