]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: Fix mode2 reset for sienna cichlid
authorlyndonli <Lyndon.Li@amd.com>
Sun, 23 Apr 2023 08:46:30 +0000 (16:46 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 9 Jun 2023 13:21:03 +0000 (09:21 -0400)
Before this change, sienna_cichlid_get_reset_handler will always
return NULL, although the module parameter reset_method is 3
when loading amdgpu driver.

Signed-off-by: lyndonli <Lyndon.Li@amd.com>
Signed-off-by: Yunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c

index 81a6d5b94987f106d3225be7d774cf1f7cf55098..8b8086d5c864bc2796b6411ac71ac13269fb01d6 100644 (file)
@@ -40,7 +40,7 @@ static bool sienna_cichlid_is_mode2_default(struct amdgpu_reset_control *reset_c
            adev->pm.fw_version >= 0x3a5500 && !amdgpu_sriov_vf(adev))
                return true;
 #endif
-       return false;
+       return amdgpu_reset_method == AMD_RESET_METHOD_MODE2;
 }
 
 static struct amdgpu_reset_handler *