On Wed, Feb 12, 2020 at 06:17:33PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <[email protected]> > > Fix skl_update_scaler_crtc() to deal with different scaling > modes correctly. The current implementation assumes > DRM_MODE_SCALE_FULLSCREEN. Fortunately we don't expose any > border properties currently so the code does actually end > up doing the right thing (assigning a scaler for pfit). > The code does need to be fixed before any borders are > exposed. > > Also we have redundant calls to skl_update_scaler_crtc() in > dp/hdmi .compute_config() which can be nuked. They were anyway > called before we had even computed the pfit state so were > basically nonsense. The real call we need to keep is in > intel_crtc_atomic_check(). > > v2: Deal witrh skl_update_scaler_crtc() in intel_dp_ycbcr420_config() > > Signed-off-by: Ville Syrjälä <[email protected]>
Just keeping the call in intel_crtc_atomic_check() looks good Reviewed-by: Manasi Navare <[email protected]> Manasi > --- > drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++---------- > drivers/gpu/drm/i915/display/intel_display.h | 1 - > drivers/gpu/drm/i915/display/intel_dp.c | 15 -------- > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 --- > 4 files changed, 19 insertions(+), 43 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index de50aa0b076c..becc6322b7dc 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -6101,30 +6101,28 @@ skl_update_scaler(struct intel_crtc_state > *crtc_state, bool force_detach, > return 0; > } > > -/** > - * skl_update_scaler_crtc - Stages update to scaler state for a given crtc. > - * > - * @state: crtc's scaler state > - * > - * Return > - * 0 - scaler_usage updated successfully > - * error - requested scaling cannot be supported or other error condition > - */ > -int skl_update_scaler_crtc(struct intel_crtc_state *state) > +static int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state) > { > - const struct drm_display_mode *adjusted_mode = &state->hw.adjusted_mode; > - bool need_scaler = false; > + const struct drm_display_mode *adjusted_mode = > + &crtc_state->hw.adjusted_mode; > + int width, height; > > - if (state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || > - state->pch_pfit.enabled) > - need_scaler = true; > + if (crtc_state->pch_pfit.enabled) { > + u32 pfit_size = crtc_state->pch_pfit.size; > + > + width = pfit_size >> 16; > + height = pfit_size & 0xffff; > + } else { > + width = adjusted_mode->crtc_hdisplay; > + height = adjusted_mode->crtc_vdisplay; > + } > > - return skl_update_scaler(state, !state->hw.active, SKL_CRTC_INDEX, > - &state->scaler_state.scaler_id, > - state->pipe_src_w, state->pipe_src_h, > - adjusted_mode->crtc_hdisplay, > - adjusted_mode->crtc_vdisplay, NULL, 0, > - need_scaler); > + return skl_update_scaler(crtc_state, !crtc_state->hw.active, > + SKL_CRTC_INDEX, > + &crtc_state->scaler_state.scaler_id, > + crtc_state->pipe_src_w, crtc_state->pipe_src_h, > + width, height, NULL, 0, > + crtc_state->pch_pfit.enabled); > } > > /** > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index 75438a136d58..6291d3dbc513 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -584,7 +584,6 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc, > struct intel_crtc_state *crtc_state); > > u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center); > -int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state); > void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state); > void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state); > u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index f4dede6253f8..a827eac8acc2 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2307,7 +2307,6 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp, > const struct drm_display_mode *adjusted_mode = > &crtc_state->hw.adjusted_mode; > struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > - int ret; > > if (!drm_mode_is_420_only(info, adjusted_mode) || > !intel_dp_get_colorimetry_status(intel_dp) || > @@ -2316,13 +2315,6 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp, > > crtc_state->output_format = INTEL_OUTPUT_FORMAT_YCBCR420; > > - /* YCBCR 420 output conversion needs a scaler */ > - ret = skl_update_scaler_crtc(crtc_state); > - if (ret) { > - DRM_DEBUG_KMS("Scaler allocation for output failed\n"); > - return ret; > - } > - > intel_pch_panel_fitting(crtc, crtc_state, DRM_MODE_SCALE_FULLSCREEN); > > return 0; > @@ -2400,7 +2392,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, > else > ret = intel_dp_ycbcr420_config(intel_dp, &intel_connector->base, > pipe_config); > - > if (ret) > return ret; > > @@ -2416,12 +2407,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, > intel_fixed_panel_mode(intel_connector->panel.fixed_mode, > adjusted_mode); > > - if (INTEL_GEN(dev_priv) >= 9) { > - ret = skl_update_scaler_crtc(pipe_config); > - if (ret) > - return ret; > - } > - > if (HAS_GMCH(dev_priv)) > intel_gmch_panel_fitting(intel_crtc, pipe_config, > conn_state->scaling_mode); > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > b/drivers/gpu/drm/i915/display/intel_hdmi.c > index e68bafb76cb1..1e42b01045b1 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -2308,12 +2308,6 @@ intel_hdmi_ycbcr420_config(struct drm_connector > *connector, > > config->output_format = INTEL_OUTPUT_FORMAT_YCBCR420; > > - /* YCBCR 420 output conversion needs a scaler */ > - if (skl_update_scaler_crtc(config)) { > - DRM_DEBUG_KMS("Scaler allocation for output failed\n"); > - return false; > - } > - > intel_pch_panel_fitting(intel_crtc, config, > DRM_MODE_SCALE_FULLSCREEN); > > -- > 2.24.1 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
