diff options
| author | Alex Deucher <[email protected]> | 2009-06-04 16:57:20 -0400 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2009-06-04 16:57:20 -0400 |
| commit | b5914362300d7671ed5b5a86b51acacac6fb1abf (patch) | |
| tree | ee5bbe41d8c8b31be096458e0400eff832237170 /src/mesa/drivers/dri/r600 | |
| parent | 4782bebe4495fb880c42bc1414aeed08c0ebf75d (diff) | |
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.
Diffstat (limited to 'src/mesa/drivers/dri/r600')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_chip.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_chip.h | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_state.c | 3 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c index daf14bee75c..57378474394 100644 --- 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 c3a33010f34..4ceada73782 100644 --- 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 fb8388f09d2..3556d6811cb 100644 --- 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 */ |