drm/amdgpu: validate suspend before function call

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

Use the helper function amdgpu_ip_block_suspend 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 c1ff24335a0c5cf930bf07fa6d7a922f2affa19a..07f195a89e9a3ff02df047d2f30d66af79c5a603 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
+++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
@@ -85,16 +85,9 @@ static int aldebaran_mode2_suspend_ip(struct amdgpu_device *adev)
                              AMD_IP_BLOCK_TYPE_SDMA))
                        continue;
 
-               r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
-
-               if (r) {
-                       dev_err(adev->dev,
-                               "suspend of IP block <%s> failed %d\n",
-                               adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-
-               adev->ip_blocks[i].status.hw = false;
        }
 
        return 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 565b0cedd88dbf1fd880ced25eb8dc16ed02458c..9c93d0a47904df4027764930feb18a8eb81c102d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -363,6 +363,7 @@ int amdgpu_device_ip_wait_for_idle(struct amdgpu_device *adev,
                                   enum amd_ip_block_type block_type);
 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);
 
 #define AMDGPU_MAX_IP_NUM 16
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e64b77f065c2a59bf1948777ef9afa40904af7ac..71ee1e43dfe91e838261ee7f527288329684f07d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -272,6 +272,24 @@ void amdgpu_reg_state_sysfs_fini(struct amdgpu_device *adev)
        sysfs_remove_bin_file(&adev->dev->kobj, &bin_attr_reg_state);
 }
 
+int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block)
+{
+       int r;
+
+       if (ip_block->version->funcs->suspend) {
+               r = ip_block->version->funcs->suspend(ip_block);
+               if (r) {
+                       dev_err(ip_block->adev->dev,
+                               "suspend of IP block <%s> failed %d\n",
+                               ip_block->version->funcs->name, r);
+                       return r;
+               }
+       }
+
+       ip_block->status.hw = false;
+       return 0;
+}
+
 /**
  * DOC: board_info
  *
@@ -3473,15 +3491,9 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
                        continue;
 
                /* XXX handle errors */
-               r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
-               /* XXX handle errors */
-               if (r) {
-                       DRM_ERROR("suspend of IP block <%s> failed %d\n",
-                                 adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-
-               adev->ip_blocks[i].status.hw = false;
        }
 
        return 0;
@@ -3555,13 +3567,9 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
                        continue;
 
                /* XXX handle errors */
-               r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
-               /* XXX handle errors */
-               if (r) {
-                       DRM_ERROR("suspend of IP block <%s> failed %d\n",
-                                 adev->ip_blocks[i].version->funcs->name, r);
-               }
+               r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);
                adev->ip_blocks[i].status.hw = false;
+
                /* handle putting the SMC in the appropriate state */
                if (!amdgpu_sriov_vf(adev)) {
                        if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index 3e2724590dbf5b53ecdcdcffeec42ffc7fee4d4d..99e75d899c9f8e0371b9ea78da845e74ac8d16ca 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -28,7 +28,7 @@
 
 static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev)
 {
-       int i, r;
+       int i;
 
        for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
                if (!adev->ip_blocks[i].status.valid)
@@ -40,12 +40,7 @@ static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev)
                        continue;
 
                /* XXX handle errors */
-               r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
-               /* XXX handle errors */
-               if (r) {
-                       dev_err(adev->dev, "suspend of IP block <%s> failed %d",
-                               adev->ip_blocks[i].version->funcs->name, r);
-               }
+               amdgpu_ip_block_suspend(&adev->ip_blocks[i]);
                adev->ip_blocks[i].status.hw = false;
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
index 475b7df3a908927845710aefc91f231b584ba39d..341de4e38eebc927a399d0ef5fdeb1815649570e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
+++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
@@ -81,15 +81,9 @@ static int sienna_cichlid_mode2_suspend_ip(struct amdgpu_device *adev)
                              AMD_IP_BLOCK_TYPE_SDMA))
                        continue;
 
-               r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
-
-               if (r) {
-                       dev_err(adev->dev,
-                               "suspend of IP block <%s> failed %d\n",
-                               adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-               adev->ip_blocks[i].status.hw = false;
        }
 
        return 0;

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 5ea9090b5040aabbe546a2fd8cee023df847f5d4..12e792ca873bf5a318798e288881ab952ce05dca 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
+++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
@@ -80,15 +80,9 @@ static int smu_v13_0_10_mode2_suspend_ip(struct amdgpu_device *adev)
                              AMD_IP_BLOCK_TYPE_MES))
                        continue;
 
-               r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
-
-               if (r) {
-                       dev_err(adev->dev,
-                               "suspend of IP block <%s> failed %d\n",
-                               adev->ip_blocks[i].version->funcs->name, r);
+               r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);
+               if (r)
                        return r;
-               }
-               adev->ip_blocks[i].status.hw = false;
        }
 
        return 0;