drm/amd/display: Add support for manual DMUB FAMS trigger

- Add is_drr parameter to indicate DRR is enabled on
the panel to determine whether SubVP MCLK switch
logic should be enabled

- Add DRR manual trigger in FW (instead of driver)
because manual trigger programming triggers DRR
update pending and can block SubVP MCLK switches
from taking place

Acked-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Anthony Koo <Anthony.Koo@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/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index de193636d0226605259e96bcf9a9cd785576cf8b..d7f3619352f04e5da0655da74bbeeaf2c11db056 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -976,7 +976,8 @@ struct dmub_cmd_fw_assisted_mclk_switch_pipe_data_v2 {
                        uint16_t vtotal;
                        uint8_t main_pipe_index;
                        uint8_t phantom_pipe_index;
-                       uint8_t padding[2];
+                       uint8_t is_drr;
+                       uint8_t padding;
                } subvp_data;
 
                struct {
@@ -1579,6 +1580,12 @@ enum dmub_cmd_fams_type {
        DMUB_CMD__FAMS_SETUP_FW_CTRL    = 0,
        DMUB_CMD__FAMS_DRR_UPDATE               = 1,
        DMUB_CMD__HANDLE_SUBVP_CMD      = 2, // specifically for SubVP cmd
+       /**
+        * For SubVP set manual trigger in FW because it
+        * triggers DRR_UPDATE_PENDING which SubVP relies
+        * on (for any SubVP cases that use a DRR display)
+        */
+       DMUB_CMD__FAMS_SET_MANUAL_TRIGGER = 3,
 };
 
 /**