diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index 3dc968c9f5a4..3759d8384294 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
| @@ -235,7 +235,7 @@ int r420_resume(struct radeon_device *rdev) | |||
| 235 | /* Resume clock before doing reset */ | 235 | /* Resume clock before doing reset */ |
| 236 | r420_clock_resume(rdev); | 236 | r420_clock_resume(rdev); |
| 237 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ | 237 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ |
| 238 | if (radeon_gpu_reset(rdev)) { | 238 | if (radeon_asic_reset(rdev)) { |
| 239 | dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", | 239 | dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", |
| 240 | RREG32(R_000E40_RBBM_STATUS), | 240 | RREG32(R_000E40_RBBM_STATUS), |
| 241 | RREG32(R_0007C0_CP_STAT)); | 241 | RREG32(R_0007C0_CP_STAT)); |
| @@ -316,7 +316,7 @@ int r420_init(struct radeon_device *rdev) | |||
| 316 | } | 316 | } |
| 317 | } | 317 | } |
| 318 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ | 318 | /* Reset gpu before posting otherwise ATOM will enter infinite loop */ |
| 319 | if (radeon_gpu_reset(rdev)) { | 319 | if (radeon_asic_reset(rdev)) { |
| 320 | dev_warn(rdev->dev, | 320 | dev_warn(rdev->dev, |
| 321 | "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", | 321 | "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", |
| 322 | RREG32(R_000E40_RBBM_STATUS), | 322 | RREG32(R_000E40_RBBM_STATUS), |