diff options
| author | Slava Grigorev <slava.grigorev@amd.com> | 2014-12-22 23:26:51 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-01-22 16:38:59 +0100 |
| commit | bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c (patch) | |
| tree | a7d965803e57ca2736d37bbc1b6605fcb0d66f19 /drivers/gpu/drm/radeon/ni.c | |
| parent | drm/radeon: comment out some currently unused 7xx dpm code (diff) | |
| download | linux-bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c.tar.xz linux-bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c.zip | |
radeon/audio: consolidate audio_init() functions
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index aea48c89b241..d2f10408c560 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -27,6 +27,7 @@ #include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" +#include "radeon_audio.h" #include <drm/radeon_drm.h> #include "nid.h" #include "atom.h" @@ -2097,15 +2098,9 @@ static int cayman_startup(struct radeon_device *rdev) return r; } - if (ASIC_IS_DCE6(rdev)) { - r = dce6_audio_init(rdev); - if (r) - return r; - } else { - r = r600_audio_init(rdev); - if (r) - return r; - } + r = radeon_audio_init(rdev); + if (r) + return r; return 0; } |