Commit 04e18e01 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract intel_hdmi_has_audio() 



Pull the "do we want to enable audio?" computation into a small helper
to make intel_hdmi_compute_config() less messy. Will make it easier to
add more checks for this later (eg. we should actually be checking
at the hblank is long enough for audio transmission).

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200904115354.25336-16-ville.syrjala@linux.intel.com


Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4b3bb839

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

+19 −9
Original line number Diff line number Diff line
@@ -2465,6 +2465,23 @@ bool intel_hdmi_limited_color_range(const struct intel_crtc_state *crtc_state, 
	}

}



static bool intel_hdmi_has_audio(struct intel_encoder *encoder,

				 const struct intel_crtc_state *crtc_state,

				 const struct drm_connector_state *conn_state)

{

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);

	const struct intel_digital_connector_state *intel_conn_state =

		to_intel_digital_connector_state(conn_state);



	if (!crtc_state->has_hdmi_sink)

		return false;



	if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)

		return intel_hdmi->has_audio;

	else

		return intel_conn_state->force_audio == HDMI_AUDIO_ON;

}



int intel_hdmi_compute_config(struct intel_encoder *encoder,

			      struct intel_crtc_state *pipe_config,

			      struct drm_connector_state *conn_state)
@@ -2474,8 +2491,6 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, 
	struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;

	struct drm_connector *connector = conn_state->connector;

	struct drm_scdc *scdc = &connector->display_info.hdmi.scdc;

	struct intel_digital_connector_state *intel_conn_state =

		to_intel_digital_connector_state(conn_state);

	int ret;



	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
@@ -2501,13 +2516,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, 
	if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv))

		pipe_config->has_pch_encoder = true;



	if (pipe_config->has_hdmi_sink) {

		if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)

			pipe_config->has_audio = intel_hdmi->has_audio;

		else

	pipe_config->has_audio =

				intel_conn_state->force_audio == HDMI_AUDIO_ON;

	}

		intel_hdmi_has_audio(encoder, pipe_config, conn_state);



	ret = intel_hdmi_compute_clock(encoder, pipe_config);

	if (ret)