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

drm/amdgpu/powerplay: pp module only enable smu when dpm disabled. 



Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent acd546b9

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

+3 −3
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ static int amdgpu_pp_sw_init(void *handle) 
		ret = adev->powerplay.ip_funcs->sw_init(

					adev->powerplay.pp_handle);



	if (adev->pp_enabled)

		adev->pm.dpm_enabled = true;



	return ret;

}
@@ -187,6 +184,9 @@ static int amdgpu_pp_hw_init(void *handle) 
		ret = adev->powerplay.ip_funcs->hw_init(

					adev->powerplay.pp_handle);



	if (amdgpu_dpm != 0)

		adev->pm.dpm_enabled = true;



	return ret;

}

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+39 −12
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define PP_CHECK_HW(hwmgr)						\

	do {								\

		if ((hwmgr) == NULL || (hwmgr)->hwmgr_func == NULL)	\

			return -EINVAL;					\

			return 0;					\

	} while (0)



static int pp_early_init(void *handle)
@@ -115,6 +115,7 @@ static int pp_hw_init(void *handle) 
	struct pp_instance *pp_handle;

	struct pp_smumgr *smumgr;

	struct pp_eventmgr *eventmgr;

	struct pp_hwmgr  *hwmgr;

	int ret = 0;



	if (handle == NULL)
@@ -122,6 +123,7 @@ static int pp_hw_init(void *handle) 


	pp_handle = (struct pp_instance *)handle;

	smumgr = pp_handle->smu_mgr;

	hwmgr = pp_handle->hwmgr;



	if (smumgr == NULL || smumgr->smumgr_funcs == NULL ||

		smumgr->smumgr_funcs->smu_init == NULL ||
@@ -141,9 +143,11 @@ static int pp_hw_init(void *handle) 
		return ret;

	}



	hw_init_power_state_table(pp_handle->hwmgr);

	eventmgr = pp_handle->eventmgr;

	PP_CHECK_HW(hwmgr);



	hw_init_power_state_table(hwmgr);



	eventmgr = pp_handle->eventmgr;

	if (eventmgr == NULL || eventmgr->pp_eventmgr_init == NULL)

		return -EINVAL;
@@ -243,6 +247,8 @@ static int pp_suspend(void *handle) 


	pp_handle = (struct pp_instance *)handle;

	eventmgr = pp_handle->eventmgr;



	if (eventmgr != NULL)

		pem_handle_event(eventmgr, AMD_PP_EVENT_SUSPEND, &event_data);

	return 0;

}
@@ -273,6 +279,7 @@ static int pp_resume(void *handle) 
	}



	eventmgr = pp_handle->eventmgr;

	if (eventmgr != NULL)

		pem_handle_event(eventmgr, AMD_PP_EVENT_RESUME, &event_data);



	return 0;
@@ -340,8 +347,7 @@ static enum amd_dpm_forced_level pp_dpm_get_performance_level( 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	if (hwmgr == NULL)

		return -EINVAL;

	PP_CHECK_HW(hwmgr);



	return (((struct pp_instance *)handle)->hwmgr->dpm_level);

}
@@ -448,6 +454,9 @@ static int pp_dpm_dispatch_tasks(void *handle, enum amd_pp_event event_id, 
	if (pp_handle == NULL)

		return -EINVAL;



	if (pp_handle->eventmgr == NULL)

		return 0;



	switch (event_id) {

	case AMD_PP_EVENT_DISPLAY_CONFIG_CHANGE:

		ret = pem_handle_event(pp_handle->eventmgr, event_id, &data);
@@ -899,6 +908,12 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init, 
	if (ret)

		goto fail_smum;





	amd_pp->pp_handle = handle;



	if (amdgpu_dpm == 0)

		return 0;



	ret = hwmgr_init(pp_init, handle);

	if (ret)

		goto fail_hwmgr;
@@ -907,7 +922,6 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init, 
	if (ret)

		goto fail_eventmgr;



	amd_pp->pp_handle = handle;

	return 0;



fail_eventmgr:
@@ -926,12 +940,12 @@ static int amd_pp_instance_fini(void *handle) 
	if (instance == NULL)

		return -EINVAL;



	if (amdgpu_dpm != 0) {

		eventmgr_fini(instance->eventmgr);



		hwmgr_fini(instance->hwmgr);

	}



	smum_fini(instance->smu_mgr);



	kfree(handle);

	return 0;

}
@@ -990,6 +1004,9 @@ int amd_powerplay_reset(void *handle) 


	hw_init_power_state_table(instance->hwmgr);



	if (amdgpu_dpm == 0)

		return 0;



	if (eventmgr == NULL || eventmgr->pp_eventmgr_init == NULL)

		return -EINVAL;
@@ -1011,6 +1028,8 @@ int amd_powerplay_display_configuration_change(void *handle, 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	PP_CHECK_HW(hwmgr);



	phm_store_dal_configuration_data(hwmgr, display_config);



	return 0;
@@ -1028,6 +1047,8 @@ int amd_powerplay_get_display_power_level(void *handle, 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	PP_CHECK_HW(hwmgr);



	return phm_get_dal_power_level(hwmgr, output);

}
@@ -1045,6 +1066,8 @@ int amd_powerplay_get_current_clocks(void *handle, 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	PP_CHECK_HW(hwmgr);



	phm_get_dal_power_level(hwmgr, &simple_clocks);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PowerContainment)) {
@@ -1089,6 +1112,8 @@ int amd_powerplay_get_clock_by_type(void *handle, enum amd_pp_clock_type type, s 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	PP_CHECK_HW(hwmgr);



	result = phm_get_clock_by_type(hwmgr, type, clocks);



	return result;
@@ -1107,6 +1132,8 @@ int amd_powerplay_get_display_mode_validation_clocks(void *handle, 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	PP_CHECK_HW(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_DynamicPatchPowerState))

		result = phm_get_max_high_clocks(hwmgr, clocks);

drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include "amd_shared.h"

#include "cgs_common.h"



extern int amdgpu_dpm;



enum amd_pp_sensors {

	AMDGPU_PP_SENSOR_GFX_SCLK = 0,

	AMDGPU_PP_SENSOR_VDDNB,

CRA Git | Maintained and supported by SUSTech CRA and CCSE