leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/pm: move pp_force_state_enabled member to amdgpu_pm structure

Browse Source 
As it lables an internal pm state and amdgpu_pm structure is the more
proper place than amdgpu_device structure for it.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Evan Quan 2021-11-15 15:24:05 +08:00 committed by Alex Deucher
parent 84176663e7
commit d698a2c485
3 changed files with 5 additions and 4 deletions
drivers/gpu/drm/amd
amdgpu
amdgpu.h
pm
amdgpu_pm.c
inc
amdgpu_dpm.h

1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
View File

@ -949,7 +949,6 @@ struct amdgpu_device {
/* powerplay */
struct amd_powerplay powerplay;
bool pp_force_state_enabled;
/* smu */
struct smu_context smu;

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

@ -469,7 +469,7 @@ static ssize_t amdgpu_get_pp_force_state(struct device *dev,
if (adev->in_suspend && !adev->in_runpm)
return -EPERM;
if (adev->pp_force_state_enabled)
if (adev->pm.pp_force_state_enabled)
return amdgpu_get_pp_cur_state(dev, attr, buf);
else
return sysfs_emit(buf, "\n");
@ -492,7 +492,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
if (adev->in_suspend && !adev->in_runpm)
return -EPERM;
adev->pp_force_state_enabled = false;
adev->pm.pp_force_state_enabled = false;
if (strlen(buf) == 1)
return count;
@ -523,7 +523,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
if (ret)
goto err_out;
adev->pp_force_state_enabled = true;
adev->pm.pp_force_state_enabled = true;
}
pm_runtime_mark_last_busy(ddev->dev);

2
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
View File

@ -343,6 +343,8 @@ struct amdgpu_pm {
* 0 = disabled (default), otherwise enable corresponding debug mode
*/
uint32_t smu_debug_mask;
bool pp_force_state_enabled;
};
#define R600_SSTU_DFLT 0