diff mbox series

[1/1] drm/amdgpu: make sure we unpin the UVD BO

Message ID 20210420105013.6486-1-nirmoy.das@amd.com (mailing list archive)
State New, archived
Headers show
Series [1/1] drm/amdgpu: make sure we unpin the UVD BO | expand

Commit Message

Das, Nirmoy April 20, 2021, 10:50 a.m. UTC
Releasing pinned BOs is illegal now.
UVD 6 was missing from:
commit 2f40801dc553 ("drm/amdgpu: make sure we unpin the UVD BO")

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Christian König May 28, 2021, 2:36 p.m. UTC | #1
Am 20.04.21 um 12:50 schrieb Nirmoy Das:
> Releasing pinned BOs is illegal now.
> UVD 6 was missing from:
> commit 2f40801dc553 ("drm/amdgpu: make sure we unpin the UVD BO")
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

Maybe add a CC:stable tag as well.

Sorry I somehow overlooked this patch. Can you make sure that it lands 
in amd-staging-drm-next ASAP? We have an user complaining.

Thanks,
Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 760859880c1e..4eebf973a065 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;
Das, Nirmoy May 28, 2021, 2:49 p.m. UTC | #2
On 5/28/2021 4:36 PM, Christian König wrote:
> Am 20.04.21 um 12:50 schrieb Nirmoy Das:
>> Releasing pinned BOs is illegal now.
>> UVD 6 was missing from:
>> commit 2f40801dc553 ("drm/amdgpu: make sure we unpin the UVD BO")
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>
> Maybe add a CC:stable tag as well.
>
> Sorry I somehow overlooked this patch. Can you make sure that it lands 
> in amd-staging-drm-next ASAP? We have an user complaining.
>

No worries, I will push it now with CC:stable.


Thanks,

Nirmoy


> Thanks,
> Christian.
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c 
>> b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
>> index 760859880c1e..4eebf973a065 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;
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 760859880c1e..4eebf973a065 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;