diff options
| author | Corbin Simpson <[email protected]> | 2009-05-17 16:42:54 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2009-05-17 16:44:39 -0700 |
| commit | d6e085bd76ad8e6cfb67c317dc1b32b04434a8b5 (patch) | |
| tree | 4fd2cff0e26067aafbae027982436d7e4d096004 /src | |
| parent | 60665ae6277f15a1b5e48b65ba7d94cea2535c2c (diff) | |
r300-gallium: Don't set GB_TILE_CONFIG (in userspace.)
This accompanies kernel patches that make GB_TILE_CONFIG's various members
completely controlled in DRM.
GB_TILE_CONFIG has the following controls:
- The number of GB (pixel) pipes enabled
- The size and style of tiling
- Subpixel precision (either 1/12 or 1/16)
Per airlied and glisse, userspace and kernel will now agree (always) on
a subpixel precision of 1/12, and tiling will always be kernel-controlled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_invariant.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_state_invariant.c b/src/gallium/drivers/r300/r300_state_invariant.c index 0acbcbff7f4..d74928ceca1 100644 --- a/src/gallium/drivers/r300/r300_state_invariant.c +++ b/src/gallium/drivers/r300/r300_state_invariant.c @@ -34,7 +34,7 @@ void r300_emit_invariant_state(struct r300_context* r300) struct r300_capabilities* caps = r300_screen(r300->context.screen)->caps; CS_LOCALS(r300); - BEGIN_CS(28 + (caps->has_tcl ? 2: 0)); + BEGIN_CS(26 + (caps->has_tcl ? 2: 0)); /*** Graphics Backend (GB) ***/ /* Various GB enables */ @@ -42,9 +42,6 @@ void r300_emit_invariant_state(struct r300_context* r300) /* Subpixel multisampling for AA */ OUT_CS_REG(R300_GB_MSPOS0, 0x6666666); OUT_CS_REG(R300_GB_MSPOS1, 0x6666666); - /* GB tile config and pipe setup */ - OUT_CS_REG(R300_GB_TILE_CONFIG, R300_GB_TILE_DISABLE | - r300_translate_gb_pipes(caps->num_frag_pipes)); /* Source of fog depth */ OUT_CS_REG(R300_GB_SELECT, R300_GB_FOG_SELECT_1_1_W); /* AA enable */ |