diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2010-03-06 13:03:36 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-15 10:05:13 +1000 |
| commit | 8a8c6e7cfb63cc5e04d5c247ab8d6253200fd425 (patch) | |
| tree | 5ac6ccaf5f0ee73d2a6d6aadef3459a3240bec31 /drivers/gpu/drm/radeon/rv770.c | |
| parent | 5715f67cecee3617c7a6ff84ee44da46d525559e (diff) | |
| download | linux-8a8c6e7cfb63cc5e04d5c247ab8d6253200fd425.tar.gz linux-8a8c6e7cfb63cc5e04d5c247ab8d6253200fd425.tar.bz2 linux-8a8c6e7cfb63cc5e04d5c247ab8d6253200fd425.zip | |
drm/radeon/kms: enable audio engine on DCE32
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 37887dee12af..8f0c9253c5bb 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -1013,6 +1013,13 @@ int rv770_resume(struct radeon_device *rdev) DRM_ERROR("radeon: failled testing IB (%d).\n", r); return r; } + + r = r600_audio_init(rdev); + if (r) { + dev_err(rdev->dev, "radeon: audio init failed\n"); + return r; + } + return r; } @@ -1021,6 +1028,7 @@ int rv770_suspend(struct radeon_device *rdev) { int r; + r600_audio_fini(rdev); /* FIXME: we should wait for ring to be empty */ r700_cp_stop(rdev); rdev->cp.ready = false; @@ -1144,6 +1152,13 @@ int rv770_init(struct radeon_device *rdev) } } } + + r = r600_audio_init(rdev); + if (r) { + dev_err(rdev->dev, "radeon: audio init failed\n"); + return r; + } + return 0; } |