1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index 42acc6449dd6..711e95ad39bf 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -262,8 +262,14 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
                                 if (!(cursor_end & 0x7f))
                                         w--;
                         }
-                        if (w <= 0)
+                        if (w <= 0) {
                                 w = 1;
+                                cursor_end = x - xorigin + w;
+                                if (!(cursor_end & 0x7f)) {
+                                        x--;
+                                        WARN_ON_ONCE(x < 0);
+                                }
+                        }
                 }
         }