---

yaml --- r: 318713 b: refs/heads/master c: f60ec4c h: refs/heads/master i: 318711: ac5d823 v: v3
git-mirror · Jul 20, 2012 · 9bd84fc · 9bd84fc
1 parent b73b087
commit 9bd84fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e811f5ae19043b2ac2c28e147a4274038e655598
+refs/heads/master: f60ec4c7df043df81e62891ac45383d012afe0da
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cursor.c b/trunk/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);
+				}
+			}
 		}
 	}