Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (24010e46) · Commits · e / devices / android_kernel_teracube_emerald

drivers/gpu/drm/radeon/radeon_state.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -900,10 +900,11 @@ 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);
		}
		}

		if (flags & (RADEON_FRONT \| RADEON_BACK)) {