diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 85995b4e3338..78600f534c80 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <drm/drmP.h> | 26 | #include <drm/drmP.h> |
| 27 | #include "radeon.h" | 27 | #include "radeon.h" |
| 28 | #include "radeon_asic.h" | 28 | #include "radeon_asic.h" |
| 29 | #include "radeon_audio.h" | ||
| 29 | #include <drm/radeon_drm.h> | 30 | #include <drm/radeon_drm.h> |
| 30 | #include "evergreend.h" | 31 | #include "evergreend.h" |
| 31 | #include "atom.h" | 32 | #include "atom.h" |
| @@ -5286,7 +5287,7 @@ static int evergreen_startup(struct radeon_device *rdev) | |||
| 5286 | return r; | 5287 | return r; |
| 5287 | } | 5288 | } |
| 5288 | 5289 | ||
| 5289 | r = r600_audio_init(rdev); | 5290 | r = radeon_audio_init(rdev); |
| 5290 | if (r) { | 5291 | if (r) { |
| 5291 | DRM_ERROR("radeon: audio init failed\n"); | 5292 | DRM_ERROR("radeon: audio init failed\n"); |
| 5292 | return r; | 5293 | return r; |
| @@ -5332,7 +5333,7 @@ int evergreen_resume(struct radeon_device *rdev) | |||
| 5332 | int evergreen_suspend(struct radeon_device *rdev) | 5333 | int evergreen_suspend(struct radeon_device *rdev) |
| 5333 | { | 5334 | { |
| 5334 | radeon_pm_suspend(rdev); | 5335 | radeon_pm_suspend(rdev); |
| 5335 | r600_audio_fini(rdev); | 5336 | radeon_audio_fini(rdev); |
| 5336 | uvd_v1_0_fini(rdev); | 5337 | uvd_v1_0_fini(rdev); |
| 5337 | radeon_uvd_suspend(rdev); | 5338 | radeon_uvd_suspend(rdev); |
| 5338 | r700_cp_stop(rdev); | 5339 | r700_cp_stop(rdev); |
| @@ -5482,7 +5483,7 @@ int evergreen_init(struct radeon_device *rdev) | |||
| 5482 | void evergreen_fini(struct radeon_device *rdev) | 5483 | void evergreen_fini(struct radeon_device *rdev) |
| 5483 | { | 5484 | { |
| 5484 | radeon_pm_fini(rdev); | 5485 | radeon_pm_fini(rdev); |
| 5485 | r600_audio_fini(rdev); | 5486 | radeon_audio_fini(rdev); |
| 5486 | r700_cp_fini(rdev); | 5487 | r700_cp_fini(rdev); |
| 5487 | r600_dma_fini(rdev); | 5488 | r600_dma_fini(rdev); |
| 5488 | r600_irq_fini(rdev); | 5489 | r600_irq_fini(rdev); |
