diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-04 10:55:12 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-07 17:51:12 -0500 |
commit | 92cde00cbaf3236ef7ea9bd4f0b43c8c4a3f507f (patch) | |
tree | 022c274b9295c3191e2c63060bb1dafa435e49cc /drivers/gpu/drm/radeon/r100.c | |
parent | 6b02af1c1f35550ce1a9873841fe9c50b1613591 (diff) |
drm/radeon/kms/legacy: set common regs to sane value
The DDX and radeonfb always set these regs to a sane value.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 9b2ac9d69c0..109096802e6 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -1675,6 +1675,17 @@ int r100_gpu_reset(struct radeon_device *rdev) | |||
1675 | return 0; | 1675 | return 0; |
1676 | } | 1676 | } |
1677 | 1677 | ||
1678 | void r100_set_common_regs(struct radeon_device *rdev) | ||
1679 | { | ||
1680 | /* set these so they don't interfere with anything */ | ||
1681 | WREG32(RADEON_OV0_SCALE_CNTL, 0); | ||
1682 | WREG32(RADEON_SUBPIC_CNTL, 0); | ||
1683 | WREG32(RADEON_VIPH_CONTROL, 0); | ||
1684 | WREG32(RADEON_I2C_CNTL_1, 0); | ||
1685 | WREG32(RADEON_DVI_I2C_CNTL_1, 0); | ||
1686 | WREG32(RADEON_CAP0_TRIG_CNTL, 0); | ||
1687 | WREG32(RADEON_CAP1_TRIG_CNTL, 0); | ||
1688 | } | ||
1678 | 1689 | ||
1679 | /* | 1690 | /* |
1680 | * VRAM info | 1691 | * VRAM info |
@@ -3129,6 +3140,9 @@ static int r100_startup(struct radeon_device *rdev) | |||
3129 | { | 3140 | { |
3130 | int r; | 3141 | int r; |
3131 | 3142 | ||
3143 | /* set common regs */ | ||
3144 | r100_set_common_regs(rdev); | ||
3145 | /* program mc */ | ||
3132 | r100_mc_program(rdev); | 3146 | r100_mc_program(rdev); |
3133 | /* Resume clock */ | 3147 | /* Resume clock */ |
3134 | r100_clock_startup(rdev); | 3148 | r100_clock_startup(rdev); |