Commit 7b1e8cad authored by Trigger Huang's avatar Trigger Huang Committed by Alex Deucher
Browse files

drm/amdgpu: Disable DPM in virtualization 



This patch is used for virtualization support. In virtualization,
only SMU manager is needed, DPM should be disabled. This is a
use case for commit 2f9346b6f984
("drm/amdgpu/powerplay: pp module only enable smu when dpm disabled.")

Signed-off-by: default avatarTrigger Huang <trigger.huang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 617859e0

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ static int amdgpu_pp_hw_init(void *handle) 
		ret = adev->powerplay.ip_funcs->hw_init(

		ret = adev->powerplay.ip_funcs->hw_init(

					adev->powerplay.pp_handle);

					adev->powerplay.pp_handle);





	if (amdgpu_dpm != 0)

	if ((amdgpu_dpm != 0) && !amdgpu_sriov_vf(adev))

		adev->pm.dpm_enabled = true;

		adev->pm.dpm_enabled = true;





	return ret;

	return ret;

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -911,7 +911,8 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init, 




	amd_pp->pp_handle = handle;

	amd_pp->pp_handle = handle;





	if (amdgpu_dpm == 0)

	if ((amdgpu_dpm == 0)

		|| cgs_is_virtualization_enabled(pp_init->device))

		return 0;

		return 0;





	ret = hwmgr_init(pp_init, handle);

	ret = hwmgr_init(pp_init, handle);
@@ -940,7 +941,8 @@ static int amd_pp_instance_fini(void *handle) 
	if (instance == NULL)

	if (instance == NULL)

		return -EINVAL;

		return -EINVAL;





	if (amdgpu_dpm != 0) {

	if ((amdgpu_dpm != 0)

		&& !cgs_is_virtualization_enabled(instance->smu_mgr->device)) {

		eventmgr_fini(instance->eventmgr);

		eventmgr_fini(instance->eventmgr);

		hwmgr_fini(instance->hwmgr);

		hwmgr_fini(instance->hwmgr);

	}

	}
@@ -1004,7 +1006,8 @@ int amd_powerplay_reset(void *handle) 




	hw_init_power_state_table(instance->hwmgr);

	hw_init_power_state_table(instance->hwmgr);





	if (amdgpu_dpm == 0)

	if ((amdgpu_dpm == 0)

		|| cgs_is_virtualization_enabled(instance->smu_mgr->device))

		return 0;

		return 0;





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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE