diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-01-03 09:43:28 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-03 09:45:12 +0000 |
| commit | 7a7e8734ac3235efafd34819b27fbdf5417e6d60 (patch) | |
| tree | 8e34492eaef018bd87065bb7552de15b6a1f0fa5 /drivers/gpu/drm/radeon/evergreen.c | |
| parent | 2318fcd65c1fb1e842f860c1e3fe4dba7e55cd11 (diff) | |
| parent | 93a4ed878a22b8489723bc3ab89dd401128bbc9e (diff) | |
| download | talos-op-linux-7a7e8734ac3235efafd34819b27fbdf5417e6d60.tar.gz talos-op-linux-7a7e8734ac3235efafd34819b27fbdf5417e6d60.zip | |
Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next
This merges the evergreen HDMI audio support.
* 'drm-radeon-testing' of ../drm-radeon-next:
drm/radeon/kms: define TMDS/LVTM HDMI enabling bits
drm/radeon/kms: workaround invalid AVI infoframe checksum issue
drm/radeon/kms: setup HDMI mode on Evergreen encoders
drm/radeon/kms: support for audio on Evergreen
drm/radeon/kms: minor HDMI audio cleanups
drm/radeon/kms: do not force DVI mode on DCE4 if audio is on
ridge
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 1934728e2465..ccde2c9540e2 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -3190,6 +3190,11 @@ static int evergreen_startup(struct radeon_device *rdev) if (r) { DRM_ERROR("radeon: failed testing IB (%d).\n", r); rdev->accel_working = false; + } + + r = r600_audio_init(rdev); + if (r) { + DRM_ERROR("radeon: audio init failed\n"); return r; } @@ -3227,6 +3232,7 @@ int evergreen_suspend(struct radeon_device *rdev) { struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; + r600_audio_fini(rdev); /* FIXME: we should wait for ring to be empty */ radeon_ib_pool_suspend(rdev); r600_blit_suspend(rdev); @@ -3342,6 +3348,7 @@ int evergreen_init(struct radeon_device *rdev) void evergreen_fini(struct radeon_device *rdev) { + r600_audio_fini(rdev); r600_blit_fini(rdev); r700_cp_fini(rdev); r600_irq_fini(rdev); |
