drm/amdgpu: Do not implement power-on for SDMA after do mode2 reset on Renoir
authorchen gong <curry.gong@amd.com>
Sun, 29 Sep 2019 02:58:43 +0000 (10:58 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 11 Oct 2019 00:39:06 +0000 (19:39 -0500)
Find that ring sdma0 test failed if turn on SDMA powergating after do
mode2 reset.

Perhaps the mode2 reset does not reset the SDMA PG state, SDMA is
already powered up so there is no need to ask the SMU to power it up
again. So I skip this function for a moment.

Signed-off-by: chen gong <curry.gong@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

index 96581b5..4fb9f19 100644 (file)
@@ -1792,7 +1792,7 @@ static int sdma_v4_0_hw_init(void *handle)
 
        if ((adev->asic_type == CHIP_RAVEN && adev->powerplay.pp_funcs &&
                        adev->powerplay.pp_funcs->set_powergating_by_smu) ||
-                       adev->asic_type == CHIP_RENOIR)
+                       (adev->asic_type == CHIP_RENOIR && !adev->in_gpu_reset))
                amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_SDMA, false);
 
        if (!amdgpu_sriov_vf(adev))