drm/amd/display: Add recovery timeout to FAMS2

[WHY&HOW]
Add 5ms timeout to trigger recovery and force allow P-State in DMUB.

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Signed-off-by: Dillon Varone <dillon.varone@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
index 0e70b95573aeea5331b13ae5a3c58ca44ba7ee4e..4e6f7bf8a5b46cba6a4eb241f6469467414ccd6c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
@@ -1653,6 +1653,7 @@ void dc_dmub_srv_fams2_update_config(struct dc *dc,
        /* send global configuration parameters */
        global_cmd->config.global.max_allow_delay_us = 100 * 1000; //100ms
        global_cmd->config.global.lock_wait_time_us = 5000; //5ms
+       global_cmd->config.global.recovery_timeout_us = 5000; //5ms
 
        /* copy static feature configuration */
        global_cmd->config.global.features.all = dc->debug.fams2_config.all;

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 d4d046ac82a41cac50571b65cc610eedbbd2d7b8..53ea4a57bd441a4632e2f92f161222f2aff34608 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -1833,6 +1833,7 @@ struct dmub_cmd_fams2_global_config {
        uint32_t lock_wait_time_us; // time to forecast acquisition of lock
        uint32_t num_streams;
        union dmub_fams2_global_feature_config features;
+       uint32_t recovery_timeout_us;
        uint8_t pad[3];
 };