[PATCH 5/6] amdgpu/pm: handle return value for get_power_limit

[Darren Powell]

Signed-off-by: Darren Powell <darren.pow...@amd.com>
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c | 39 ++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c 
b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 44715848705a..aa138abe6e1d 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -2734,13 +2734,16 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct 
device *dev,
                return r;
        }
 
-       if (pp_funcs && pp_funcs->get_power_limit) {
-               pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
-                                         pp_limit_level, sample_window);
+       if (pp_funcs && pp_funcs->get_power_limit)
+               r = pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
+                                             pp_limit_level, sample_window);
+       else
+               r = -ENODATA;
+
+       if (!r)
                size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
-       } else {
+       else
                size = snprintf(buf, PAGE_SIZE, "\n");
-       }
 
        pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
        pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
@@ -2771,13 +2774,16 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct 
device *dev,
                return r;
        }
 
-       if (pp_funcs && pp_funcs->get_power_limit) {
-               pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
-                                         pp_limit_level, sample_window);
+       if (pp_funcs && pp_funcs->get_power_limit)
+               r = pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
+                                             pp_limit_level, sample_window);
+       else
+               r = -ENODATA;
+
+       if (!r)
                size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
-       } else {
+       else
                size = snprintf(buf, PAGE_SIZE, "\n");
-       }
 
        pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
        pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
@@ -2808,13 +2814,16 @@ static ssize_t 
amdgpu_hwmon_show_power_cap_default(struct device *dev,
                return r;
        }
 
-       if (pp_funcs && pp_funcs->get_power_limit) {
-               pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
-                                         pp_limit_level, sample_window);
+       if (pp_funcs && pp_funcs->get_power_limit)
+               r = pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
+                                             pp_limit_level, sample_window);
+       else
+               r = -ENODATA;
+
+       if (!r)
                size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
-       } else {
+       else
                size = snprintf(buf, PAGE_SIZE, "\n");
-       }
 
        pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
        pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
-- 
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx