From: Pauli Nieminen <suokkos@gmail.com>
Date: Sat, 29 Aug 2009 18:04:40 +0000 (+0300)
Subject: r300: Disable threshold register for KMS.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e48dc9c5edb0f001bf7252ee2294d36707aa066c;p=mesa.git

r300: Disable threshold register for KMS.

Kernel side doesn't have required register in safe list so can't send it kernel.
---

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index e1047beb6e4..451f1fd0fab 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -685,9 +685,10 @@ void r300InitCmdBuf(r300ContextPtr r300)
 	ALLOC_STATE(rb3d_aaresolve_ctl, always, 2, 0);
 	r300->hw.rb3d_aaresolve_ctl.cmd[0] = cmdpacket0(r300->radeon.radeonScreen, R300_RB3D_AARESOLVE_CTL, 1);
 	if ((r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) ||
+	      ( !r300->radeon.radeonScreen->kernel_mm && (
 	    (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RS400) ||
 	    (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV410) ||
-	    (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420)) {
+	    (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420) ) ) ) {
 		ALLOC_STATE(rb3d_discard_src_pixel_lte_threshold, always, 3, 0);
 	} else {
 		ALLOC_STATE(rb3d_discard_src_pixel_lte_threshold, never, 3, 0);