drm/amd/display: Fix missed targets in FAMS2+HWFQ

[WHY&HOW]
Add additional delay factor when considering a safe time to flip for HWFQ
to be passed in by the driver.

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 3e4abfa..6ff87b0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
@@ -1657,6 +1657,7 @@ void dc_dmub_srv_fams2_update_config(struct dc *dc,
        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
+       global_cmd->config.global.hwfq_flip_programming_delay_us = 100; //100us
 
        /* 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 87f2e4e..3e8d5f2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -1836,7 +1836,7 @@ struct dmub_cmd_fams2_global_config {
        uint32_t num_streams;
        union dmub_fams2_global_feature_config features;
        uint32_t recovery_timeout_us;
-       uint8_t pad[3];
+       uint32_t hwfq_flip_programming_delay_us;
 };
 
 union dmub_cmd_fams2_config {