github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 04:56:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

amdgpu/pm: handle return value for get_power_limit

Browse Source 
Signed-off-by: Darren Powell <darren.powell@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Darren Powell 2021-05-26 18:47:10 -04:00 committed by Alex Deucher
parent 4f9cbeb317
commit dc2a8240b2
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/gpu/drm/amd/pm/amdgpu_pm.c
View File

@ -2924,13 +2924,16 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,
return r; return r;
} }
if (pp_funcs && pp_funcs->get_power_limit) { if (pp_funcs && pp_funcs->get_power_limit)
pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, r = pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
pp_limit_level, power_type); pp_limit_level, power_type);
else
r = -ENODATA;
if (!r)
size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000); size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
} else { else
size = snprintf(buf, PAGE_SIZE, "\n"); size = snprintf(buf, PAGE_SIZE, "\n");
}
pm_runtime_mark_last_busy(adev_to_drm(adev)->dev); pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
@ -2961,13 +2964,16 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,
return r; return r;
} }
if (pp_funcs && pp_funcs->get_power_limit) { if (pp_funcs && pp_funcs->get_power_limit)
pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, r = pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
pp_limit_level, power_type); pp_limit_level, power_type);
else
r = -ENODATA;
if (!r)
size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000); size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
} else { else
size = snprintf(buf, PAGE_SIZE, "\n"); size = snprintf(buf, PAGE_SIZE, "\n");
}
pm_runtime_mark_last_busy(adev_to_drm(adev)->dev); pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
@ -2998,13 +3004,16 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev,
return r; return r;
} }
if (pp_funcs && pp_funcs->get_power_limit) { if (pp_funcs && pp_funcs->get_power_limit)
pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, r = pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit,
pp_limit_level, power_type); pp_limit_level, power_type);
else
r = -ENODATA;
if (!r)
size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000); size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
} else { else
size = snprintf(buf, PAGE_SIZE, "\n"); size = snprintf(buf, PAGE_SIZE, "\n");
}
pm_runtime_mark_last_busy(adev_to_drm(adev)->dev); pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);