diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-05-29 06:50:37 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-05 11:15:55 -0700 |
| commit | f417b91c30e84e759d395f45d524eeee95250822 (patch) | |
| tree | 6c6d425783e54f35d075563d3e41207079a18edd /drivers | |
| parent | 1a0c0aa4945dfa8ac3adc2818e166b40eb5dc346 (diff) | |
| download | kernel-crypto-f417b91c30e84e759d395f45d524eeee95250822.tar.gz kernel-crypto-f417b91c30e84e759d395f45d524eeee95250822.tar.xz kernel-crypto-f417b91c30e84e759d395f45d524eeee95250822.zip | |
drm/radeon: fix the r100/r200 ums block 0 page fix
commit cf22f20ade30f8c03955324aaf27b1049e182600 upstream.
airlied -> brown paper bag.
I blame Hi-5 or the Wiggles for lowering my IQ, move the fix inside some
brackets instead of breaking everything in site.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 fc2685f3545..16436bb8c81 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -878,9 +878,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)) { |