Commit 66ba1afd authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: save number of vce states in dpm struct. 



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0d8de7ca

drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c

+4 −3
Original line number Diff line number Diff line
@@ -553,9 +553,10 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) 
				entry = (ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record *)

					((u8 *)entry + sizeof(ATOM_PPLIB_VCE_Clock_Voltage_Limit_Record));

			}

			for (i = 0; i < states->numEntries; i++) {

				if (i >= AMD_MAX_VCE_LEVELS)

					break;

			adev->pm.dpm.num_of_vce_states =

					states->numEntries > AMD_MAX_VCE_LEVELS ?

					AMD_MAX_VCE_LEVELS : states->numEntries;

			for (i = 0; i < adev->pm.dpm.num_of_vce_states; i++) {

				vce_clk = (VCEClockInfo *)

					((u8 *)&array->entries[0] +

					 (state_entry->ucVCEClockInfoIndex * sizeof(VCEClockInfo)));

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

+1 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ struct amdgpu_dpm { 
	/* default uvd power state */

	struct amdgpu_ps        *uvd_ps;

	/* vce requirements */

	u32                  num_of_vce_states;

	struct amd_vce_state vce_states[AMD_MAX_VCE_LEVELS];

	enum amd_vce_level vce_level;

	enum amd_pm_state_type state;

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -5689,7 +5689,7 @@ static int ci_parse_power_table(struct amdgpu_device *adev) 
	adev->pm.dpm.num_ps = state_array->ucNumEntries;



	/* fill in the vce power states */

	for (i = 0; i < AMD_MAX_VCE_LEVELS; i++) {

	for (i = 0; i < adev->pm.dpm.num_of_vce_states; i++) {

		u32 sclk, mclk;

		clock_array_index = adev->pm.dpm.vce_states[i].clk_idx;

		clock_info = (union pplib_clock_info *)

drivers/gpu/drm/amd/amdgpu/kv_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ static int kv_parse_power_table(struct amdgpu_device *adev) 
	adev->pm.dpm.num_ps = state_array->ucNumEntries;



	/* fill in the vce power states */

	for (i = 0; i < AMD_MAX_VCE_LEVELS; i++) {

	for (i = 0; i < adev->pm.dpm.num_of_vce_states; i++) {

		u32 sclk;

		clock_array_index = adev->pm.dpm.vce_states[i].clk_idx;

		clock_info = (union pplib_clock_info *)

drivers/gpu/drm/amd/amdgpu/si_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -7320,7 +7320,7 @@ static int si_parse_power_table(struct amdgpu_device *adev) 
	adev->pm.dpm.num_ps = state_array->ucNumEntries;



	/* fill in the vce power states */

	for (i = 0; i < AMD_MAX_VCE_LEVELS; i++) {

	for (i = 0; i < adev->pm.dpm.num_of_vce_states; i++) {

		u32 sclk, mclk;

		clock_array_index = adev->pm.dpm.vce_states[i].clk_idx;

		clock_info = (union pplib_clock_info *)

CRA Git | Maintained and supported by SUSTech CRA and CCSE