diff options
| author | Dave Airlie <[email protected]> | 2021-06-04 09:45:15 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2021-06-04 09:45:15 +1000 |
| commit | d6273d8f31cdaa7519984951cbfab0a983f219e5 (patch) | |
| tree | dd8fb1c63caba1229b73c585385b501974bc107b /drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | |
| parent | ff7a24a8fcb30adfea878d14c394300a087016ba (diff) | |
| parent | e7591a8d56bab89c617dae055446b6337ec32dc9 (diff) | |
Merge tag 'amd-drm-fixes-5.13-2021-06-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.13-2021-06-02:
amdgpu:
- Display fixes
- FRU EEPROM error handling fix
- RAS fix
- PSP fix
- Releasing pinned BO fix
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c index 2bab9c77952f..cf3803f8f075 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c @@ -357,6 +357,7 @@ static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) error: dma_fence_put(fence); + amdgpu_bo_unpin(bo); amdgpu_bo_unreserve(bo); amdgpu_bo_unref(&bo); return r; |