[PATCH 1/2] drm/amdgpu: Fix mode2 reset for sienna cichlid

[Xu, Feifei]

[AMD Official Use Only - General]



Reviewed-by: Feifei Xu <Feifei.Xu at amd.com>

-----Original Message-----
From: lyndonli <Lyndon.Li at amd.com> 
Sent: Monday, April 24, 2023 9:58 AM
To: amd-gfx at lists.freedesktop.org
Cc: Liu, Shaoyun <Shaoyun.Liu at amd.com>; Zhao, Victor <Victor.Zhao at amd.com>; Feng, Kenneth <Kenneth.Feng at amd.com>; Xu, Feifei <Feifei.Xu at amd.com>; Li, Yunxiang (Teddy) <Yunxiang.Li at amd.com>; Li, Lyndon <Lyndon.Li at amd.com>
Subject: [PATCH 1/2] drm/amdgpu: Fix mode2 reset for sienna cichlid

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 at amd.com>
Signed-off-by: Yunxiang Li <Yunxiang.Li at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
index 81a6d5b94987..8b8086d5c864 100644
--- 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 *
--
2.34.1