---

yaml --- r: 189371 b: refs/heads/master c: 9e5786b h: refs/heads/master i: 189369: 2178515 189367: 7a867ed v: v3
git-mirror · Apr 1, 2010 · 622ab7c · 622ab7c
1 parent e917d9a
commit 622ab7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb668c2fed628179c7aa409a0de39a2b96bed18c
+refs/heads/master: 9e5786bd14cb9ffe29ebe66d41cedf03311b0d30
diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c
@@ -744,6 +744,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
 	udelay(10);
 	rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
 	rdev->cp.wptr = RREG32(RADEON_CP_RB_WPTR);
+	/* protect against crazy HW on resume */
+	rdev->cp.wptr &= rdev->cp.ptr_mask;
 	/* Set cp mode to bus mastering & enable cp*/
 	WREG32(RADEON_CP_CSQ_MODE,
 	       REG_SET(RADEON_INDIRECT2_START, indirect2_start) |