On Sat, Oct 03, 2020 at 04:07:08AM +0300, Imre Deak wrote:
> Move the checks to decide whether a fastset is possible during the
> initial commit to an encoder hook. This check is really encoder specific
> and the next patch will also require this adding a DP encoder specific
> check.
>
> v2: Fix negated condition in gen11_dsi_initial_fastset_check().
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 14 +++++++++
> drivers/gpu/drm/i915/display/intel_ddi.c | 10 +++++++
> drivers/gpu/drm/i915/display/intel_display.c | 29 +++++++++----------
> .../drm/i915/display/intel_display_types.h | 8 +++++
> drivers/gpu/drm/i915/display/intel_dp.c | 22 ++++++++++++++
> drivers/gpu/drm/i915/display/intel_dp.h | 3 ++
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++++++
> 7 files changed, 80 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index fe946a2e2082..4400e83f783f 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -1668,6 +1668,19 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,
> return ret;
> }
>
> +static bool gen11_dsi_initial_fastset_check(struct intel_encoder *encoder,
> + struct intel_crtc_state *crtc_state)
> +{
> + if (crtc_state->dsc.compression_enable) {
> + drm_dbg_kms(encoder->base.dev, "Forcing full modeset due to DSC being enabled\n");
> + crtc_state->uapi.mode_changed = true;
> +
> + return false;
> + }
> +
> + return true;
> +}
> +
> static void gen11_dsi_encoder_destroy(struct drm_encoder *encoder)
> {
> intel_encoder_destroy(encoder);
> @@ -1923,6 +1936,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
> encoder->update_pipe = intel_panel_update_backlight;
> encoder->compute_config = gen11_dsi_compute_config;
> encoder->get_hw_state = gen11_dsi_get_hw_state;
> + encoder->initial_fastset_check = gen11_dsi_initial_fastset_check;
> encoder->type = INTEL_OUTPUT_DSI;
> encoder->cloneable = 0;
> encoder->pipe_mask = ~0;
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index b4c520348b3b..4e54c55ec99f 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -4564,6 +4564,15 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
> intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC);
> }
>
> +static bool intel_ddi_initial_fastset_check(struct intel_encoder *encoder,
> + struct intel_crtc_state *crtc_state)
> +{
> + if (intel_crtc_has_dp_encoder(crtc_state))
> + return intel_dp_initial_fastset_check(encoder, crtc_state);
> +
> + return true;
> +}
> +
> static enum intel_output_type
> intel_ddi_compute_output_type(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> @@ -5173,6 +5182,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> encoder->update_pipe = intel_ddi_update_pipe;
> encoder->get_hw_state = intel_ddi_get_hw_state;
> encoder->get_config = intel_ddi_get_config;
> + encoder->initial_fastset_check = intel_ddi_initial_fastset_check;
> encoder->suspend = intel_dp_encoder_suspend;
> encoder->get_power_domains = intel_ddi_get_power_domains;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 753f202ef6a0..31be63225b10 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -17951,6 +17951,8 @@ static int intel_initial_commit(struct drm_device *dev)
> }
>
> if (crtc_state->hw.active) {
> + struct intel_encoder *encoder;
> +
> /*
> * We've not yet detected sink capabilities
> * (audio,infoframes,etc.) and thus we don't want to
> @@ -17972,22 +17974,17 @@ static int intel_initial_commit(struct drm_device *dev)
> */
> crtc_state->uapi.color_mgmt_changed = true;
>
> - /*
> - * FIXME hack to force full modeset when DSC is being
> - * used.
> - *
> - * As long as we do not have full state readout and
> - * config comparison of crtc_state->dsc, we have no way
> - * to ensure reliable fastset. Remove once we have
> - * readout for DSC.
> - */
> - if (crtc_state->dsc.compression_enable) {
> - ret = drm_atomic_add_affected_connectors(state,
> - &crtc->base);
> - if (ret)
> - goto out;
> - crtc_state->uapi.mode_changed = true;
> - drm_dbg_kms(dev, "Force full modeset for DSC\n");
> + for_each_intel_encoder_mask(dev, encoder,
> + crtc_state->uapi.encoder_mask) {
> + if (encoder->initial_fastset_check &&
> + !encoder->initial_fastset_check(encoder, crtc_state)) {
> + ret = drm_atomic_add_affected_connectors(state,
> + &crtc->base);
I'd probably have stuffed that into the hook as well, but
I guess it can stay here too.
> + if (ret)
> + goto out;
> +
> + break;
The break seems wrong. Why wouldn't we want to check all encoders?
Not that there should be cloning with DP/DSI where we need the check,
but don't see what the point of the break is either way.
Otherwise
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> + }
> }
> }
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index d5dc18cb8c39..5297b2f08ff9 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -187,6 +187,14 @@ struct intel_encoder {
> * be set correctly before calling this function. */
> void (*get_config)(struct intel_encoder *,
> struct intel_crtc_state *pipe_config);
> +
> + /*
> + * Optional hook, returning true if this encoder allows a fastset
> + * during the initial commit, false otherwise.
> + */
> + bool (*initial_fastset_check)(struct intel_encoder *encoder,
> + struct intel_crtc_state *crtc_state);
> +
> /*
> * Acquires the power domains needed for an active encoder during
> * hardware state readout.
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 7429597b57be..d33a3d9fdc3a 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -3703,6 +3703,27 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
> }
> }
>
> +bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
> + struct intel_crtc_state *crtc_state)
> +{
> + struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> +
> + /*
> + * FIXME hack to force full modeset when DSC is being used.
> + *
> + * As long as we do not have full state readout and config comparison
> + * of crtc_state->dsc, we have no way to ensure reliable fastset.
> + * Remove once we have readout for DSC.
> + */
> + if (crtc_state->dsc.compression_enable) {
> + drm_dbg_kms(&i915->drm, "Forcing full modeset due to DSC being enabled\n");
> + crtc_state->uapi.mode_changed = true;
> + return false;
> + }
> +
> + return true;
> +}
> +
> static void intel_disable_dp(struct intel_atomic_state *state,
> struct intel_encoder *encoder,
> const struct intel_crtc_state *old_crtc_state,
> @@ -8057,6 +8078,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
> intel_encoder->compute_config = intel_dp_compute_config;
> intel_encoder->get_hw_state = intel_dp_get_hw_state;
> intel_encoder->get_config = intel_dp_get_config;
> + intel_encoder->initial_fastset_check = intel_dp_initial_fastset_check;
> intel_encoder->update_pipe = intel_panel_update_backlight;
> intel_encoder->suspend = intel_dp_encoder_suspend;
> if (IS_CHERRYVIEW(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
> index 66854aab9887..977585aea3c8 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.h
> +++ b/drivers/gpu/drm/i915/display/intel_dp.h
> @@ -141,4 +141,7 @@ void intel_ddi_update_pipe(struct intel_atomic_state *state,
> int intel_dp_init_hdcp(struct intel_digital_port *dig_port,
> struct intel_connector *intel_connector);
>
> +bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
> + struct intel_crtc_state *crtc_state);
> +
> #endif /* __INTEL_DP_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 82f38c386dbd..e948aacbd4ab 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -591,6 +591,15 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
> intel_ddi_get_config(&dig_port->base, pipe_config);
> }
>
> +static bool intel_dp_mst_initial_fastset_check(struct intel_encoder *encoder,
> + struct intel_crtc_state *crtc_state)
> +{
> + struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
> + struct intel_digital_port *dig_port = intel_mst->primary;
> +
> + return intel_dp_initial_fastset_check(&dig_port->base, crtc_state);
> +}
> +
> static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)
> {
> struct intel_connector *intel_connector = to_intel_connector(connector);
> @@ -897,6 +906,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *dig_port, enum pipe
> intel_encoder->enable = intel_mst_enable_dp;
> intel_encoder->get_hw_state = intel_dp_mst_enc_get_hw_state;
> intel_encoder->get_config = intel_dp_mst_enc_get_config;
> + intel_encoder->initial_fastset_check = intel_dp_mst_initial_fastset_check;
>
> return intel_mst;
>
> --
> 2.25.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
