drm/amdgpu: validate resume before function call

Before making a function call to resume, validate
the function pointer like we do in sw_init.

Use the helper function amdgpu_ip_block_resume where
same checks and calls are repeated.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
index 07f195a89e9a3ff02df047d2f30d66af79c5a603..3a588fecb0c58362e149a556ea22ae95db3bc03d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
+++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
@@ -239,7 +239,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)
                dev_err(adev->dev, "Failed to get BIF handle\n");
                return -EINVAL;
        }
-       r = cmn_block->version->funcs->resume(cmn_block);
+       r = amdgpu_ip_block_resume(cmn_block);
        if (r)
                return r;
 
@@ -275,15 +275,10 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)
                      adev->ip_blocks[i].version->type ==
                              AMD_IP_BLOCK_TYPE_SDMA))
                        continue;
-               r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-               if (r) {
-                       dev_err(adev->dev,
-                               "resume of IP block <%s> failed %d\n",
-                               adev->ip_blocks[i].version->funcs->name, r);
-                       return r;
-               }
 
-               adev->ip_blocks[i].status.hw = true;
+               r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+               if (r)
+                       return r;
        }
 
        for (i = 0; i < adev->num_ip_blocks; i++) {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 9c93d0a47904df4027764930feb18a8eb81c102d..3af5acff8518fe4deeea662a163b91c37d1d2f10 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -365,6 +365,8 @@ bool amdgpu_device_ip_is_valid(struct amdgpu_device *adev,
                              enum amd_ip_block_type block_type);
 int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block);
 
+int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block);
+
 #define AMDGPU_MAX_IP_NUM 16
 
 struct amdgpu_ip_block_status {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 71ee1e43dfe91e838261ee7f527288329684f07d..754beece58400c3e2c14b83d110b678b6a85b153 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -290,6 +290,24 @@ int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block)
        return 0;
 }
 
+int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block)
+{
+       int r;
+
+       if (ip_block->version->funcs->resume) {
+               r = ip_block->version->funcs->resume(ip_block);
+               if (r) {
+                       dev_err(ip_block->adev->dev,
+                               "resume of IP block <%s> failed %d\n",
+                               ip_block->version->funcs->name, r);
+                       return r;
+               }
+       }
+
+       ip_block->status.hw = true;
+       return 0;
+}
+
 /**
  * DOC: board_info
  *
@@ -2762,12 +2780,9 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)
                                break;
 
                        if (amdgpu_in_reset(adev) || adev->in_suspend) {
-                               r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-                               if (r) {
-                                       DRM_ERROR("resume of IP block <%s> failed %d\n",
-                                                         adev->ip_blocks[i].version->funcs->name, r);
+                               r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+                               if (r)
                                        return r;
-                               }
                        } else {
                                r = adev->ip_blocks[i].version->funcs->hw_init(&adev->ip_blocks[i]);
                                if (r) {
@@ -2775,9 +2790,8 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)
                                                          adev->ip_blocks[i].version->funcs->name, r);
                                        return r;
                                }
+                               adev->ip_blocks[i].status.hw = true;
                        }
-
-                       adev->ip_blocks[i].status.hw = true;
                        break;
                }
        }
@@ -3682,15 +3696,19 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev)
                                block->status.hw)
                                continue;
 
-                       if (block->version->type == AMD_IP_BLOCK_TYPE_SMC)
-                               r = block->version->funcs->resume(&adev->ip_blocks[i]);
-                       else
+                       if (block->version->type == AMD_IP_BLOCK_TYPE_SMC) {
+                               r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+                               if (r)
+                                       return r;
+                       } else {
                                r = block->version->funcs->hw_init(&adev->ip_blocks[i]);
-
-                       DRM_INFO("RE-INIT-late: %s %s\n", block->version->funcs->name, r?"failed":"succeeded");
-                       if (r)
-                               return r;
-                       block->status.hw = true;
+                               if (r) {
+                                       DRM_ERROR("hw_init of IP block <%s> failed %d\n",
+                                                 adev->ip_blocks[i].version->funcs->name, r);
+                                       return r;
+                               }
+                               block->status.hw = true;
+                       }
                }
        }
 
@@ -3721,13 +3739,9 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev)
                    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||
                    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP && amdgpu_sriov_vf(adev))) {
 
-                       r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-                       if (r) {
-                               DRM_ERROR("resume of IP block <%s> failed %d\n",
-                                         adev->ip_blocks[i].version->funcs->name, r);
+                       r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+                       if (r)
                                return r;
-                       }
-                       adev->ip_blocks[i].status.hw = true;
                }
        }
 
@@ -3759,13 +3773,9 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)
                    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||
                    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP)
                        continue;
-               r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-               if (r) {
-                       DRM_ERROR("resume of IP block <%s> failed %d\n",
-                                 adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-               adev->ip_blocks[i].status.hw = true;
        }
 
        return 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
index 341de4e38eebc927a399d0ef5fdeb1815649570e..9b01e074af471e14790416eb56dce53edace03c1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
+++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
@@ -169,15 +169,9 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->num_ip_blocks; i++) {
                if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) {
-                       r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-                       if (r) {
-                               dev_err(adev->dev,
-                                       "resume of IP block <%s> failed %d\n",
-                                       adev->ip_blocks[i].version->funcs->name, r);
+                       r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+                       if (r)
                                return r;
-                       }
-
-                       adev->ip_blocks[i].status.hw = true;
                }
        }
 
@@ -187,15 +181,9 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev)
                      adev->ip_blocks[i].version->type ==
                              AMD_IP_BLOCK_TYPE_SDMA))
                        continue;
-               r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-               if (r) {
-                       dev_err(adev->dev,
-                               "resume of IP block <%s> failed %d\n",
-                               adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-
-               adev->ip_blocks[i].status.hw = true;
        }
 
        for (i = 0; i < adev->num_ip_blocks; i++) {

diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
index 12e792ca873bf5a318798e288881ab952ce05dca..e70ebad3f9fac499406deffa23bd66761cd7d001 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
+++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
@@ -180,15 +180,9 @@ static int smu_v13_0_10_mode2_restore_ip(struct amdgpu_device *adev)
                      adev->ip_blocks[i].version->type ==
                              AMD_IP_BLOCK_TYPE_SDMA))
                        continue;
-               r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
-               if (r) {
-                       dev_err(adev->dev,
-                               "resume of IP block <%s> failed %d\n",
-                               adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-
-               adev->ip_blocks[i].status.hw = true;
        }
 
        for (i = 0; i < adev->num_ip_blocks; i++) {