summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-28 16:14:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-28 16:14:40 -0700
commit24010e460454ec0d2f4f0213b667b4349cbdb8e1 (patch)
tree8c4a839b8094bfdca2115c536fc750d8b3d5cd64 /drivers/gpu/drm
parente4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb (diff)
parentcf22f20ade30f8c03955324aaf27b1049e182600 (diff)
downloadblackbird-op-linux-24010e460454ec0d2f4f0213b667b4349cbdb8e1.tar.gz
blackbird-op-linux-24010e460454ec0d2f4f0213b667b4349cbdb8e1.zip
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: fix the r100/r200 ums block 0 page fix
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/radeon/radeon_state.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index cc5316dcf580..b3ba44c0a818 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -900,9 +900,10 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
flags |= RADEON_FRONT;
}
if (flags & (RADEON_DEPTH|RADEON_STENCIL)) {
- if (!dev_priv->have_z_offset)
+ if (!dev_priv->have_z_offset) {
printk_once(KERN_ERR "radeon: illegal depth clear request. Buggy mesa detected - please update.\n");
- flags &= ~(RADEON_DEPTH | RADEON_STENCIL);
+ flags &= ~(RADEON_DEPTH | RADEON_STENCIL);
+ }
}
if (flags & (RADEON_FRONT | RADEON_BACK)) {
OpenPOWER on IntegriCloud