drm/amdgpu: no need to ungate uvd/vce clock when fini.
Subsystems (2)
PATCH 1/2 drm/amdgpu: no need to ungate uvd/vce clock when fini.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13 -7
@@ -1471,20 +1471,26 @@ static int amdgpu_fini(struct amdgpu_device *adev)amdgpu_wb_fini (adev);amdgpu_vram_scratch_fini (adev); } -/* ungate blocks before hw fini so that we can shutdown the blocks safely */ - r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, -AMD_CG_STATE_UNGATE ); -if (r) { -DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , - adev->ip_blocks[i].version->funcs->name, r); -return r; + +if (adev->ip_blocks[i].version->type !=AMD_IP_BLOCK_TYPE_UVD && + adev->ip_blocks[i].version->type !=AMD_IP_BLOCK_TYPE_VCE ) { +/* ungate blocks before hw fini so that we can shutdown the blocks safely */ + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, +AMD_CG_STATE_UNGATE ); +if (r) { +DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r); +return r; + } } + r = adev->ip_blocks[i].version->funcs->hw_fini ((void *)adev);/* XXX handle errors */ if (r) {DRM_DEBUG ("hw_fini of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs->name, r); } + adev->ip_blocks[i].status.hw = false; }
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1480418647-1922-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amd/powerplay: disable cg pg task when pp uninitialize.
fix bug on uvd pg enabled, when reboot vm in pass through case, we need to notify smu power up uvd/vce if they were power down. otherwise, the vbios post will fail.
--- drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 13 +++++++++++++ drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +1 -1
@@ -154,7 +154,7 @@ int pem_task_powerdown_vce_tasks(struct pp_eventmgr *eventmgr, struct pem_event_int pem_task_disable_clock_power_gatings_tasks (struct pp_eventmgr *eventmgr,struct pem_event_data *event_data) { -/* TODO */ +phm_disable_clock_power_gatings (eventmgr->hwmgr);return 0 ; }
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +13 -0
@@ -209,6 +209,19 @@ int phm_enable_clock_power_gatings(struct pp_hwmgr *hwmgr)return 0 ; } +int phm_disable_clock_power_gatings (struct pp_hwmgr *hwmgr) +{ +PHM_FUNC_CHECK (hwmgr); + +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_TablelessHardwareInterface)) { +if (NULL != hwmgr->hwmgr_func->disable_clock_power_gating) +return hwmgr->hwmgr_func->disable_clock_power_gating (hwmgr); + } +return 0 ; +} + +int phm_display_configuration_changed (struct pp_hwmgr *hwmgr) {PHM_FUNC_CHECK (hwmgr);
drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +1 -0
@@ -334,6 +334,7 @@ struct phm_clocks {uint32_t clock[MAX_NUM_CLOCKS ]; }; +extern int phm_disable_clock_power_gatings (struct pp_hwmgr *hwmgr);extern int phm_enable_clock_power_gatings (struct pp_hwmgr *hwmgr);extern int phm_powergate_uvd (struct pp_hwmgr *hwmgr,bool gate);extern int phm_powergate_vce (struct pp_hwmgr *hwmgr,bool gate);
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1480418647-1922-2-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 2/2] drm/amd/powerplay: disable cg pg task when pp uninitialize.
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Tuesday, November 29, 2016 6:24 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 2/2] drm/amd/powerplay: disable cg pg task when pp uninitialize.
Quoted 6 lines
fix bug on uvd pg enabled, when reboot vm in pass through case, we need to notify smu power up uvd/vce if they were power down. otherwise, the vbios post will fail.
Change-Id I5df801ab0f6105be550fbbbd98dbf8329357784aSigned-off-by Rex Zhu <[email protected]>
For the series:
Quoted 67 lines
--- drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 13 +++++++++++++ drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +0
-0@@ -154,7 +154,7 @@ int pem_task_powerdown_vce_tasks(struct
pp_eventmgr*eventmgr, structpem_event_int pem_task_disable_clock_power_gatings_tasks(struct
pp_eventmgr
*eventmgr, structpem_event_data*event_data)
{drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +1
-1-/* TODO */ +phm_disable_clock_power_gatings (eventmgr->hwmgr);return 0 ; }drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +13
-0@@ -209,6 +209,19 @@ int phm_enable_clock_power_gatings(struct pp_hwmgr *hwmgr)return 0 ; } +int phm_disable_clock_power_gatings (struct pp_hwmgr *hwmgr) +{ +PHM_FUNC_CHECK (hwmgr); + +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_TablelessHardwareInterface)) { +if (NULL != hwmgr->hwmgr_func- >disable_clock_power_gating) +return hwmgr->hwmgr_func- >disable_clock_power_gating(hwmgr); + } +return 0 ; +} + +int
phm_display_configuration_changed(struct pp_hwmgr *hwmgr){drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +0
-0PHM_FUNC_CHECK (hwmgr);drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +1
-1@@ -334,6 +334,7 @@ struct phm_clocks {uint32_t clock[MAX_NUM_CLOCKS ]; }; +extern int phm_disable_clock_power_gatings (struct pp_hwmgr *hwmgr);extern int phm_enable_clock_power_gatings (struct pp_hwmgr *hwmgr);extern int phm_powergate_uvd (struct pp_hwmgr *hwmgr,bool gate);extern int phm_powergate_vce (struct pp_hwmgr *hwmgr,bool gate); --1.9.1
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