Commit 24010e46 authored by Linus Torvalds's avatar Linus Torvalds

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
parents e4f2e5ea cf22f20a
...@@ -900,9 +900,10 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev, ...@@ -900,9 +900,10 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
flags |= RADEON_FRONT; flags |= RADEON_FRONT;
} }
if (flags & (RADEON_DEPTH|RADEON_STENCIL)) { 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"); 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)) { if (flags & (RADEON_FRONT | RADEON_BACK)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment