From: Monk Liu Date: Tue, 21 Mar 2017 10:58:53 +0000 (+0800) Subject: drm/amdgpu:two fixings for sdma v4 for SRIOV X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=32833fb732a80cd27f3756b2ead7aaf85ec1a780;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu:two fixings for sdma v4 for SRIOV no hw_fini for SRIOV, otherwise other VF will be affected no CG for SRIOV Signed-off-by: Monk Liu Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index f8eb53b70315..bc19e5ebdb90 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -1172,6 +1172,9 @@ static int sdma_v4_0_hw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + if (amdgpu_sriov_vf(adev)) + return 0; + sdma_v4_0_ctx_switch_enable(adev, false); sdma_v4_0_enable(adev, false); @@ -1406,6 +1409,9 @@ static int sdma_v4_0_set_clockgating_state(void *handle, { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + if (amdgpu_sriov_vf(adev)) + return 0; + switch (adev->asic_type) { case CHIP_VEGA10: sdma_v4_0_update_medium_grain_clock_gating(adev,