drm/amd/display: Add variable refresh rate parameters to DC structures

Time stamping will be part of surface, and will be updated when address is flipped.
FreeSync parameters will be attached to stream, as it adjusts the timing dynamically.

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 2cd97342bf0f26753157735af3a57a6886ef4114..19aec82a942906afc55dac80ba0a5ceb4314db7e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -447,6 +447,7 @@ union surface_update_flags {
 
 struct dc_plane_state {
        struct dc_plane_address address;
+       struct dc_plane_flip_time time;
        struct scaling_taps scaling_quality;
        struct rect src_rect;
        struct rect dst_rect;
@@ -557,6 +558,7 @@ struct dc_transfer_func *dc_create_transfer_func(void);
  */
 struct dc_flip_addrs {
        struct dc_plane_address address;
+       unsigned int flip_timestamp_in_us;
        bool flip_immediate;
        /* TODO: add flip duration for FreeSync */
 };

diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index e91ac6811990160c150693266340ac6ba1ceb6be..b83a7dc2f5a97670603aa069dc841bd3479aa3cc 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -692,8 +692,18 @@ struct crtc_trigger_info {
        enum trigger_delay delay;
 };
 
-struct dc_crtc_timing {
+enum vrr_state {
+       VRR_STATE_OFF = 0,
+       VRR_STATE_VARIABLE,
+       VRR_STATE_FIXED,
+};
 
+struct dc_crtc_timing_adjust {
+       uint32_t v_total_min;
+       uint32_t v_total_max;
+};
+
+struct dc_crtc_timing {
        uint32_t h_total;
        uint32_t h_border_left;
        uint32_t h_addressable;

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index bafe3889676fb3d266d82f467935860684cf6b0b..13e5ac9cfe134c651600c52f19a076427332a306 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -48,6 +48,8 @@ struct dc_stream_status {
 struct dc_stream_state {
        struct dc_sink *sink;
        struct dc_crtc_timing timing;
+       struct dc_crtc_timing_adjust timing_adjust;
+       struct vrr_params vrr_params;
 
        struct rect src; /* composition area */
        struct rect dst; /* stream addressable area */

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 8811b6f86bfff4a4dc25b8d71b8fcd4851da5a6c..9441305d3ab58b288c72c4e66ca3f82d7af39510 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -521,6 +521,24 @@ struct audio_info {
        struct audio_mode modes[DC_MAX_AUDIO_DESC_COUNT];
 };
 
+struct vrr_params {
+       enum vrr_state state;
+       uint32_t window_min;
+       uint32_t window_max;
+       uint32_t inserted_frame_duration_in_us;
+       uint32_t frames_to_insert;
+       uint32_t frame_counter;
+};
+
+#define DC_PLANE_UPDATE_TIMES_MAX 10
+
+struct dc_plane_flip_time {
+       unsigned int time_elapsed_in_us[DC_PLANE_UPDATE_TIMES_MAX];
+       unsigned int index;
+       unsigned int prev_update_time_in_us;
+};
+
+// Will combine with vrr_params at some point.
 struct freesync_context {
        bool supported;
        bool enabled;