Commit 34682d60 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move has_hdmi_sink out from intel_hdmi_compute_config() 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221107194604.15227-5-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 1dc56576

drivers/gpu/drm/i915/display/g4x_hdmi.c

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,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);

}

drivers/gpu/drm/i915/display/intel_ddi.c

+3 −0
Original line number Diff line number Diff line
@@ -4063,6 +4063,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);

drivers/gpu/drm/i915/display/intel_hdmi.c

+10 −4
Original line number Diff line number Diff line
@@ -2264,11 +2264,20 @@ static bool source_supports_scrambling(struct intel_encoder *encoder) 
	return intel_hdmi_source_max_tmds_clock(encoder) > 340000;

}



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;
@@ -2283,9 +2292,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;

drivers/gpu/drm/i915/display/intel_hdmi.h

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,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);