diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-08-13 14:17:34 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-13 14:17:34 -0400 |
| commit | 0d5e0347af4322713075193154b8a348de4a0b52 (patch) | |
| tree | a597ec83314232bfd6de6ff3d47c7f22c146a85c | |
| parent | 7e456e9c427d48151b166bcac08c3e8a8b180f01 (diff) | |
Remove reset of 3D scissor registers when using the CP in the ddx
They should only affect 3D and init3d() should take care of that case
noticed by libv on IRC.
| -rw-r--r-- | src/radeon.h | 23 | ||||
| -rw-r--r-- | src/radeon_accel.c | 17 |
2 files changed, 0 insertions, 40 deletions
diff --git a/src/radeon.h b/src/radeon.h index 63655b8f..975e5d10 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -670,17 +670,6 @@ typedef struct { FBAreaPtr depthTexArea; #endif - /* Saved scissor values */ - uint32_t sc_left; - uint32_t sc_right; - uint32_t sc_top; - uint32_t sc_bottom; - - uint32_t re_top_left; - uint32_t re_width_height; - - uint32_t aux_sc_cntl; - int irq; Bool DMAForXv; @@ -1095,18 +1084,6 @@ do { \ info->needCacheFlush = FALSE; \ } \ RADEON_WAIT_UNTIL_IDLE(); \ - if (info->ChipFamily <= CHIP_FAMILY_RV280) { \ - BEGIN_RING(6); \ - OUT_RING_REG(RADEON_RE_TOP_LEFT, info->re_top_left); \ - OUT_RING_REG(RADEON_RE_WIDTH_HEIGHT, info->re_width_height); \ - OUT_RING_REG(RADEON_AUX_SC_CNTL, info->aux_sc_cntl); \ - ADVANCE_RING(); \ - } else { \ - BEGIN_RING(4); \ - OUT_RING_REG(R300_SC_SCISSOR0, info->re_top_left); \ - OUT_RING_REG(R300_SC_SCISSOR1, info->re_width_height); \ - ADVANCE_RING(); \ - } \ info->CPInUse = TRUE; \ } \ } while (0) diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 91f463a3..e617fd5c 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -469,23 +469,6 @@ void RADEONEngineInit(ScrnInfoPtr pScrn) | RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_DST_PITCH_OFFSET_CNTL); -#ifdef XF86DRI - info->sc_left = 0x00000000; - info->sc_right = RADEON_DEFAULT_SC_RIGHT_MAX; - info->sc_top = 0x00000000; - info->sc_bottom = RADEON_DEFAULT_SC_BOTTOM_MAX; - - info->re_top_left = 0x00000000; - if (info->ChipFamily <= CHIP_FAMILY_RV280) - info->re_width_height = ((0x7ff << RADEON_RE_WIDTH_SHIFT) | - (0x7ff << RADEON_RE_HEIGHT_SHIFT)); - else - info->re_width_height = ((8191 << R300_SCISSOR_X_SHIFT) | - (8191 << R300_SCISSOR_Y_SHIFT)); - - info->aux_sc_cntl = 0x00000000; -#endif - RADEONEngineRestore(pScrn); } |