On Fri, Sep 1, 2023 at 9:05 AM Ville Syrjala
<ville.syrjala@xxxxxxxxxxxxxxx> wrote:
>
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> We should be able to change any of the VRR parameters
> during fastsets as long as we toggle VRR off at the start
> and then back on at the end. The transcoder will be running
> in non-VRR mode during the transition.
>
> Co-developed-by: Manasi Navare <navaremanasi@xxxxxxxxxxxx>
Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> Signed-off-by: Manasi Navare <navaremanasi@xxxxxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 34 +++++++++++++++-----
> 1 file changed, 26 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index cbbee303cd00..f0bb5c70ebfc 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -913,18 +913,32 @@ static bool planes_disabling(const struct intel_crtc_state *old_crtc_state,
> return is_disabling(active_planes, old_crtc_state, new_crtc_state);
> }
>
> +static bool vrr_params_changed(const struct intel_crtc_state *old_crtc_state,
> + const struct intel_crtc_state *new_crtc_state)
> +{
> + return old_crtc_state->vrr.flipline != new_crtc_state->vrr.flipline ||
> + old_crtc_state->vrr.vmin != new_crtc_state->vrr.vmin ||
> + old_crtc_state->vrr.vmax != new_crtc_state->vrr.vmax ||
> + old_crtc_state->vrr.guardband != new_crtc_state->vrr.guardband ||
> + old_crtc_state->vrr.pipeline_full != new_crtc_state->vrr.pipeline_full;
> +}
> +
> static bool vrr_enabling(const struct intel_crtc_state *old_crtc_state,
> const struct intel_crtc_state *new_crtc_state)
> {
> return is_enabling(vrr.enable, old_crtc_state, new_crtc_state) ||
> - (new_crtc_state->vrr.enable && new_crtc_state->update_m_n);
> + (new_crtc_state->vrr.enable &&
> + (new_crtc_state->update_m_n ||
> + vrr_params_changed(old_crtc_state, new_crtc_state)));
> }
>
> static bool vrr_disabling(const struct intel_crtc_state *old_crtc_state,
> const struct intel_crtc_state *new_crtc_state)
> {
> return is_disabling(vrr.enable, old_crtc_state, new_crtc_state) ||
> - (old_crtc_state->vrr.enable && new_crtc_state->update_m_n);
> + (old_crtc_state->vrr.enable &&
> + (new_crtc_state->update_m_n ||
> + vrr_params_changed(old_crtc_state, new_crtc_state)));
> }
>
> #undef is_disabling
> @@ -5342,13 +5356,14 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
> PIPE_CONF_CHECK_I(splitter.link_count);
> PIPE_CONF_CHECK_I(splitter.pixel_overlap);
>
> - if (!fastset)
> + if (!fastset) {
> PIPE_CONF_CHECK_BOOL(vrr.enable);
> - PIPE_CONF_CHECK_I(vrr.vmin);
> - PIPE_CONF_CHECK_I(vrr.vmax);
> - PIPE_CONF_CHECK_I(vrr.flipline);
> - PIPE_CONF_CHECK_I(vrr.pipeline_full);
> - PIPE_CONF_CHECK_I(vrr.guardband);
> + PIPE_CONF_CHECK_I(vrr.vmin);
> + PIPE_CONF_CHECK_I(vrr.vmax);
> + PIPE_CONF_CHECK_I(vrr.flipline);
> + PIPE_CONF_CHECK_I(vrr.pipeline_full);
> + PIPE_CONF_CHECK_I(vrr.guardband);
> + }
>
> #undef PIPE_CONF_CHECK_X
> #undef PIPE_CONF_CHECK_I
> @@ -6554,6 +6569,9 @@ static void intel_update_crtc(struct intel_atomic_state *state,
> if (DISPLAY_VER(i915) >= 11 &&
> intel_crtc_needs_fastset(new_crtc_state))
> icl_set_pipe_chicken(new_crtc_state);
> +
> + if (vrr_params_changed(old_crtc_state, new_crtc_state))
> + intel_vrr_set_transcoder_timings(new_crtc_state);
> }
>
> intel_fbc_update(state, crtc);
> --
> 2.41.0
>
