On Mon, 07 Nov 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> We'll be wanting to compute has_hdmi_sink a bit differently
> for some platforms. To that end compute it in the encoder
> .compute_config_hook() before we call intel_hdmi_compute_config().
> intel_hdmi_compute_has_hdmi_sink() will do the basic lifting
> beyond any platform specific stuff.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
But, uh, I don't want to dig into patch 5 right now, and this one
doesn't really make sense without that... in the mean time the first
three look like could be merged.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +++
> drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++
> drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++----
> drivers/gpu/drm/i915/display/intel_hdmi.h | 3 +++
> 4 files changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> index 3d09359d7337..fd23aa03cdc4 100644
> --- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> @@ -87,6 +87,9 @@ static int g4x_hdmi_compute_config(struct intel_encoder *encoder,
> if (HAS_PCH_SPLIT(i915))
> crtc_state->has_pch_encoder = true;
>
> + crtc_state->has_hdmi_sink =
> + intel_hdmi_compute_has_hdmi_sink(encoder, crtc_state, conn_state);
> +
> return intel_hdmi_compute_config(encoder, crtc_state, conn_state);
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index e95bde5cf060..5ebfbe7b81b4 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3638,6 +3638,9 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,
> pipe_config->cpu_transcoder = TRANSCODER_EDP;
>
> if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI)) {
> + pipe_config->has_hdmi_sink =
> + intel_hdmi_compute_has_hdmi_sink(encoder, pipe_config, conn_state);
> +
> ret = intel_hdmi_compute_config(encoder, pipe_config, conn_state);
> } else {
> ret = intel_dp_compute_config(encoder, pipe_config, conn_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 31927f8238d1..2425a9f59b90 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2237,11 +2237,20 @@ static bool intel_hdmi_is_cloned(const struct intel_crtc_state *crtc_state)
> !is_power_of_2(crtc_state->uapi.encoder_mask);
> }
>
> +bool intel_hdmi_compute_has_hdmi_sink(struct intel_encoder *encoder,
> + const struct intel_crtc_state *crtc_state,
> + const struct drm_connector_state *conn_state)
> +{
> + struct intel_hdmi *hdmi = enc_to_intel_hdmi(encoder);
> +
> + return intel_has_hdmi_sink(hdmi, conn_state) &&
> + !intel_hdmi_is_cloned(crtc_state);
> +}
> +
> int intel_hdmi_compute_config(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config,
> struct drm_connector_state *conn_state)
> {
> - struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
> struct drm_connector *connector = conn_state->connector;
> @@ -2252,9 +2261,6 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
> return -EINVAL;
>
> pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
> - pipe_config->has_hdmi_sink =
> - intel_has_hdmi_sink(intel_hdmi, conn_state) &&
> - !intel_hdmi_is_cloned(pipe_config);
>
> if (pipe_config->has_hdmi_sink)
> pipe_config->has_infoframe = true;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
> index 774dda2376ed..dd08b4004c59 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
> @@ -23,6 +23,9 @@ union hdmi_infoframe;
>
> void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
> struct intel_connector *intel_connector);
> +bool intel_hdmi_compute_has_hdmi_sink(struct intel_encoder *encoder,
> + const struct intel_crtc_state *crtc_state,
> + const struct drm_connector_state *conn_state);
> int intel_hdmi_compute_config(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config,
> struct drm_connector_state *conn_state);
--
Jani Nikula, Intel Open Source Graphics Center
