Commit d698a2c4 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

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



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: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 84176663

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -949,7 +949,6 @@ struct amdgpu_device { 


	/* powerplay */

	struct amd_powerplay		powerplay;

	bool				pp_force_state_enabled;



	/* smu */

	struct smu_context		smu;

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h

+2 −0
Original line number Diff line number Diff line
@@ -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