diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 13 | 
1 files changed, 3 insertions, 10 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index f96464e2c157..a41272fbcba2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -493,14 +493,9 @@ static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han  int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)  { -	struct amdgpu_device *adev = ring->adev;  	struct dma_fence *fence;  	long r; -	/* temporarily disable ib test for sriov */ -	if (amdgpu_sriov_vf(adev)) -		return 0; -  	r = amdgpu_vcn_dec_get_create_msg(ring, 1, NULL);  	if (r)  		goto error; @@ -527,6 +522,9 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring)  	unsigned i;  	int r; +	if (amdgpu_sriov_vf(adev)) +		return 0; +  	r = amdgpu_ring_alloc(ring, 16);  	if (r)  		return r; @@ -656,15 +654,10 @@ err:  int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)  { -	struct amdgpu_device *adev = ring->adev;  	struct dma_fence *fence = NULL;  	struct amdgpu_bo *bo = NULL;  	long r; -	/* temporarily disable ib test for sriov */ -	if (amdgpu_sriov_vf(adev)) -		return 0; -  	r = amdgpu_bo_create_reserved(ring->adev, 128 * 1024, PAGE_SIZE,  				      AMDGPU_GEM_DOMAIN_VRAM,  				      &bo, NULL, NULL); |