diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 19:14:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 19:14:40 -0400 |
| commit | 24010e460454ec0d2f4f0213b667b4349cbdb8e1 (patch) | |
| tree | 8c4a839b8094bfdca2115c536fc750d8b3d5cd64 /drivers | |
| parent | e4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb (diff) | |
| parent | cf22f20ade30f8c03955324aaf27b1049e182600 (diff) | |
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')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_state.c | 5 |
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, | |||
| 900 | flags |= RADEON_FRONT; | 900 | flags |= RADEON_FRONT; |
| 901 | } | 901 | } |
| 902 | if (flags & (RADEON_DEPTH|RADEON_STENCIL)) { | 902 | if (flags & (RADEON_DEPTH|RADEON_STENCIL)) { |
| 903 | if (!dev_priv->have_z_offset) | 903 | if (!dev_priv->have_z_offset) { |
| 904 | printk_once(KERN_ERR "radeon: illegal depth clear request. Buggy mesa detected - please update.\n"); | 904 | printk_once(KERN_ERR "radeon: illegal depth clear request. Buggy mesa detected - please update.\n"); |
| 905 | flags &= ~(RADEON_DEPTH | RADEON_STENCIL); | 905 | flags &= ~(RADEON_DEPTH | RADEON_STENCIL); |
| 906 | } | ||
| 906 | } | 907 | } |
| 907 | 908 | ||
| 908 | if (flags & (RADEON_FRONT | RADEON_BACK)) { | 909 | if (flags & (RADEON_FRONT | RADEON_BACK)) { |