drm/amdgpu: Fix mode2 reset for sienna cichlid

lyndonli-amd · alexdeucher · commit 74a494151440 · 2023-05-03T22:43:12.000-04:00
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 &lt;Lyndon.Li@amd.com&gt;
Signed-off-by: Yunxiang Li &lt;Yunxiang.Li@amd.com&gt;
Reviewed-by: Feifei Xu &lt;Feifei.Xu@amd.com&gt;
Reviewed-by: Kenneth Feng &lt;kenneth.feng@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
@@ -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 *

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ static bool sienna_cichlid_is_mode2_default(struct amdgpu_reset_control *reset_c`
`40`	`40`	`adev->pm.fw_version >= 0x3a5500 && !amdgpu_sriov_vf(adev))`
`41`	`41`	`return true;`
`42`	`42`	`#endif`
`43`		`- return false;`
	`43`	`+ return amdgpu_reset_method == AMD_RESET_METHOD_MODE2;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`static struct amdgpu_reset_handler *`