[PATCH 08/12] drm/amd/display: limited pll vco w/a v2

[Roman.Li]

From: Jingwen Zhu <jingwen....@amd.com>

[Why/How]
The w/a will cause reboot black screen issue.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
Signed-off-by: Jingwen Zhu <jingwen....@amd.com>
Signed-off-by: Roman Li <roman...@amd.com>
---
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h       | 1 +
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h   | 3 ++-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h 
b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
index 0bafb6710761..87b761ac3135 100644
--- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
+++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
@@ -316,6 +316,7 @@ struct dmub_srv_hw_params {
        bool disable_sldo_opt;
        bool enable_non_transparent_setconfig;
        bool lower_hbr3_phy_ssc;
+       bool override_hbr3_pll_vco;
 };
 
 /**
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 dcae768c2cf4..79b5b1bb9b93 100644
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -843,7 +843,8 @@ union dmub_fw_boot_options {
                uint32_t ips_sequential_ono: 1; /**< 1 to enable sequential ONO 
IPS sequence */
                uint32_t disable_sldo_opt: 1; /**< 1 to disable SLDO 
optimizations */
                uint32_t lower_hbr3_phy_ssc: 1; /**< 1 to lower hbr3 phy ssc to 
0.125 percent */
-               uint32_t reserved : 6; /**< reserved */
+               uint32_t override_hbr3_pll_vco: 1; /**< 1 to override the hbr3 
pll vco to 0 */
+               uint32_t reserved : 5; /**< reserved */
        } bits; /**< boot bits */
        uint32_t all; /**< 32-bit access to bits */
 };
diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c 
b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
index 3f38db752b84..4777c7203b2c 100644
--- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
+++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
@@ -377,6 +377,7 @@ void dmub_dcn31_enable_dmub_boot_options(struct dmub_srv 
*dmub, const struct dmu
        boot_options.bits.dpia_hpd_int_enable_supported = 
params->dpia_hpd_int_enable_supported;
        boot_options.bits.power_optimization = params->power_optimization;
        boot_options.bits.lower_hbr3_phy_ssc = params->lower_hbr3_phy_ssc;
+       boot_options.bits.override_hbr3_pll_vco = params->override_hbr3_pll_vco;
 
        boot_options.bits.sel_mux_phy_c_d_phy_f_g = (dmub->asic == 
DMUB_ASIC_DCN31B) ? 1 : 0;
 
-- 
2.34.1