All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Quan, Evan" <Evan.Quan@amd.com>
To: Alex Deucher <alexdeucher@gmail.com>,
	"amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>
Cc: "Deucher, Alexander" <Alexander.Deucher@amd.com>
Subject: RE: [PATCH] drm/amdgpu: note what type of reset we are using
Date: Wed, 12 Aug 2020 02:16:57 +0000	[thread overview]
Message-ID: <BYAPR12MB2615C8A024AF4480DC52C270E4420@BYAPR12MB2615.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20200811160457.1073325-2-alexander.deucher@amd.com>

[AMD Official Use Only - Internal Distribution Only]

There is already a prompt in amdgpu_dpm_baco_reset() about the "GPU BACO reset".
dev_info(adev->dev, "GPU BACO reset\n");
So, debug prompts on the baco reset paths may be not needed.

BR
Evan
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Wednesday, August 12, 2020 12:05 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH] drm/amdgpu: note what type of reset we are using

When we reset the GPU, note what type of reset will be
used.  This makes debugging different reset scenarios
more clear as the driver may use different reset
methods depending on conditions on the system.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/cik.c   | 2 ++
 drivers/gpu/drm/amd/amdgpu/nv.c    | 6 ++++--
 drivers/gpu/drm/amd/amdgpu/si.c    | 2 ++
 drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +++
 drivers/gpu/drm/amd/amdgpu/vi.c    | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index c2c67ab68a43..7e71ffbca93d 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1366,8 +1366,10 @@ static int cik_asic_reset(struct amdgpu_device *adev)
 int r;

 if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
+dev_info(adev->dev, "BACO reset\n");
 r = amdgpu_dpm_baco_reset(adev);
 } else {
+dev_info(adev->dev, "PCI CONFIG reset\n");
 r = cik_asic_pci_config_reset(adev);
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index da8024c2826e..54e941e0db60 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -379,7 +379,7 @@ static int nv_asic_reset(struct amdgpu_device *adev)
 struct smu_context *smu = &adev->smu;

 if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
-dev_info(adev->dev, "GPU BACO reset\n");
+dev_info(adev->dev, "BACO reset\n");

 ret = smu_baco_enter(smu);
 if (ret)
@@ -387,8 +387,10 @@ static int nv_asic_reset(struct amdgpu_device *adev)
 ret = smu_baco_exit(smu);
 if (ret)
 return ret;
-} else
+} else {
+dev_info(adev->dev, "MODE1 reset\n");
 ret = nv_asic_mode1_reset(adev);
+}

 return ret;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index e330884edd19..eaa2f071b139 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -1302,6 +1302,8 @@ static int si_asic_reset(struct amdgpu_device *adev)
 {
 int r;

+dev_info(adev->dev, "PCI CONFIG reset\n");
+
 amdgpu_atombios_scratch_regs_engine_hung(adev, true);

 r = si_gpu_pci_config_reset(adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 84d811b6e48b..3cd98c144bc6 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -580,10 +580,13 @@ static int soc15_asic_reset(struct amdgpu_device *adev)

 switch (soc15_asic_reset_method(adev)) {
 case AMD_RESET_METHOD_BACO:
+dev_info(adev->dev, "BACO reset\n");
 return soc15_asic_baco_reset(adev);
 case AMD_RESET_METHOD_MODE2:
+dev_info(adev->dev, "MODE2 reset\n");
 return amdgpu_dpm_mode2_reset(adev);
 default:
+dev_info(adev->dev, "MODE1 reset\n");
 return soc15_asic_mode1_reset(adev);
 }
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index f6f2ed0830b1..f03314300ae3 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -752,8 +752,10 @@ static int vi_asic_reset(struct amdgpu_device *adev)
 int r;

 if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
+dev_info(adev->dev, "BACO reset\n");
 r = amdgpu_dpm_baco_reset(adev);
 } else {
+dev_info(adev->dev, "PCI CONFIG reset\n");
 r = vi_asic_pci_config_reset(adev);
 }

--
2.25.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cevan.quan%40amd.com%7C49e2d545b7f142d44a1408d83e105424%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637327587186703359&amp;sdata=u2bQddjGudo4uZmZvn3ubj2fstYIxgdLhZ%2FKsFoWacg%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2020-08-12  2:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-11 16:04 [PATCH] drm/amdgpu: print where we get the vbios image from Alex Deucher
2020-08-11 16:04 ` [PATCH] drm/amdgpu: note what type of reset we are using Alex Deucher
2020-08-11 16:17   ` Nirmoy
2020-08-12  2:16   ` Quan, Evan [this message]
2020-08-11 16:44 ` [PATCH] drm/amdgpu: print where we get the vbios image from Christian König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BYAPR12MB2615C8A024AF4480DC52C270E4420@BYAPR12MB2615.namprd12.prod.outlook.com \
    --to=evan.quan@amd.com \
    --cc=Alexander.Deucher@amd.com \
    --cc=alexdeucher@gmail.com \
    --cc=amd-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.