diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 04ddc365a908..4ad0281fdc37 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
| @@ -956,6 +956,12 @@ static int rv770_startup(struct radeon_device *rdev) | |||
| 956 | if (r) | 956 | if (r) |
| 957 | return r; | 957 | return r; |
| 958 | 958 | ||
| 959 | r = r600_audio_init(rdev); | ||
| 960 | if (r) { | ||
| 961 | DRM_ERROR("radeon: audio init failed\n"); | ||
| 962 | return r; | ||
| 963 | } | ||
| 964 | |||
| 959 | return 0; | 965 | return 0; |
| 960 | } | 966 | } |
| 961 | 967 | ||
| @@ -978,12 +984,6 @@ int rv770_resume(struct radeon_device *rdev) | |||
| 978 | return r; | 984 | return r; |
| 979 | } | 985 | } |
| 980 | 986 | ||
| 981 | r = r600_audio_init(rdev); | ||
| 982 | if (r) { | ||
| 983 | dev_err(rdev->dev, "radeon: audio init failed\n"); | ||
| 984 | return r; | ||
| 985 | } | ||
| 986 | |||
| 987 | return r; | 987 | return r; |
| 988 | 988 | ||
| 989 | } | 989 | } |
| @@ -1092,12 +1092,6 @@ int rv770_init(struct radeon_device *rdev) | |||
| 1092 | rdev->accel_working = false; | 1092 | rdev->accel_working = false; |
| 1093 | } | 1093 | } |
| 1094 | 1094 | ||
| 1095 | r = r600_audio_init(rdev); | ||
| 1096 | if (r) { | ||
| 1097 | dev_err(rdev->dev, "radeon: audio init failed\n"); | ||
| 1098 | return r; | ||
| 1099 | } | ||
| 1100 | |||
| 1101 | return 0; | 1095 | return 0; |
| 1102 | } | 1096 | } |
| 1103 | 1097 | ||