drm/amdgpu: Add amdgpu_gfx_off_ctrl function
Subsystems (2)
PATCH v2 1/4 drm/amdgpu: Add amdgpu_gfx_off_ctrl function
v2:
1. drop the special handling for the hw IP suggested by hawking and Christian.
2. refine the variable name suggested by Flora.
This funciton as the entry of gfx off ctrl feature. we arbitrat gfx off feature enable/disable in this function.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 36 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +5 -0
@@ -988,6 +988,10 @@ struct amdgpu_gfx {/* NGG */ struct amdgpu_ngg ngg; +/* gfx off */ +bool gfx_off_state;/* true: enabled, false: disabled */ +struct mutex gfx_off_mutex; +uint32_t gfx_off_req_count;/* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ /* pipe reservation */ struct mutex pipe_reserve_mutex;DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES );
@@ -1815,6 +1819,7 @@ void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, const u32 array_size);bool amdgpu_device_is_px (struct drm_device *dev); +void amdgpu_gfx_off_ctrl (struct amdgpu_device *adev,bool enable);/* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO )void amdgpu_register_atpx_handler (void );
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -0
@@ -2367,6 +2367,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,mutex_init (&adev->gfx.gpu_clock_mutex);mutex_init (&adev->srbm_mutex);mutex_init (&adev->gfx.pipe_reserve_mutex); +mutex_init (&adev->gfx.gfx_off_mutex);mutex_init (&adev->grbm_idx_mutex);mutex_init (&adev->mn_lock);mutex_init (&adev->virt.vf_errors.lock);
@@ -2394,6 +2395,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); + adev->gfx.gfx_off_req_count =1 ; adev->pm.ac_power =power_supply_is_system_supplied () >0 ? true : false;/* Registers mapping */
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +36 -0
@@ -340,3 +340,39 @@ void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev) &ring->mqd_gpu_addr, &ring->mqd_ptr); } + +/* amdgpu_gfx_off_ctrl - Handle gfx off feature enable/disable +* +* @adev: amdgpu_device pointer +* @bool enable true: enable gfx off feature, false: disable gfx off feature +* +* 1. gfx off feature will be enabled by gfx ip after gfx cg gp enabled. +* 2. other client can send request to disable gfx off feature, the request should be honored. +* 3. other client can cancel their request of disable gfx off feature +* 4. other client should not send request to enable gfx off feature before disable gfx off feature. +*/ + +void amdgpu_gfx_off_ctrl (struct amdgpu_device *adev,bool enable) +{ +if (!(adev->powerplay.pp_feature &PP_GFXOFF_MASK )) +return ; + +if (!adev->powerplay.pp_funcs->set_powergating_by_smu) +return ; + +mutex_lock (&adev->gfx.gfx_off_mutex); + +if (!enable) + adev->gfx.gfx_off_req_count++; +else if (adev->gfx.gfx_off_req_count >0 ) + adev->gfx.gfx_off_req_count--; + +if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + }else if (!enable && adev->gfx.gfx_off_state) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false)) + adev->gfx.gfx_off_state = false; + } +mutex_unlock (&adev->gfx.gfx_off_mutex); +}
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): 1532942625-26876-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH v2 2/4 drm/amdgpu: Put enable gfx off feature to a delay thread
delay to enable gfx off feature to avoid gfx on/off frequently suggested by Alex and Evan.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 ++++++-- 3 files changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -992,6 +992,8 @@ struct amdgpu_gfx {bool gfx_off_state;/* true: enabled, false: disabled */ struct mutex gfx_off_mutex;uint32_t gfx_off_req_count;/* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ +struct delayed_work gfx_off_delay_work; +/* pipe reservation */ struct mutex pipe_reserve_mutex;DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES );
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +15 -0
@@ -1925,6 +1925,19 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)DRM_ERROR ("ib ring test failed (%d).\n" , r); } +static void amdgpu_device_delay_enable_gfx_off (struct work_struct *work) +{ +struct amdgpu_device *adev = + container_of(work, struct amdgpu_device, gfx.gfx_off_delay_work.work); + +mutex_lock (&adev->gfx.gfx_off_mutex); +if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + } +mutex_unlock (&adev->gfx.gfx_off_mutex); +} +/** * amdgpu_device_ip_suspend_phase1 - run suspend for hardware IPs (phase 1) *
@@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); +INIT_DELAYED_WORK (&adev->gfx.gfx_off_delay_work, + amdgpu_device_delay_enable_gfx_off); adev->gfx.gfx_off_req_count =1 ; adev->pm.ac_power =power_supply_is_system_supplied () >0 ? true : false;
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +6 -2
@@ -26,6 +26,9 @@#include "amdgpu.h" #include "amdgpu_gfx.h" +/* 0.5 second timeout */ +#define GFX_OFF_DELAY_ENABLE msecs_to_jiffies(500) +/* * GPU scratch registers helpers function. */
@@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)if (!adev->powerplay.pp_funcs->set_powergating_by_smu)return ; +mutex_lock (&adev->gfx.gfx_off_mutex);if (!enable)
@@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) adev->gfx.gfx_off_req_count--;if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { -if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) - adev->gfx.gfx_off_state = true; +schedule_delayed_work (&adev->gfx.gfx_off_delay_work,GFX_OFF_DELAY_ENABLE ); }else if (!enable && adev->gfx.gfx_off_state) {if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false)) adev->gfx.gfx_off_state = false; } +mutex_unlock (&adev->gfx.gfx_off_mutex); }
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): 1532942625-26876-2-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Re: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
One problem,
I delay 500ms to enable gfx off feature.
Any concern about the delay time?
Best Regards
Rex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Monday, July 30, 2018 5:23 PM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
delay to enable gfx off feature to avoid gfx on/off frequently suggested by Alex and Evan.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 ++++++-- 3 files changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -992,6 +992,8 @@ struct amdgpu_gfx {bool gfx_off_state;/* true: enabled, false: disabled */ struct mutex gfx_off_mutex;uint32_t gfx_off_req_count;/* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ +struct delayed_work gfx_off_delay_work; +/* pipe reservation */ struct mutex pipe_reserve_mutex;DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES );
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +15 -0
@@ -1925,6 +1925,19 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)DRM_ERROR ("ib ring test failed (%d).\n" , r); } +static void amdgpu_device_delay_enable_gfx_off (struct work_struct *work) +{ +struct amdgpu_device *adev = + container_of(work, struct amdgpu_device, gfx.gfx_off_delay_work.work); + +mutex_lock (&adev->gfx.gfx_off_mutex); +if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + } +mutex_unlock (&adev->gfx.gfx_off_mutex); +} +/** * amdgpu_device_ip_suspend_phase1 - run suspend for hardware IPs (phase 1) *
@@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); +INIT_DELAYED_WORK (&adev->gfx.gfx_off_delay_work, + amdgpu_device_delay_enable_gfx_off); adev->gfx.gfx_off_req_count =1 ; adev->pm.ac_power =power_supply_is_system_supplied () >0 ? true : false;
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +6 -2
@@ -26,6 +26,9 @@#include "amdgpu.h" #include "amdgpu_gfx.h" +/* 0.5 second timeout */ +#define GFX_OFF_DELAY_ENABLE msecs_to_jiffies(500) +/* * GPU scratch registers helpers function. */
@@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)if (!adev->powerplay.pp_funcs->set_powergating_by_smu)return ; +mutex_lock (&adev->gfx.gfx_off_mutex);if (!enable)
@@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) adev->gfx.gfx_off_req_count--;if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { -if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) - adev->gfx.gfx_off_state = true; +schedule_delayed_work (&adev->gfx.gfx_off_delay_work,GFX_OFF_DELAY_ENABLE ); }else if (!enable && adev->gfx.gfx_off_state) {if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false)) adev->gfx.gfx_off_state = false; } +mutex_unlock (&adev->gfx.gfx_off_mutex); }
--
1.9.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. Use of all freedesktop.org lists is subject to our Code of Conduct.
_______________________________________________
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): CY4PR12MB168727FC303FDB625880C440FB2F0-rpdhrqHFk06Y0SjTqZDccQdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
A bit large, maybe 100ms is enough.
Apart from that the set now looks good on first glance, but I really don't know that code that well.
Christian.
Am 30.07.2018 um 12:25 schrieb Zhu, Rex:
Quoted 116 lines
One problem,
I delay 500ms to enable gfx off feature.
Any concern about the delay time?
Best Regards
Rex
------------------------------------------------------------------------
*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]> *Sent:* Monday, July 30, 2018 5:23 PM
*To:* [email protected]
*Cc:* Zhu, Rex
*Subject:* [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
delay to enable gfx off feature to avoid gfx on/off frequently
suggested by Alex and Evan.Signed-off-by Rex Zhu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++drivers/gpu/drm/amd/amdgpu/amdgpu_device.c| 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 ++++++--3 files changed, 23 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0@@ -992,6 +992,8 @@ struct amdgpu_gfx {bool
gfx_off_state; /* true: enabled, false: disabled */
struct mutexgfx_off_mutex;
uint32_tgfx_off_req_count; /* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ + structdelayed_workgfx_off_delay_work;
+
/* pipe reservation */
struct mutexpipe_reserve_mutex;
DECLARE_BITMAP(pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13
-0@@ -1925,6 +1925,19 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work) DRM_ERROR("ib ring test failed (%d).\n", r); } +static void amdgpu_device_delay_enable_gfx_off (struct work_struct *work) +{ + struct amdgpu_device *adev = + container_of(work, struct amdgpu_device, gfx.gfx_off_delay_work.work); + + mutex_lock(&adev->gfx.gfx_off_mutex); + if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { + if (!amdgpu_dpm_set_powergating_by_smu(adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + } + mutex_unlock(&adev->gfx.gfx_off_mutex); +} +/**
*amdgpu_device_ip_suspend_phase1- run suspend for hardware IPs (phase 1) *drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); +INIT_DELAYED_WORK (&adev->gfx.gfx_off_delay_work, + amdgpu_device_delay_enable_gfx_off); adev->gfx.gfx_off_req_count = 1; adev->pm.ac_power = power_supply_is_system_supplied() > 0 ? true : false;drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4
-0@@ -26,6 +26,9 @@ #include "amdgpu.h" #include "amdgpu_gfx.h" +/* 0.5 second timeout */ +#define GFX_OFF_DELAY_ENABLE msecs_to_jiffies(500) + /** GPU scratch registers helpers function. */ @@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) if (!adev->powerplay.pp_funcs->set_powergating_by_smu) return; + mutex_lock(&adev->gfx.gfx_off_mutex);if (!enable)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-2@@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) adev->gfx.gfx_off_req_count--; if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { - if (!amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, true)) - adev->gfx.gfx_off_state = true; +schedule_delayed_work (&adev->gfx.gfx_off_delay_work,GFX_OFF_DELAY_ENABLE ); } else if (!enable && adev->gfx.gfx_off_state) { if (!amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, false)) adev->gfx.gfx_off_state = false;
Quoted 22 lines
}
+mutex_unlock(&adev->gfx.gfx_off_mutex);
}Signature · 17 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx amd-gfx Info Page - freedesktop.org <https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. Use of all freedesktop.org lists is subject to our Code of Conduct. _______________________________________________ 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
Felix Kuehling
NAKRe: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
In reply to a message not in the archiveNACK.
See inline ...
Quoted 79 lines · Rex Zhu
delay to enable gfx off feature to avoid gfx on/off frequently suggested by Alex and Evan.
Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 ++++++-- 3 files changed, 23 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-0@@ -992,6 +992,8 @@ struct amdgpu_gfx {bool gfx_off_state;/* true: enabled, false: disabled */ struct mutex gfx_off_mutex;uint32_t gfx_off_req_count;/* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ +struct delayed_work gfx_off_delay_work; +/* pipe reservation */ struct mutex pipe_reserve_mutex;DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES );drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +15
-0@@ -1925,6 +1925,19 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)DRM_ERROR ("ib ring test failed (%d).\n" , r); } +static void amdgpu_device_delay_enable_gfx_off (struct work_struct *work) +{ +struct amdgpu_device *adev = + container_of(work, struct amdgpu_device, gfx.gfx_off_delay_work.work); + +mutex_lock (&adev->gfx.gfx_off_mutex); +if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + } +mutex_unlock (&adev->gfx.gfx_off_mutex); +} +/** * amdgpu_device_ip_suspend_phase1 - run suspend for hardware IPs (phase 1) * @@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); +INIT_DELAYED_WORK (&adev->gfx.gfx_off_delay_work, + amdgpu_device_delay_enable_gfx_off); adev->gfx.gfx_off_req_count =1 ; adev->pm.ac_power =power_supply_is_system_supplied () >0 ? true : false;drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4
-0@@ -26,6 +26,9 @@#include "amdgpu.h" #include "amdgpu_gfx.h" +/* 0.5 second timeout */ +#define GFX_OFF_DELAY_ENABLE msecs_to_jiffies(500) +/* * GPU scratch registers helpers function. */ @@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)if (!adev->powerplay.pp_funcs->set_powergating_by_smu)return ; +mutex_lock (&adev->gfx.gfx_off_mutex);if (!enable)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) · line 376
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-2@@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) adev->gfx.gfx_off_req_count--;if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { -if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) - adev->gfx.gfx_off_state = true; +schedule_delayed_work (&adev->gfx.gfx_off_delay_work,GFX_OFF_DELAY_ENABLE ); }else if (!enable && adev->gfx.gfx_off_state) {
There may still be delayed work pending to enable GFXOFF. You need to use cancel_delayed_work_sync to cancel it and make sure GFXOFF doesn't get enabled again while your caller still needs it disabled.
That may also wait for a worker function that has already started. Therefore you need to cancel before taking the gfx_off_mutex, otherwise you can deadlock with the worker function trying to take the lock as well.
Regards,
Felix
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) · line 382
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-0if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false)) adev->gfx.gfx_off_state = false; } +mutex_unlock (&adev->gfx.gfx_off_mutex); }
_______________________________________________
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): c0edeb5f-140d-4572-d587-375a6838ca5f-5C7GfCeVMHo@public.gmane.org
Re: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
Sorry, I just saw your discussion with Evan. Checking the conditions in the worker function should work. Feel free to add my Reviewed-by.
Regards,
Felix
Quoted 109 lines · Felix Kuehling
NACK.
See inline ...
Quoted 79 lines · Rex Zhu
delay to enable gfx off feature to avoid gfx on/off frequently suggested by Alex and Evan.
Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 ++++++-- 3 files changed, 23 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-0@@ -992,6 +992,8 @@ struct amdgpu_gfx {bool gfx_off_state;/* true: enabled, false: disabled */ struct mutex gfx_off_mutex;uint32_t gfx_off_req_count;/* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ +struct delayed_work gfx_off_delay_work; +/* pipe reservation */ struct mutex pipe_reserve_mutex;DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES );drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +15
-0@@ -1925,6 +1925,19 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)DRM_ERROR ("ib ring test failed (%d).\n" , r); } +static void amdgpu_device_delay_enable_gfx_off (struct work_struct *work) +{ +struct amdgpu_device *adev = + container_of(work, struct amdgpu_device, gfx.gfx_off_delay_work.work); + +mutex_lock (&adev->gfx.gfx_off_mutex); +if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + } +mutex_unlock (&adev->gfx.gfx_off_mutex); +} +/** * amdgpu_device_ip_suspend_phase1 - run suspend for hardware IPs (phase 1) * @@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); +INIT_DELAYED_WORK (&adev->gfx.gfx_off_delay_work, + amdgpu_device_delay_enable_gfx_off); adev->gfx.gfx_off_req_count =1 ; adev->pm.ac_power =power_supply_is_system_supplied () >0 ? true : false;drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4
-0@@ -26,6 +26,9 @@#include "amdgpu.h" #include "amdgpu_gfx.h" +/* 0.5 second timeout */ +#define GFX_OFF_DELAY_ENABLE msecs_to_jiffies(500) +/* * GPU scratch registers helpers function. */ @@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)if (!adev->powerplay.pp_funcs->set_powergating_by_smu)return ; +mutex_lock (&adev->gfx.gfx_off_mutex);if (!enable)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) · line 376
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-2@@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) adev->gfx.gfx_off_req_count--;if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { -if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) - adev->gfx.gfx_off_state = true; +schedule_delayed_work (&adev->gfx.gfx_off_delay_work,GFX_OFF_DELAY_ENABLE ); }else if (!enable && adev->gfx.gfx_off_state) {There may still be delayed work pending to enable GFXOFF. You need to use
cancel_delayed_work_syncto cancel it and make sure GFXOFF doesn't get enabled again while your caller still needs it disabled.That may also wait for a worker function that has already started. Therefore you need to cancel before taking the
gfx_off_mutex, otherwise you can deadlock with the worker function trying to take the lock as well.Regards,
Felixdrivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) · line 382
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-0if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false)) adev->gfx.gfx_off_state = false; } +mutex_unlock (&adev->gfx.gfx_off_mutex); }
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
PATCH v2 3/4 drm/amdgpu: gfx ip ctrl gfx off via amdgpu_gfx_off_ctrl
In reply to a message not in the archiveuse amdgpu_gfx_off_ctrl function so driver can arbitrate whether the gfx ip can be power off or power on.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -4
@@ -1828,8 +1828,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) adev->ip_blocks[i].version->funcs->name, r);return r; } -if (adev->powerplay.pp_funcs->set_powergating_by_smu) -amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false); +amdgpu_gfx_off_ctrl (adev, false); r = adev->ip_blocks[i].version->funcs->hw_fini ((void *)adev);/* XXX handle errors */ if (r) {
@@ -2012,8 +2011,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) }/* call smu to disable gfx off feature first when suspend */ -if (adev->powerplay.pp_funcs->set_powergating_by_smu) -amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false); +amdgpu_gfx_off_ctrl (adev, false);for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) {if (!adev->ip_blocks[i].status.valid)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -4
@@ -3783,13 +3783,11 @@ static int gfx_v9_0_set_powergating_state(void *handle,gfx_v9_0_update_gfx_mg_power_gating (adev, enable);/* set gfx off through smu */ -if (enable && adev->powerplay.pp_funcs->set_powergating_by_smu) -amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true); +amdgpu_gfx_off_ctrl (adev, true);break ;case CHIP_VEGA12 :/* set gfx off through smu */ -if (enable && adev->powerplay.pp_funcs->set_powergating_by_smu) -amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true); +amdgpu_gfx_off_ctrl (adev, true);break ;default :break ;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 4/4 drm/amdgpu: Disable gfx off if VCN is busy
In reply to a message not in the archivethis patch is a workaround for the gpu hang at video end time if play video with gfx off enabled.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2 -0
@@ -214,6 +214,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) fences +=amdgpu_fence_count_emitted (&adev->vcn.ring_jpeg);if (fences ==0 ) { +amdgpu_gfx_off_ctrl (adev, true);if (adev->pm.dpm_enabled)amdgpu_dpm_enable_uvd (adev, false);else
@@ -230,6 +231,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)bool set_clocks = !cancel_delayed_work_sync (&adev->vcn.idle_work);if (set_clocks) { +amdgpu_gfx_off_ctrl (adev, false);if (adev->pm.dpm_enabled)amdgpu_dpm_enable_uvd (adev, true);else
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[+Oded]
KFD on amd-staging-drm-next doesn't support Raven yet. It's coming soon via Oded's branch.
To prepare for that, all MMIO access in amdgpu_amdkfd_gfx_v9.c should be protected by disabling GFXOFF. Since enabling GFXOFF is delayed in your latest patch series, it shouldn't cause performance issues. It's not going to do anything on Vega10, which doesn't have the GFXOFF feature. But it will take effect as soon as Raven support is enabled for KFD.
Regards,
Felix
Quoted 93 lines · Rex Zhu
v2:
1. drop the special handling for the hw IP suggested by hawking and Christian.
2. refine the variable name suggested by Flora.This funciton as the entry of gfx off ctrl feature. we arbitrat gfx off feature enable/disable in this function.
Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 36 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +5
-0@@ -988,6 +988,10 @@ struct amdgpu_gfx {/* NGG */ struct amdgpu_ngg ngg; +/* gfx off */ +bool gfx_off_state;/* true: enabled, false: disabled */ +struct mutex gfx_off_mutex; +uint32_t gfx_off_req_count;/* default 1, enable gfx off: dec 1, disable gfx off: add 1 */ /* pipe reservation */ struct mutex pipe_reserve_mutex;DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES );@@ -1815,6 +1819,7 @@ void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, const u32 array_size);bool amdgpu_device_is_px (struct drm_device *dev); +void amdgpu_gfx_off_ctrl (struct amdgpu_device *adev,bool enable);/* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO )void amdgpu_register_atpx_handler (void );drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -2367,6 +2367,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,mutex_init (&adev->gfx.gpu_clock_mutex);mutex_init (&adev->srbm_mutex);mutex_init (&adev->gfx.pipe_reserve_mutex); +mutex_init (&adev->gfx.gfx_off_mutex);mutex_init (&adev->grbm_idx_mutex);mutex_init (&adev->mn_lock);mutex_init (&adev->virt.vf_errors.lock);@@ -2394,6 +2395,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,INIT_DELAYED_WORK (&adev->late_init_work, amdgpu_device_ip_late_init_func_handler); + adev->gfx.gfx_off_req_count =1 ; adev->pm.ac_power =power_supply_is_system_supplied () >0 ? true : false;/* Registers mapping */ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +26
-0@@ -340,3 +340,39 @@ void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev) &ring->mqd_gpu_addr, &ring->mqd_ptr); } + +/* amdgpu_gfx_off_ctrl - Handle gfx off feature enable/disable +* +* @adev: amdgpu_device pointer +* @bool enable true: enable gfx off feature, false: disable gfx off feature +* +* 1. gfx off feature will be enabled by gfx ip after gfx cg gp enabled. +* 2. other client can send request to disable gfx off feature, the request should be honored. +* 3. other client can cancel their request of disable gfx off feature +* 4. other client should not send request to enable gfx off feature before disable gfx off feature. +*/ + +void amdgpu_gfx_off_ctrl (struct amdgpu_device *adev,bool enable) +{ +if (!(adev->powerplay.pp_feature &PP_GFXOFF_MASK )) +return ; + +if (!adev->powerplay.pp_funcs->set_powergating_by_smu) +return ; + +mutex_lock (&adev->gfx.gfx_off_mutex); + +if (!enable) + adev->gfx.gfx_off_req_count++; +else if (adev->gfx.gfx_off_req_count >0 ) + adev->gfx.gfx_off_req_count--;
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev) · line 378
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +10
-0+ +if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + }else if (!enable && adev->gfx.gfx_off_state) { +if (!amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GFX , false)) + adev->gfx.gfx_off_state = false; + } +mutex_unlock (&adev->gfx.gfx_off_mutex); +}
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx