2 files changed, 48 insertions, 32 deletions

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 022f107..84d9a48 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1531,6 +1531,9 @@ static void drmmode_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
 	}
 #endif
 
+	drmmode_crtc->cursor_x = x;
+	drmmode_crtc->cursor_y = y;
+
 	drmModeMoveCursor(pAMDGPUEnt->fd, drmmode_crtc->mode_crtc->crtc_id, x, y);
 }
 
@@ -1711,6 +1714,10 @@ static void drmmode_show_cursor(xf86CrtcPtr crtc)
 	AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
 	AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn);
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	CursorPtr cursor = xf86_config->cursor;
+	int xhot = cursor->bits->xhot;
+	int yhot = cursor->bits->yhot;
 	static Bool use_set_cursor2 = TRUE;
 	struct drm_mode_cursor2 arg;
 
@@ -1726,41 +1733,45 @@ static void drmmode_show_cursor(xf86CrtcPtr crtc)
 	arg.width = info->cursor_w;
 	arg.height = info->cursor_h;
 
+	if (crtc->rotation != RR_Rotate_0 &&
+	    crtc->rotation != (RR_Rotate_180 | RR_Reflect_X |
+			       RR_Reflect_Y)) {
+		int t;
+
+		/* Reflect & rotate hotspot position */
+		if (crtc->rotation & RR_Reflect_X)
+			xhot = info->cursor_w - xhot - 1;
+		if (crtc->rotation & RR_Reflect_Y)
+			yhot = info->cursor_h - yhot - 1;
+
+		switch (crtc->rotation & 0xf) {
+		case RR_Rotate_90:
+			t = xhot;
+			xhot = yhot;
+			yhot = info->cursor_w - t - 1;
+			break;
+		case RR_Rotate_180:
+			xhot = info->cursor_w - xhot - 1;
+			yhot = info->cursor_h - yhot - 1;
+			break;
+		case RR_Rotate_270:
+			t = xhot;
+			xhot = info->cursor_h - yhot - 1;
+			yhot = t;
+		}
+	}
+
+	if (xhot != drmmode_crtc->cursor_xhot || yhot != drmmode_crtc->cursor_yhot) {
+		arg.flags |= DRM_MODE_CURSOR_MOVE;
+		arg.x = drmmode_crtc->cursor_x += drmmode_crtc->cursor_xhot - xhot;
+		arg.y = drmmode_crtc->cursor_y += drmmode_crtc->cursor_yhot - yhot;
+		drmmode_crtc->cursor_xhot = xhot;
+		drmmode_crtc->cursor_yhot = yhot;
+	}
+
 	if (use_set_cursor2) {
-		xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-		CursorPtr cursor = xf86_config->cursor;
-		int xhot = cursor->bits->xhot;
-		int yhot = cursor->bits->yhot;
 		int ret;
 
-		if (crtc->rotation != RR_Rotate_0 &&
-		    crtc->rotation != (RR_Rotate_180 | RR_Reflect_X |
-				       RR_Reflect_Y)) {
-			int t;
-
-			/* Reflect & rotate hotspot position */
-			if (crtc->rotation & RR_Reflect_X)
-				xhot = info->cursor_w - xhot - 1;
-			if (crtc->rotation & RR_Reflect_Y)
-				yhot = info->cursor_h - yhot - 1;
-
-			switch (crtc->rotation & 0xf) {
-			case RR_Rotate_90:
-				t = xhot;
-				xhot = yhot;
-				yhot = info->cursor_w - t - 1;
-				break;
-			case RR_Rotate_180:
-				xhot = info->cursor_w - xhot - 1;
-				yhot = info->cursor_h - yhot - 1;
-				break;
-			case RR_Rotate_270:
-				t = xhot;
-				xhot = info->cursor_h - yhot - 1;
-				yhot = t;
-			}
-		}
-
 		arg.hot_x = xhot;
 		arg.hot_y = yhot;
 
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index adcf6ad..87b301e 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -107,6 +107,11 @@ typedef struct {
 	drmmode_ptr drmmode;
 	drmModeCrtcPtr mode_crtc;
 	int hw_id;
+
+	int cursor_x;
+	int cursor_y;
+	int cursor_xhot;
+	int cursor_yhot;
 	struct amdgpu_buffer *cursor_buffer;
 	struct drmmode_scanout rotate;
 	struct drmmode_scanout scanout[2];