From: Alvin Lee <[email protected]> [Why & How] Update DMU cmd header for DML submission dependency.
Reviewed-by: Dillon Varone <[email protected]> Signed-off-by: Alvin Lee <[email protected]> Signed-off-by: Ray Wu <[email protected]> --- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 5d534b91bc33..5dbedf09baa9 100644 --- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h @@ -2802,8 +2802,11 @@ union dmub_fams2_stream_static_sub_state_v2 { struct dmub_fams2_stream_static_state { enum fams2_stream_type type; - uint32_t otg_vline_time_ns; - uint32_t otg_vline_time_ticks; + union { + uint32_t otg_vline_time_ns; // used by DCN4 + uint32_t otg_vline_time_ps; // used by DCN6+ + }; + uint32_t otg_vline_time_ticks; // U22.10 fixed point, see FAMS2_OTG_VLINE_TIME_TICKS_U22_10_FRAC_BITS uint16_t htotal; uint16_t vtotal; // nominal vtotal uint16_t vblank_start; @@ -2835,8 +2838,11 @@ struct dmub_fams2_stream_static_state { struct dmub_fams2_cmd_stream_static_base_state { enum fams2_stream_type type; - uint32_t otg_vline_time_ns; - uint32_t otg_vline_time_ticks; + union { + uint32_t otg_vline_time_ns; // used by DCN4 + uint32_t otg_vline_time_ps; // used by DCN6+ + }; + uint32_t otg_vline_time_ticks; // U22.10 fixed point, see FAMS2_OTG_VLINE_TIME_TICKS_U22_10_FRAC_BITS uint16_t htotal; uint16_t vtotal; // nominal vtotal uint16_t vblank_start; -- 2.43.0
