diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-01-24 23:24:59 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2011-01-27 13:53:30 +1000 |
| commit | d75ee3be44380040b9d2c7925298dc52e049768d (patch) | |
| tree | b7677fdbe19922c8e226dcb1419f9d94d17c51a2 /drivers/gpu/drm/radeon/r100.c | |
| parent | 9453d621186426500aa50049dfa0a8b15c86201d (diff) | |
| download | kernel_samsung_smdk4412-d75ee3be44380040b9d2c7925298dc52e049768d.tar.gz kernel_samsung_smdk4412-d75ee3be44380040b9d2c7925298dc52e049768d.tar.bz2 kernel_samsung_smdk4412-d75ee3be44380040b9d2c7925298dc52e049768d.zip | |
drm/radeon/kms: clean up some magic numbers
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
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 5968dde243e..5f15820efe1 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); } |