diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-01 19:38:49 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-01 19:38:49 +0900 |
| commit | 17292ecc07857bb16737c340dda289ab9d219e05 (patch) | |
| tree | 214a208af0e4826b835cd4ee770c7f1573c86b04 /drivers/gpu/drm/radeon/r100.c | |
| parent | cd7bb53ff88a5acef942a87c1d04e6211b6470dc (diff) | |
| parent | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff) | |
| download | lwn-17292ecc07857bb16737c340dda289ab9d219e05.tar.gz lwn-17292ecc07857bb16737c340dda289ab9d219e05.zip | |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 5968dde243e9..5f15820efe12 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1031,8 +1031,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) WREG32(RADEON_CP_CSQ_MODE, REG_SET(RADEON_INDIRECT2_START, indirect2_start) | REG_SET(RADEON_INDIRECT1_START, indirect1_start)); - WREG32(0x718, 0); - WREG32(0x744, 0x00004D4D); + WREG32(RADEON_CP_RB_WPTR_DELAY, 0); + WREG32(RADEON_CP_CSQ_MODE, 0x00004D4D); WREG32(RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIBM_INDBM); radeon_ring_start(rdev); r = radeon_ring_test(rdev); @@ -2347,10 +2347,10 @@ void r100_vga_set_state(struct radeon_device *rdev, bool state) temp = RREG32(RADEON_CONFIG_CNTL); if (state == false) { - temp &= ~(1<<8); - temp |= (1<<9); + temp &= ~RADEON_CFG_VGA_RAM_EN; + temp |= RADEON_CFG_VGA_IO_DIS; } else { - temp &= ~(1<<9); + temp &= ~RADEON_CFG_VGA_IO_DIS; } WREG32(RADEON_CONFIG_CNTL, temp); } |