diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rs690.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs690.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index bbf3da790fd5..56a0aec84af2 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c | |||
@@ -48,8 +48,6 @@ static int rs690_mc_wait_for_idle(struct radeon_device *rdev) | |||
48 | 48 | ||
49 | static void rs690_gpu_init(struct radeon_device *rdev) | 49 | static void rs690_gpu_init(struct radeon_device *rdev) |
50 | { | 50 | { |
51 | /* FIXME: HDP same place on rs690 ? */ | ||
52 | r100_hdp_reset(rdev); | ||
53 | /* FIXME: is this correct ? */ | 51 | /* FIXME: is this correct ? */ |
54 | r420_pipes_init(rdev); | 52 | r420_pipes_init(rdev); |
55 | if (rs690_mc_wait_for_idle(rdev)) { | 53 | if (rs690_mc_wait_for_idle(rdev)) { |
@@ -653,7 +651,7 @@ int rs690_resume(struct radeon_device *rdev) | |||
653 | /* Resume clock before doing reset */ | 651 | /* Resume clock before doing reset */ |
654 | rv515_clock_startup(rdev); | 652 | rv515_clock_startup(rdev); |
655 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ | 653 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ |
656 | if (radeon_gpu_reset(rdev)) { | 654 | if (radeon_asic_reset(rdev)) { |
657 | dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", | 655 | dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", |
658 | RREG32(R_000E40_RBBM_STATUS), | 656 | RREG32(R_000E40_RBBM_STATUS), |
659 | RREG32(R_0007C0_CP_STAT)); | 657 | RREG32(R_0007C0_CP_STAT)); |
@@ -717,7 +715,7 @@ int rs690_init(struct radeon_device *rdev) | |||
717 | return -EINVAL; | 715 | return -EINVAL; |
718 | } | 716 | } |
719 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ | 717 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ |
720 | if (radeon_gpu_reset(rdev)) { | 718 | if (radeon_asic_reset(rdev)) { |
721 | dev_warn(rdev->dev, | 719 | dev_warn(rdev->dev, |
722 | "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", | 720 | "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", |
723 | RREG32(R_000E40_RBBM_STATUS), | 721 | RREG32(R_000E40_RBBM_STATUS), |