diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-03-02 20:07:33 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-03 11:51:21 +1000 |
| commit | b9952a8ae5814b0ef2a6596c7443efd85b92e069 (patch) | |
| tree | 2e259e9cde37c717a2f45c88c0084e2c23f141de /drivers/gpu/drm/radeon/evergreen.c | |
| parent | 127278099f25a14b00c502f64b120472b512528d (diff) | |
| download | kernel_samsung_smdk4412-b9952a8ae5814b0ef2a6596c7443efd85b92e069.zip kernel_samsung_smdk4412-b9952a8ae5814b0ef2a6596c7443efd85b92e069.tar.gz kernel_samsung_smdk4412-b9952a8ae5814b0ef2a6596c7443efd85b92e069.tar.bz2 | |
drm/radeon/kms: add cayman asic reset support
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index ffdc833..0a3d6fc 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -804,7 +804,7 @@ void evergreen_bandwidth_update(struct radeon_device *rdev) } } -static int evergreen_mc_wait_for_idle(struct radeon_device *rdev) +int evergreen_mc_wait_for_idle(struct radeon_device *rdev) { unsigned i; u32 tmp; @@ -957,7 +957,7 @@ void evergreen_agp_enable(struct radeon_device *rdev) WREG32(VM_CONTEXT1_CNTL, 0); } -static void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save) +void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save) { save->vga_control[0] = RREG32(D1VGA_CONTROL); save->vga_control[1] = RREG32(D2VGA_CONTROL); @@ -1011,7 +1011,7 @@ static void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_sa WREG32(EVERGREEN_D6VGA_CONTROL, 0); } -static void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save) +void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save) { WREG32(EVERGREEN_GRPH_PRIMARY_SURFACE_ADDRESS_HIGH + EVERGREEN_CRTC0_REGISTER_OFFSET, upper_32_bits(rdev->mc.vram_start)); |