Commit ff6014d6 authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher

drm/amd/display: Fix bug where refresh rate becomes fixed

This issue occurs if refresh rate range is very small and lfc is not used.
When frame spikes occur, refresh rate becomes fixed and will not restore properly
Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e80e9446
...@@ -168,21 +168,6 @@ static unsigned int calc_v_total_from_duration( ...@@ -168,21 +168,6 @@ static unsigned int calc_v_total_from_duration(
return v_total; return v_total;
} }
static unsigned long long calc_nominal_field_rate(const struct dc_stream_state *stream)
{
unsigned long long nominal_field_rate_in_uhz = 0;
/* Calculate nominal field rate for stream */
nominal_field_rate_in_uhz = stream->timing.pix_clk_khz;
nominal_field_rate_in_uhz *= 1000ULL * 1000ULL * 1000ULL;
nominal_field_rate_in_uhz = div_u64(nominal_field_rate_in_uhz,
stream->timing.h_total);
nominal_field_rate_in_uhz = div_u64(nominal_field_rate_in_uhz,
stream->timing.v_total);
return nominal_field_rate_in_uhz;
}
static void update_v_total_for_static_ramp( static void update_v_total_for_static_ramp(
struct core_freesync *core_freesync, struct core_freesync *core_freesync,
const struct dc_stream_state *stream, const struct dc_stream_state *stream,
...@@ -441,10 +426,11 @@ static void apply_fixed_refresh(struct core_freesync *core_freesync, ...@@ -441,10 +426,11 @@ static void apply_fixed_refresh(struct core_freesync *core_freesync,
in_out_vrr->adjust.v_total_min; in_out_vrr->adjust.v_total_min;
} else { } else {
in_out_vrr->adjust.v_total_min = in_out_vrr->adjust.v_total_min =
calc_v_total_from_refresh( calc_v_total_from_refresh(stream,
stream, in_out_vrr->max_refresh_in_uhz); in_out_vrr->max_refresh_in_uhz);
in_out_vrr->adjust.v_total_max = in_out_vrr->adjust.v_total_max =
in_out_vrr->adjust.v_total_min; calc_v_total_from_refresh(stream,
in_out_vrr->min_refresh_in_uhz);
} }
} }
} }
...@@ -638,7 +624,8 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, ...@@ -638,7 +624,8 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync,
core_freesync = MOD_FREESYNC_TO_CORE(mod_freesync); core_freesync = MOD_FREESYNC_TO_CORE(mod_freesync);
/* Calculate nominal field rate for stream */ /* Calculate nominal field rate for stream */
nominal_field_rate_in_uhz = calc_nominal_field_rate(stream); nominal_field_rate_in_uhz =
mod_freesync_calc_nominal_field_rate(stream);
min_refresh_in_uhz = in_config->min_refresh_in_uhz; min_refresh_in_uhz = in_config->min_refresh_in_uhz;
max_refresh_in_uhz = in_config->max_refresh_in_uhz; max_refresh_in_uhz = in_config->max_refresh_in_uhz;
...@@ -888,6 +875,22 @@ void mod_freesync_get_settings(struct mod_freesync *mod_freesync, ...@@ -888,6 +875,22 @@ void mod_freesync_get_settings(struct mod_freesync *mod_freesync,
} }
} }
unsigned long long mod_freesync_calc_nominal_field_rate(
const struct dc_stream_state *stream)
{
unsigned long long nominal_field_rate_in_uhz = 0;
/* Calculate nominal field rate for stream */
nominal_field_rate_in_uhz = stream->timing.pix_clk_khz;
nominal_field_rate_in_uhz *= 1000ULL * 1000ULL * 1000ULL;
nominal_field_rate_in_uhz = div_u64(nominal_field_rate_in_uhz,
stream->timing.h_total);
nominal_field_rate_in_uhz = div_u64(nominal_field_rate_in_uhz,
stream->timing.v_total);
return nominal_field_rate_in_uhz;
}
bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync, bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync,
const struct dc_stream_state *stream, const struct dc_stream_state *stream,
uint32_t min_refresh_cap_in_uhz, uint32_t min_refresh_cap_in_uhz,
...@@ -897,7 +900,7 @@ bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync, ...@@ -897,7 +900,7 @@ bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync,
{ {
/* Calculate nominal field rate for stream */ /* Calculate nominal field rate for stream */
unsigned long long nominal_field_rate_in_uhz = unsigned long long nominal_field_rate_in_uhz =
calc_nominal_field_rate(stream); mod_freesync_calc_nominal_field_rate(stream);
// Check nominal is within range // Check nominal is within range
if (nominal_field_rate_in_uhz > max_refresh_cap_in_uhz || if (nominal_field_rate_in_uhz > max_refresh_cap_in_uhz ||
......
...@@ -159,6 +159,9 @@ void mod_freesync_handle_v_update(struct mod_freesync *mod_freesync, ...@@ -159,6 +159,9 @@ void mod_freesync_handle_v_update(struct mod_freesync *mod_freesync,
const struct dc_stream_state *stream, const struct dc_stream_state *stream,
struct mod_vrr_params *in_out_vrr); struct mod_vrr_params *in_out_vrr);
unsigned long long mod_freesync_calc_nominal_field_rate(
const struct dc_stream_state *stream);
bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync, bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync,
const struct dc_stream_state *stream, const struct dc_stream_state *stream,
uint32_t min_refresh_cap_in_uhz, uint32_t min_refresh_cap_in_uhz,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment