diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/nv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/nv.c | 7 | 
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 2d1bebdf1603..52318b03c424 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -351,8 +351,6 @@ static int nv_asic_reset(struct amdgpu_device *adev)  	struct smu_context *smu = &adev->smu;  	if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) { -		if (!adev->in_suspend) -			amdgpu_inc_vram_lost(adev);  		ret = smu_baco_enter(smu);  		if (ret)  			return ret; @@ -360,8 +358,6 @@ static int nv_asic_reset(struct amdgpu_device *adev)  		if (ret)  			return ret;  	} else { -		if (!adev->in_suspend) -			amdgpu_inc_vram_lost(adev);  		ret = nv_asic_mode1_reset(adev);  	} @@ -516,7 +512,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)  		    !amdgpu_sriov_vf(adev))  			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);  		amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); -		amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block); +		if (!amdgpu_sriov_vf(adev)) +			amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);  		break;  	default:  		return -EINVAL;  |