aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/evergreen.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-03-02 20:07:33 -0500
committerDave Airlie <airlied@redhat.com>2011-03-02 20:51:21 -0500
commitb9952a8ae5814b0ef2a6596c7443efd85b92e069 (patch)
tree2e259e9cde37c717a2f45c88c0084e2c23f141de /drivers/gpu/drm/radeon/evergreen.c
parent127278099f25a14b00c502f64b120472b512528d (diff)
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index ffdc8332b76e..0a3d6fc13c2d 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)
804 } 804 }
805} 805}
806 806
807static int evergreen_mc_wait_for_idle(struct radeon_device *rdev) 807int evergreen_mc_wait_for_idle(struct radeon_device *rdev)
808{ 808{
809 unsigned i; 809 unsigned i;
810 u32 tmp; 810 u32 tmp;
@@ -957,7 +957,7 @@ void evergreen_agp_enable(struct radeon_device *rdev)
957 WREG32(VM_CONTEXT1_CNTL, 0); 957 WREG32(VM_CONTEXT1_CNTL, 0);
958} 958}
959 959
960static void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save) 960void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save)
961{ 961{
962 save->vga_control[0] = RREG32(D1VGA_CONTROL); 962 save->vga_control[0] = RREG32(D1VGA_CONTROL);
963 save->vga_control[1] = RREG32(D2VGA_CONTROL); 963 save->vga_control[1] = RREG32(D2VGA_CONTROL);
@@ -1011,7 +1011,7 @@ static void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_sa
1011 WREG32(EVERGREEN_D6VGA_CONTROL, 0); 1011 WREG32(EVERGREEN_D6VGA_CONTROL, 0);
1012} 1012}
1013 1013
1014static void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save) 1014void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save)
1015{ 1015{
1016 WREG32(EVERGREEN_GRPH_PRIMARY_SURFACE_ADDRESS_HIGH + EVERGREEN_CRTC0_REGISTER_OFFSET, 1016 WREG32(EVERGREEN_GRPH_PRIMARY_SURFACE_ADDRESS_HIGH + EVERGREEN_CRTC0_REGISTER_OFFSET,
1017 upper_32_bits(rdev->mc.vram_start)); 1017 upper_32_bits(rdev->mc.vram_start));