[PATCH 12/14] drm/amd: Add struct amdgpu_device argument to amdgpu_reset_create_reset_domain()

[Mario Limonciello]

From: Mario Limonciello <mario.limoncie...@amd.com>

In order to be able to log messages specific to a GPU, add device
argument into the amdgpu_reset_create_reset_domain() function.

Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c  | 3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h  | 3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 68d00e8cdaaf3..04abbc46ef602 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4391,7 +4391,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,
         * (if any) and initialized to use reset sem and in_gpu reset flag
         * early on during init and before calling to RREG32.
         */
-       adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, 
"amdgpu-reset-dev");
+       adev->reset_domain = amdgpu_reset_create_reset_domain(adev, 
SINGLE_DEVICE,
+                                                            
"amdgpu-reset-dev");
        if (!adev->reset_domain)
                return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index dabfbdf6f1ce6..dd98fc292afc8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -271,7 +271,8 @@ void amdgpu_reset_destroy_reset_domain(struct kref *ref)
        kvfree(reset_domain);
 }
 
-struct amdgpu_reset_domain *amdgpu_reset_create_reset_domain(enum 
amdgpu_reset_domain_type type,
+struct amdgpu_reset_domain *amdgpu_reset_create_reset_domain(struct 
amdgpu_device *adev,
+                                                            enum 
amdgpu_reset_domain_type type,
                                                             char *wq_name)
 {
        struct amdgpu_reset_domain *reset_domain;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h
index 4d9b9701139be..36cc1ff3fb386 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h
@@ -114,7 +114,8 @@ int amdgpu_reset_prepare_env(struct amdgpu_device *adev,
 int amdgpu_reset_restore_env(struct amdgpu_device *adev,
                             struct amdgpu_reset_context *reset_context);
 
-struct amdgpu_reset_domain *amdgpu_reset_create_reset_domain(enum 
amdgpu_reset_domain_type type,
+struct amdgpu_reset_domain *amdgpu_reset_create_reset_domain(struct 
amdgpu_device *adev,
+                                                            enum 
amdgpu_reset_domain_type type,
                                                             char *wq_name);
 
 void amdgpu_reset_destroy_reset_domain(struct kref *ref);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 477424472bbee..ee23bc96ec1ce 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -687,7 +687,8 @@ struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct 
amdgpu_device *adev)
         */
                if (adev->reset_domain->type != XGMI_HIVE) {
                        hive->reset_domain =
-                               amdgpu_reset_create_reset_domain(XGMI_HIVE, 
"amdgpu-reset-hive");
+                               amdgpu_reset_create_reset_domain(adev, 
XGMI_HIVE,
+                                                               
"amdgpu-reset-hive");
                        if (!hive->reset_domain) {
                                dev_err(adev->dev, "XGMI: failed initializing 
reset domain for xgmi hive\n");
                                ret = -ENOMEM;
-- 
2.43.0