Don't program VGT_OUT_DEALLOC_CNTL/VGT_VERTEX_REUSE_BLOCK_CNTL

These are chip specific and are programmed by the drm.
This should fix hangs on some chips.

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index daf14bee75c4300833b04a5cf2680bfd6084847a..57378474394a5161b59a84cce329b8f220975fe9 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -305,9 +305,6 @@ GLboolean r700InitChipObject(context_t *context)
 
     LINK_STATES(PA_SC_AA_MASK);  
 
-    LINK_STATES(VGT_VERTEX_REUSE_BLOCK_CNTL); 
-    LINK_STATES(VGT_OUT_DEALLOC_CNTL);  
-
     LINK_STATES(DB_RENDER_CONTROL); 
     LINK_STATES(DB_RENDER_OVERRIDE);
 

diff --git a/src/mesa/drivers/dri/r600/r700_chip.h b/src/mesa/drivers/dri/r600/r700_chip.h
index c3a33010f34c936c0db2f892ea3bf83fdf302f6f..4ceada7378289966886d8751d75d0acd5820fe24 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_chip.h
+++ b/src/mesa/drivers/dri/r600/r700_chip.h
@@ -426,10 +426,7 @@ typedef struct _R700_CHIP_CONTEXT
        union UINT_FLOAT                CB_CLRCMP_MSK             ;  /* 0xA30F */
        
        union UINT_FLOAT                PA_SC_AA_MASK             ;  /* 0xA312 */
-       
-       union UINT_FLOAT   VGT_VERTEX_REUSE_BLOCK_CNTL;  /* 0xA316 */
-       union UINT_FLOAT        VGT_OUT_DEALLOC_CNTL      ;  /* 0xA317 */
-       
+
        union UINT_FLOAT                DB_RENDER_CONTROL         ;  /* 0xA343 */
        union UINT_FLOAT                DB_RENDER_OVERRIDE        ;  /* 0xA344 */
 

diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c
index fb8388f09d2cbdbd70827802cec368c23593de58..3556d6811cbb70521111875fa3923103c651507c 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_state.c
+++ b/src/mesa/drivers/dri/r600/r700_state.c
@@ -922,9 +922,6 @@ void r700InitState(GLcontext * ctx) //-------------------
     /* Turn off AA */
     r700->PA_SC_AA_CONFIG.u32All = 0;
 
-    SETfield(r700->VGT_OUT_DEALLOC_CNTL.u32All, 16, DEALLOC_DIST_shift, DEALLOC_DIST_mask);
-    SETfield(r700->VGT_VERTEX_REUSE_BLOCK_CNTL.u32All, 14, VTX_REUSE_DEPTH_shift, VTX_REUSE_DEPTH_mask);
-
     r700->SX_MISC.u32All = 0;
 
     /* depth buf */