drm/amd/display: Add power_state member into dc_state
Subsystems (3)
PATCH v3 1/2 drm/amd/display: Add power_state member into dc_state
This can be used by the display core to let decisions be made based upon the requested power state.
---
changes from v2->v3:
* New patch
drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +2 -0
@@ -3281,6 +3281,8 @@ void dc_set_power_state(if (!dc->current_state)return ; + dc->current_state->power_state = power_state; +switch (power_state) {case DC_ACPI_CM_POWER_STATE_D0 :dc_resource_state_construct (dc, dc->current_state);
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -0
@@ -506,6 +506,7 @@ struct dc_state {struct {unsigned int stutter_period_us; } perf_params; + enum dc_acpi_cm_power_state power_state; };#endif /* _CORE_TYPES_H_ */
Signature · 1 line
2.25.1
PATCH v3 2/2 drm/amd/display: Use requested power state to avoid HPD WA during s0ix
The WA from commit 5965280abd30 ("drm/amd/display: Apply w/a for hard hang on HPD") causes a regression in s0ix where the system will fail to resume properly. This may be because an HPD was active the last time clocks were updated but clocks didn't get updated again during s0ix.
So add an extra call to update clocks as part of the suspend routine:dm_suspend->dc_set_power_state->clk_mgr_optimize_pwr_state
In case HPD is set during this time, also check if the call happened during suspend to allow overriding the WA.
---
changes from v2->v3:
* stop depending on adev, get value of power state from display core
changes from v1->v2:
* Add fallthrough statement
* Extend case to check if call was explicitly in s0ix since #1852 showed hpd_state can be set at this time too
* Adjust commit message and title
* Add extra commit and bug fixed to metadata
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 ++- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +2 -1
@@ -157,7 +157,8 @@ static void rn_update_clocks(struct clk_mgr *clk_mgr_base, }/* if we can go lower, go lower */ -if (display_count ==0 && !hpd_state) { +if (display_count ==0 && + (dc->current_state->power_state ==DC_ACPI_CM_POWER_STATE_D3 || !hpd_state)) {rn_vbios_smu_set_dcn_low_power_state (clk_mgr,DCN_PWR_STATE_LOW_POWER );/* update power state */ clk_mgr_base->clks.pwr_state =DCN_PWR_STATE_LOW_POWER ;
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -0
@@ -3301,6 +3301,9 @@ void dc_set_power_state( }break ; +case DC_ACPI_CM_POWER_STATE_D3 : +clk_mgr_optimize_pwr_state (dc, dc->clk_mgr); + fallthrough;default :ASSERT (dc->current_state->stream_count ==0 );/* Zero out the current context so that on resume we start with
Signature · 1 line
2.25.1