From: Lijo Lazar Date: Tue, 4 Feb 2025 06:32:41 +0000 (+0530) Subject: drm/amd/pm: Remove unnecessary device state checks X-Git-Tag: v6.15-rc1~120^2~17^2~113 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a53cbd9e6f520a252ecce31f8b555203674a3413;p=thirdparty%2Fkernel%2Flinux.git drm/amd/pm: Remove unnecessary device state checks For amdgpu_get_pp_force_state, amdgpu_get_pp_cur_state already takes care of device state check. In other cases, values are returned from driver cached variables and are not dependent on device state. Signed-off-by: Lijo Lazar Reviewed-by: Feifei Xu Reviewed-by: Asad Kamal Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c index e4ab28785bd0f..1d04f1b79dede 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -475,11 +475,6 @@ static ssize_t amdgpu_get_pp_force_state(struct device *dev, { struct drm_device *ddev = dev_get_drvdata(dev); struct amdgpu_device *adev = drm_to_adev(ddev); - int ret; - - ret = amdgpu_pm_dev_state_check(adev, true); - if (ret) - return ret; if (adev->pm.pp_force_state_enabled) return amdgpu_get_pp_cur_state(dev, attr, buf); @@ -1568,11 +1563,7 @@ static ssize_t amdgpu_get_unique_id(struct device *dev, { struct drm_device *ddev = dev_get_drvdata(dev); struct amdgpu_device *adev = drm_to_adev(ddev); - int r; - r = amdgpu_pm_dev_state_check(adev, true); - if (r) - return r; if (adev->unique_id) return sysfs_emit(buf, "%016llx\n", adev->unique_id); @@ -2153,15 +2144,10 @@ static ssize_t amdgpu_get_pm_policy_attr(struct device *dev, struct drm_device *ddev = dev_get_drvdata(dev); struct amdgpu_device *adev = drm_to_adev(ddev); struct amdgpu_pm_policy_attr *policy_attr; - int r; policy_attr = container_of(attr, struct amdgpu_pm_policy_attr, dev_attr); - r = amdgpu_pm_dev_state_check(adev, true); - if (r) - return r; - return amdgpu_dpm_get_pm_policy_info(adev, policy_attr->id, buf); }