Commit cb724911 authored by Stanislav Lisovskiy's avatar Stanislav Lisovskiy Committed by Chris Wilson

drm/i915: Fix inconsistance between pfit.enable and scaler freeing

Despite that during hw readout we seem to have scalers assigned
to pipes, then call atomic_setup_scalers, at the commit stage in
skl_update_scaler there is a check, that if we have fb src and
dest of same size, we stage freeing of that scaler.

However we don't update pfit.enabled flag then, which makes
the state inconsistent, which in turn triggers a WARN_ON
in skl_pfit_enable, because we have pfit enabled,
but no assigned scaler.

To me this looks weird that we kind of do the decision
to use or not use the scaler at skl_update_scaler stage
but not in intel_atomic_setup_scalers, moreover
not updating the whole state consistently.

This fix is to not free the scaler if we have pfit.enabled
flag set, so that the state is now consistent
and the warnings are gone.

v2: - Put pfit.enable check into crtc specific place
      (Ville Syrjälä)

Bugzilla: https://gitlab.freedesktop.org/drm/intel/issues/577Signed-off-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: default avatarTomi Sarvela <tomi.p.sarvela@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200124172301.16484-1-stanislav.lisovskiy@intel.com
parent 34ffabe3
...@@ -6071,7 +6071,8 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state) ...@@ -6071,7 +6071,8 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)
const struct drm_display_mode *adjusted_mode = &state->hw.adjusted_mode; const struct drm_display_mode *adjusted_mode = &state->hw.adjusted_mode;
bool need_scaler = false; bool need_scaler = false;
if (state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) if (state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
state->pch_pfit.enabled)
need_scaler = true; need_scaler = true;
return skl_update_scaler(state, !state->hw.active, SKL_CRTC_INDEX, return skl_update_scaler(state, !state->hw.active, SKL_CRTC_INDEX,
......
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