From bae11968c20013ed16392164212c7fc14c17e9ad Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 26 Oct 2010 20:22:42 -0400
Subject: [PATCH] --- yaml --- r: 218356 b: refs/heads/master c:
 8f895da57da80b307efa2f94b5d4caf801e959a5 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/radeon/r600_cs.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 800eacca03f2..fb15c68fa9e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881fe6c1d06bf49f4ab7aef212cdaf66bd059614
+refs/heads/master: 8f895da57da80b307efa2f94b5d4caf801e959a5
diff --git a/trunk/drivers/gpu/drm/radeon/r600_cs.c b/trunk/drivers/gpu/drm/radeon/r600_cs.c
index 41802915f93f..7b294c127c5f 100644
--- a/trunk/drivers/gpu/drm/radeon/r600_cs.c
+++ b/trunk/drivers/gpu/drm/radeon/r600_cs.c
@@ -215,6 +215,9 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
 				 __func__, __LINE__, pitch);
 			return -EINVAL;
 		}
+		/* avoid breaking userspace */
+		if (height > 7)
+			height &= ~0x7;
 		if (!IS_ALIGNED(height, 8)) {
 			dev_warn(p->dev, "%s:%d cb height (%d) invalid\n",
 				 __func__, __LINE__, height);