drm/amdgpu: Disable DPM in virtualization
Subsystems (2)
PATCH v2 1/1 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.")
Change in V2, according to Christian's suggestion,
This patch will not mess with module parameters amdgpu_dpm, but make that a dependency for when amdgpu_dpm is evaluated.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +1 -1
@@ -184,7 +184,7 @@ static int amdgpu_pp_hw_init(void *handle) ret = adev->powerplay.ip_funcs->hw_init ( adev->powerplay.pp_handle); -if (amdgpu_dpm !=0 ) +if ((amdgpu_dpm !=0 ) && !amdgpu_sriov_vf (adev)) adev->pm.dpm_enabled = true;return ret;
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +6 -3
@@ -911,7 +911,8 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init, amd_pp->pp_handle = handle; -if (amdgpu_dpm ==0 ) +if ((amdgpu_dpm ==0 ) + ||cgs_is_virtualization_enabled (pp_init->device))return 0 ; ret =hwmgr_init (pp_init, handle);
@@ -940,7 +941,8 @@ static int amd_pp_instance_fini(void *handle)if (instance ==NULL )return -EINVAL ; -if (amdgpu_dpm !=0 ) { +if ((amdgpu_dpm !=0 ) + && !cgs_is_virtualization_enabled (instance->smu_mgr->device)) {eventmgr_fini (instance->eventmgr);hwmgr_fini (instance->hwmgr); }
@@ -1004,7 +1006,8 @@ int amd_powerplay_reset(void *handle)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 ;if (eventmgr ==NULL || eventmgr->pp_eventmgr_init ==NULL )
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479362340-6222-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 17.11.2016 um 06:59 schrieb Trigger Huang:
Quoted 10 lines
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.")Change in V2, according to Christian's suggestion,
This patch will not mess with module parametersamdgpu_dpm, but make that a dependency for whenamdgpu_dpmis evaluated.Signed-off-by Trigger Huang <[email protected]>
Quoted 43 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +1
-1@@ -184,7 +184,7 @@ static int amdgpu_pp_hw_init(void *handle) ret = adev->powerplay.ip_funcs->hw_init ( adev->powerplay.pp_handle); -if (amdgpu_dpm !=0 ) +if ((amdgpu_dpm !=0 ) && !amdgpu_sriov_vf (adev)) adev->pm.dpm_enabled = true;return ret;drivers/gpu/drm/amd/powerplay/amd_powerplay.c +4
-2@@ -911,7 +911,8 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init, amd_pp->pp_handle = handle; -if (amdgpu_dpm ==0 ) +if ((amdgpu_dpm ==0 ) + ||cgs_is_virtualization_enabled (pp_init->device))return 0 ; ret =hwmgr_init (pp_init, handle);@@ -940,7 +941,8 @@ static int amd_pp_instance_fini(void *handle)if (instance ==NULL )return -EINVAL ; -if (amdgpu_dpm !=0 ) { +if ((amdgpu_dpm !=0 ) + && !cgs_is_virtualization_enabled (instance->smu_mgr->device)) {eventmgr_fini (instance->eventmgr);hwmgr_fini (instance->hwmgr); }
drivers/gpu/drm/amd/powerplay/amd_powerplay.c int amd_powerplay_reset(void *handle) · line 1013
Quoted 9 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-1@@ -1004,7 +1006,8 @@ int amd_powerplay_reset(void *handle)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 ;if (eventmgr ==NULL || eventmgr->pp_eventmgr_init ==NULL )
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 14 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Trigger Huang
Sent: Thursday, November 17, 2016 12:59 AM
To: [email protected]
Cc: Huang, Trigger
Subject: [PATCH v2] drm/amdgpu: Disable DPM in virtualizationThis 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.")
Quoted 5 lines
Change in V2, according to Christian's suggestion,
This patch will not mess with module parametersamdgpu_dpm, but make that a dependency for whenamdgpu_dpmis evaluated.Signed-off-by Trigger Huang <[email protected]>
Quoted 60 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +1
-1@@ -184,7 +184,7 @@ static int amdgpu_pp_hw_init(void *handle) ret = adev->powerplay.ip_funcs->hw_init ( adev->powerplay.pp_handle); -if (amdgpu_dpm !=0 ) +if ((amdgpu_dpm !=0 ) && !amdgpu_sriov_vf (adev)) adev->pm.dpm_enabled = true;return ret;drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-1@@ -911,7 +911,8 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init, amd_pp->pp_handle = handle; -if (amdgpu_dpm ==0 ) +if ((amdgpu_dpm ==0 ) + ||cgs_is_virtualization_enabled (pp_init->device))return 0 ;drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-1ret =hwmgr_init (pp_init, handle);@@ -940,7 +941,8 @@ static int amd_pp_instance_fini(void *handle)if (instance ==NULL )return -EINVAL ; -if (amdgpu_dpm !=0 ) { +if ((amdgpu_dpm !=0 ) + && !cgs_is_virtualization_enabled (instance->smu_mgr- >device)) {eventmgr_fini (instance->eventmgr);hwmgr_fini (instance->hwmgr);drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-1}@@ -1004,7 +1006,8 @@ int amd_powerplay_reset(void *handle)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 ;if (eventmgr == NULL ||
eventmgr->pp_eventmgr_init== NULL)
--
2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx