[PATCH 05/14] drm/amd/display: Adding a dc_debug option and dmub setting to use PHY FSM for PSR

[Alan Liu]

From: "Shah, Dharati" <dharati.s...@amd.com>

[Why]
PSR Power on/off is done in PSR. Add a dc_debug option
and dmub setting to use PHY implementation of this instead.

[How]
Add a dc_debug option and dmub setting to use
PHY FSM Power up/down for PSR.

Co-authored-by: Shah Dharati <dharati.s...@amd.com>
Reviewed-by: Hansen Dsouza <hansen.dso...@amd.com>
Acked-by: Alan Liu <haoping....@amd.com>
Signed-off-by: Shah Dharati <dharati.s...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dc.h                     | 1 +
 drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c           | 1 +
 drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c | 1 +
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h         | 8 ++++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h 
b/drivers/gpu/drm/amd/display/dc/dc.h
index 55d43d642b38..7c8b6e1a9c9e 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -710,6 +710,7 @@ struct dc_debug_options {
 #endif
        bool apply_vendor_specific_lttpr_wa;
        bool ignore_dpref_ss;
+       uint8_t psr_power_use_phy_fsm;
 };
 
 struct gpu_info_soc_bounding_box_v1_0;
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c 
b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
index 8bd265b40847..312c68172689 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
@@ -320,6 +320,7 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub,
                copy_settings_data->otg_inst                    = 0;
 
        // Misc
+       copy_settings_data->use_phy_fsm             = 
link->ctx->dc->debug.psr_power_use_phy_fsm;
        copy_settings_data->psr_level                           = 
psr_context->psr_level.u32all;
        copy_settings_data->smu_optimizations_en                = 
psr_context->allow_smu_optimizations;
        copy_settings_data->multi_disp_optimizations_en = 
psr_context->allow_multi_disp_optimizations;
diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c 
b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
index 406492655dee..48381cb58032 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
@@ -1034,6 +1034,7 @@ static const struct dc_debug_options debug_defaults_drv = 
{
        },
        .optimize_edp_link_rate = true,
        .enable_sw_cntl_psr = true,
+       .psr_power_use_phy_fsm = 0,
 };
 
 static const struct dc_debug_options debug_defaults_diags = {
diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h 
b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index 3eb0d7a2d3a7..da93087132b0 100644
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -1560,10 +1560,14 @@ struct dmub_cmd_psr_copy_settings_data {
         * DSC enable status in driver
         */
        uint8_t dsc_enable_status;
+       /*
+        * Use FSM state for PSR power up/down
+        */
+       uint8_t use_phy_fsm;
        /**
-        * Explicit padding to 3 byte boundary.
+        * Explicit padding to 2 byte boundary.
         */
-       uint8_t pad3[3];
+       uint8_t pad3[2];
 };
 
 /**
-- 
2.25.1