diff options
| author |   Dave Airlie <airlied@gmail.com> | 2014-03-03 09:04:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-03-03 09:04:41 +1000 |
| commit | d668ca1cc6b9b6d2f1ce2f7b158cbe919cc782dc (patch) | |
| tree | daa81aecf4eefc864ba9589ca095c491029dad3f /drivers/gpu/drm/radeon/radeon_uvd.c | |
| parent | Merge tag 'vmwgfx-fixes-3.14-2014-03-02' of git://people.freedesktop.org/~thomash/linux into drm-fixes (diff) | |
| parent | drm/radeon: enable speaker allocation setup on dce3.2 (diff) | |
| download | wireguard-linux-d668ca1cc6b9b6d2f1ce2f7b158cbe919cc782dc.tar.xz wireguard-linux-d668ca1cc6b9b6d2f1ce2f7b158cbe919cc782dc.zip | |
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
more radeon fixes
* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: enable speaker allocation setup on dce3.2
drm/radeon: change audio enable logic
drm/radeon: fix audio disable on dce6+
drm/radeon: free uvd ring on unload
drm/radeon: disable pll sharing for DP on DCE4.1
drm/radeon: fix missing bo reservation
drm/radeon: print the supported atpx function mask
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_uvd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c index 6781fee1eaad..3e6804b2b2ef 100644 --- a/drivers/gpu/drm/radeon/radeon_uvd.c +++ b/drivers/gpu/drm/radeon/radeon_uvd.c @@ -171,6 +171,8 @@ void radeon_uvd_fini(struct radeon_device *rdev) radeon_bo_unref(&rdev->uvd.vcpu_bo); + radeon_ring_fini(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX]); + release_firmware(rdev->uvd_fw); } |