Skip to contentSkip to conversation

drm/amdgpu: drop useless BACO arg in amdgpu_ras_reset_gpu

PATCH In review Guchun Chen 3 participants 3 messages Dec 13, 2019 – Dec 16, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: drop useless BACO arg in amdgpu_ras_reset_gpu

BACO reset mode strategy is determined by latter func when calling amdgpu_ras_reset_gpu. So not to confuse audience, drop it.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c  | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c  | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h  | 3 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c  | 2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c   | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
index 52c27e49bc7b..056c7e7a6040 100644
@@ -641,7 +641,7 @@ int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,
 		kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
 		if (adev->gfx.funcs->query_ras_error_count)
 			adev->gfx.funcs->query_ras_error_count(adev, err_data);
-		amdgpu_ras_reset_gpu(adev, 0);
+		amdgpu_ras_reset_gpu(adev);
 	}
 	return AMDGPU_RAS_SUCCESS;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2 -2
index 3f4ba408aee0..e9f8decfbc69 100644
@@ -1872,7 +1872,7 @@ void amdgpu_ras_resume(struct amdgpu_device *adev)
 		 * See feature_enable_on_boot
 		 */
 		amdgpu_ras_disable_all_features(adev, 1);
-		amdgpu_ras_reset_gpu(adev, 0);
+		amdgpu_ras_reset_gpu(adev);
 	}
 }
 
@@ -1935,6 +1935,6 @@ void amdgpu_ras_global_ras_isr(struct amdgpu_device *adev)
 	if (atomic_cmpxchg(&amdgpu_ras_in_intr, 0, 1) == 0) {
 		DRM_WARN("RAS event of type ERREVENT_ATHUB_INTERRUPT detected!\n");
 
-		amdgpu_ras_reset_gpu(adev, false);
+		amdgpu_ras_reset_gpu(adev);
 	}
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +1 -2
index d4ade4739245..a5fe29a9373e 100644
@@ -494,8 +494,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
 
 int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev);
 
-static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev,
-		bool is_baco)
+static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 {
 	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1 -1
index 6361b2c9ae1a..9bbe819de46a 100644
@@ -160,7 +160,7 @@ int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,
 		struct amdgpu_iv_entry *entry)
 {
 	kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
-	amdgpu_ras_reset_gpu(adev, 0);
+	amdgpu_ras_reset_gpu(adev);
 
 	return AMDGPU_RAS_SUCCESS;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +1 -1
index d4fb9cf27e21..8a6c733d170c 100644
@@ -132,7 +132,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,
 						err_data->err_addr_cnt))
 			DRM_WARN("Failed to add ras bad page!\n");
 
-		amdgpu_ras_reset_gpu(adev, 0);
+		amdgpu_ras_reset_gpu(adev);
 	}
 
 	kfree(err_data->err_addr);
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1 -1
index bb701dbfd472..7091782266b9 100644
@@ -339,7 +339,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
 		/* ras_controller_int is dedicated for nbif ras error,
 		 * not the global interrupt for sync flood
 		 */
-		amdgpu_ras_reset_gpu(adev, true);
+		amdgpu_ras_reset_gpu(adev);
 	}
 }
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer Reviewed-by on v1 1/1
#1 lore raw

[AMD Official Use Only - Internal Distribution Only]

________________________________
From: Chen, Guchun <[email protected]>
Sent: Friday, December 13, 2019 3:53 AM
To: Zhang, Hawking <[email protected]>; Ma, Le <[email protected]>; Zhou1, Tao <[email protected]>; Deucher, Alexander <[email protected]>; [email protected] <[email protected]>
Cc: Chen, Guchun <[email protected]>
Subject: [PATCH] drm/amdgpu: drop useless BACO arg in amdgpu_ras_reset_gpu

BACO reset mode strategy is determined by latter func when calling amdgpu_ras_reset_gpu. So not to confuse audience, drop it.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c  | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c  | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h  | 3 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c  | 2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c   | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
index 52c27e49bc7b..056c7e7a6040 100644
@@ -641,7 +641,7 @@ int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,
                 kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
                 if (adev->gfx.funcs->query_ras_error_count)
                         adev->gfx.funcs->query_ras_error_count(adev, err_data);
-               amdgpu_ras_reset_gpu(adev, 0);
+               amdgpu_ras_reset_gpu(adev);
         }
         return AMDGPU_RAS_SUCCESS;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2 -2
index 3f4ba408aee0..e9f8decfbc69 100644
@@ -1872,7 +1872,7 @@ void amdgpu_ras_resume(struct amdgpu_device *adev)
                  * See feature_enable_on_boot
                  */
                 amdgpu_ras_disable_all_features(adev, 1);
-               amdgpu_ras_reset_gpu(adev, 0);
+               amdgpu_ras_reset_gpu(adev);
         }
 }
 
@@ -1935,6 +1935,6 @@ void amdgpu_ras_global_ras_isr(struct amdgpu_device *adev)
         if (atomic_cmpxchg(&amdgpu_ras_in_intr, 0, 1) == 0) {
                 DRM_WARN("RAS event of type ERREVENT_ATHUB_INTERRUPT detected!\n");
 
-               amdgpu_ras_reset_gpu(adev, false);
+               amdgpu_ras_reset_gpu(adev);
         }
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +1 -2
index d4ade4739245..a5fe29a9373e 100644
@@ -494,8 +494,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
 
 int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev);
 
-static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev,
-               bool is_baco)
+static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 {
         struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1 -1
index 6361b2c9ae1a..9bbe819de46a 100644
@@ -160,7 +160,7 @@ int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,
                 struct amdgpu_iv_entry *entry)
 {
         kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
-       amdgpu_ras_reset_gpu(adev, 0);
+       amdgpu_ras_reset_gpu(adev);
 
         return AMDGPU_RAS_SUCCESS;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +1 -1
index d4fb9cf27e21..8a6c733d170c 100644
@@ -132,7 +132,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,
                                                 err_data->err_addr_cnt))
                         DRM_WARN("Failed to add ras bad page!\n");
 
-               amdgpu_ras_reset_gpu(adev, 0);
+               amdgpu_ras_reset_gpu(adev);
         }
 
         kfree(err_data->err_addr);
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1 -1
index bb701dbfd472..7091782266b9 100644
@@ -339,7 +339,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
                 /* ras_controller_int is dedicated for nbif ras error,
                  * not the global interrupt for sync flood
                  */
-               amdgpu_ras_reset_gpu(adev, true);
+               amdgpu_ras_reset_gpu(adev);
         }
 }
 

--
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Guchun Chen

[AMD Official Use Only - Internal Distribution Only]

Regards,
Hawking
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Friday, December 13, 2019 16:54
To: Zhang, Hawking <[email protected]>; Ma, Le <[email protected]>; Zhou1, Tao <[email protected]>; Deucher, Alexander <[email protected]>; [email protected]
Cc: Chen, Guchun <[email protected]>
Subject: [PATCH] drm/amdgpu: drop useless BACO arg in amdgpu_ras_reset_gpu

BACO reset mode strategy is determined by latter func when calling amdgpu_ras_reset_gpu. So not to confuse audience, drop it.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c  | 2 +-  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c  | 4 ++--  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h  | 3 +--  drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +-  drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c  | 2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c   | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
index 52c27e49bc7b..056c7e7a6040 100644
@@ -641,7 +641,7 @@ int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,
 		kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
 		if (adev->gfx.funcs->query_ras_error_count)
 			adev->gfx.funcs->query_ras_error_count(adev, err_data);
-		amdgpu_ras_reset_gpu(adev, 0);
+		amdgpu_ras_reset_gpu(adev);
 	}
 	return AMDGPU_RAS_SUCCESS;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2 -2
index 3f4ba408aee0..e9f8decfbc69 100644
@@ -1872,7 +1872,7 @@ void amdgpu_ras_resume(struct amdgpu_device *adev)
 		 * See feature_enable_on_boot
 		 */
 		amdgpu_ras_disable_all_features(adev, 1);
-		amdgpu_ras_reset_gpu(adev, 0);
+		amdgpu_ras_reset_gpu(adev);
 	}
 }
 
@@ -1935,6 +1935,6 @@ void amdgpu_ras_global_ras_isr(struct amdgpu_device *adev)
 	if (atomic_cmpxchg(&amdgpu_ras_in_intr, 0, 1) == 0) {
 		DRM_WARN("RAS event of type ERREVENT_ATHUB_INTERRUPT detected!\n");
 
-		amdgpu_ras_reset_gpu(adev, false);
+		amdgpu_ras_reset_gpu(adev);
 	}
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +1 -2
index d4ade4739245..a5fe29a9373e 100644
@@ -494,8 +494,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
 
 int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev);
 
-static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev,
-		bool is_baco)
+static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 {
 	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1 -1
index 6361b2c9ae1a..9bbe819de46a 100644
@@ -160,7 +160,7 @@ int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,
 		struct amdgpu_iv_entry *entry)
 {
 	kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
-	amdgpu_ras_reset_gpu(adev, 0);
+	amdgpu_ras_reset_gpu(adev);
 
 	return AMDGPU_RAS_SUCCESS;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +1 -1
index d4fb9cf27e21..8a6c733d170c 100644
@@ -132,7 +132,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,
 						err_data->err_addr_cnt))
 			DRM_WARN("Failed to add ras bad page!\n");
 
-		amdgpu_ras_reset_gpu(adev, 0);
+		amdgpu_ras_reset_gpu(adev);
 	}
 
 	kfree(err_data->err_addr);
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1 -1
index bb701dbfd472..7091782266b9 100644
@@ -339,7 +339,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
 		/* ras_controller_int is dedicated for nbif ras error,
 		 * not the global interrupt for sync flood
 		 */
-		amdgpu_ras_reset_gpu(adev, true);
+		amdgpu_ras_reset_gpu(adev);
 	}
 }
 

--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx