From: jsg <jsg@openbsd.org>
Date: Thu, 24 Feb 2022 12:54:50 +0000 (+0000)
Subject: drm/amd/pm: correct the sequence of sending gpu reset msg
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=91698b30242bf21e718f599733acf0e92c88e62c;p=openbsd

drm/amd/pm: correct the sequence of sending gpu reset msg

From Yifan Zhang
3851046599c1907c956b126bac18c4b84bf6a16b in linux 5.15.y/5.15.25
9c4f59ea3f865693150edf0c91d1cc6b451360dd in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
index a403657151b..0e1a843608e 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
@@ -291,14 +291,9 @@ static int yellow_carp_post_smu_init(struct smu_context *smu)
 
 static int yellow_carp_mode_reset(struct smu_context *smu, int type)
 {
-	int ret = 0, index = 0;
-
-	index = smu_cmn_to_asic_specific_index(smu, CMN2ASIC_MAPPING_MSG,
-				SMU_MSG_GfxDeviceDriverReset);
-	if (index < 0)
-		return index == -EACCES ? 0 : index;
+	int ret = 0;
 
-	ret = smu_cmn_send_smc_msg_with_param(smu, (uint16_t)index, type, NULL);
+	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_GfxDeviceDriverReset, type, NULL);
 	if (ret)
 		dev_err(smu->adev->dev, "Failed to mode reset!\n");