Skip to contentSkip to conversation

drm/amdgpu: don't do resets on APUs which don't support it

PATCH In review Alex Deucher 5 participants 5 messages Jan 13, 2022

Subsystems (3)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/1 drm/amdgpu: don't do resets on APUs which don't support it

It can cause a hang. This is normally not enabled for GPU hangs on these asics, but was recently enabled for handling aborted suspends. This causes hangs on some platforms on suspend.

Fixes daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)")
---
 drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++++
 drivers/gpu/drm/amd/amdgpu/vi.c  | 4 ++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
index 54f28c075f21..f10ce740a29c 100644
@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_device *adev)
 {
 	int r;
 
+	/* APUs don't have full asic reset */
+	if (adev->flags & AMD_IS_APU)
+		return 0;
+
 	if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
 		dev_info(adev->dev, "BACO reset\n");
 		r = amdgpu_dpm_baco_reset(adev);
drivers/gpu/drm/amd/amdgpu/vi.c +4 -0
index fe9a7cc8d9eb..6645ebbd2696 100644
@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_device *adev)
 {
 	int r;
 
+	/* APUs don't have full asic reset */
+	if (adev->flags & AMD_IS_APU)
+		return 0;
+
 	if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
 		dev_info(adev->dev, "BACO reset\n");
 		r = amdgpu_dpm_baco_reset(adev);
Signature · 1 line
2.34.1
Acked-by on v1 1/1
#1 lore raw

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Thursday, January 13, 2022 12:01 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; [email protected]
Subject: [PATCH] drm/amdgpu: don't do resets on APUs which don't support it

It can cause a hang. This is normally not enabled for GPU hangs on these asics, but was recently enabled for handling aborted suspends. This causes hangs on some platforms on suspend.

---
 drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++++  drivers/gpu/drm/amd/amdgpu/vi.c  | 4 ++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
index 54f28c075f21..f10ce740a29c 100644
@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_device *adev)  {
 	int r;
 
+	/* APUs don't have full asic reset */
+	if (adev->flags & AMD_IS_APU)
+		return 0;
+
 	if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
 		dev_info(adev->dev, "BACO reset\n");
 		r = amdgpu_dpm_baco_reset(adev);
drivers/gpu/drm/amd/amdgpu/vi.c +4 -1
@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_device *adev)  {
 	int r;
 
+	/* APUs don't have full asic reset */
+	if (adev->flags & AMD_IS_APU)
+		return 0;
+
 	if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
 		dev_info(adev->dev, "BACO reset\n");
 		r = amdgpu_dpm_baco_reset(adev);
--

2.34.1

#2 lore raw
In reply to Alex Deucher

Hi Alex,

What about something like this?

bool amdgpu_device_reset_on_suspend(struct amdgpu_device *adev)

{
        if (adev->in_s0ix || adev->gmc.xgmi.num_physical_nodes > 1)
                return false;

        switch (amdgpu_asic_reset_method(adev)) {
        case AMD_RESET_METHOD_BACO:
        case AMD_RESET_METHOD_MODE1:
        case AMD_RESET_METHOD_MODE2:
                return true;
        }

        return false;
}

Thanks,
Lijo

Quoted 45 lines · Alex Deucher

It can cause a hang. This is normally not enabled for GPU hangs on these asics, but was recently enabled for handling aborted suspends. This causes hangs on some platforms on suspend.

Fixes daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)")
---
  drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++++
  drivers/gpu/drm/amd/amdgpu/vi.c  | 4 ++++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
index 54f28c075f21..f10ce740a29c 100644
@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_device *adev)
  {
  	int r;
 
+	/* APUs don't have full asic reset */
+	if (adev->flags & AMD_IS_APU)
+		return 0;
+
  	if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
  		dev_info(adev->dev, "BACO reset\n");
  		r = amdgpu_dpm_baco_reset(adev);
drivers/gpu/drm/amd/amdgpu/vi.c +4 -0
index fe9a7cc8d9eb..6645ebbd2696 100644
@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_device *adev)
  {
  	int r;
 
+	/* APUs don't have full asic reset */
+	if (adev->flags & AMD_IS_APU)
+		return 0;
+
  	if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
  		dev_info(adev->dev, "BACO reset\n");
  		r = amdgpu_dpm_baco_reset(adev);
#3 lore raw
Quoted 16 lines · Lijo

Hi Alex,

What about something like this?

bool amdgpu_device_reset_on_suspend(struct amdgpu_device *adev) {
        if (adev->in_s0ix || adev->gmc.xgmi.num_physical_nodes > 1) return false;

        switch (amdgpu_asic_reset_method(adev)) { case AMD_RESET_METHOD_BACO:
        case AMD_RESET_METHOD_MODE1:
        case AMD_RESET_METHOD_MODE2:
                return true;
        }

Quoted 3 lines

        return false;
}

I think the approach that Alex shared *might* be more flexible to also be used in the aborted suspend case too on s0ix. There is some discussions going on for that right now.

Quoted 49 lines

Thanks,
Lijo

Quoted 44 lines · Alex Deucher

It can cause a hang.  This is normally not enabled for GPU hangs on these asics, but was recently enabled for handling aborted suspends.  This causes hangs on some platforms on suspend.

Fixes daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)")

---
  drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++++
  drivers/gpu/drm/amd/amdgpu/vi.c  | 4 ++++

  2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
index 54f28c075f21..f10ce740a29c 100644
@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_device 
 *adev)
   {
       int r;
+    /* APUs don't have full asic reset */
+    if (adev->flags & AMD_IS_APU)
+        return 0;
+
       if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
           dev_info(adev->dev, "BACO reset\n");
           r = amdgpu_dpm_baco_reset(adev);
drivers/gpu/drm/amd/amdgpu/vi.c +4 -0
index fe9a7cc8d9eb..6645ebbd2696 100644
@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_device *adev)
   {
       int r;
+    /* APUs don't have full asic reset */
+    if (adev->flags & AMD_IS_APU)
+        return 0;
+
       if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
           dev_info(adev->dev, "BACO reset\n");
           r = amdgpu_dpm_baco_reset(adev);
 
#4 lore raw
In reply to Lazar, Lijo
Quoted 6 lines · Lijo

Hi Alex,

What about something like this?

bool amdgpu_device_reset_on_suspend(struct amdgpu_device *adev)

Quoted 8 lines
{
         if (adev->in_s0ix || adev->gmc.xgmi.num_physical_nodes > 1)
                 return false;

         switch (amdgpu_asic_reset_method(adev)) {
         case AMD_RESET_METHOD_BACO:
         case AMD_RESET_METHOD_MODE1:
         case AMD_RESET_METHOD_MODE2:

This should also work on AMD_RESET_METHOD_LEGACY, at least for dGPUs. I think the current approach is probably better since I don't think GPU resets work reliably on these chips anyway (it's not enabled by default on them gor hangs), so better to just not do it as it may make the problem worse.

Alex

Quoted 55 lines
                 return true;
         }

         return false;
}

Thanks,
Lijo

Quoted 45 lines · Alex Deucher

It can cause a hang. This is normally not enabled for GPU hangs on these asics, but was recently enabled for handling aborted suspends. This causes hangs on some platforms on suspend.

Fixes daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)")
---
  drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++++
  drivers/gpu/drm/amd/amdgpu/vi.c  | 4 ++++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
index 54f28c075f21..f10ce740a29c 100644
@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_device *adev)
  {
      int r;
 
+     /* APUs don't have full asic reset */
+     if (adev->flags & AMD_IS_APU)
+             return 0;
+
      if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
              dev_info(adev->dev, "BACO reset\n");
              r = amdgpu_dpm_baco_reset(adev);
drivers/gpu/drm/amd/amdgpu/vi.c +4 -0
index fe9a7cc8d9eb..6645ebbd2696 100644
@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_device *adev)
  {
      int r;
 
+     /* APUs don't have full asic reset */
+     if (adev->flags & AMD_IS_APU)
+             return 0;
+
      if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
              dev_info(adev->dev, "BACO reset\n");
              r = amdgpu_dpm_baco_reset(adev);