Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1a3acea authored by Pandiyan, Dhinakaran's avatar Pandiyan, Dhinakaran Committed by Rodrigo Vivi
Browse files

drm/i915: Move audio_connector to intel_encoder 



With DP MST, a digital_port can carry more than one audio stream. Hence,
more than one audio_connector needs to be attached to intel_digital_port in
such cases. However, each stream is associated with an unique encoder. So,
instead of creating an array of audio_connectors per port, move
audio_connector from struct intel_digital_port to struct intel_encoder.
This also simplifies access to the right audio_connector from codec
functions in intel_audio.c that receive intel_encoder.

v2: Removed locals that are not needed anymore.

v3: No code change except for minor change in context.

Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarLyude <cpaul@redhat.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474334681-22690-5-git-send-email-dhinakaran.pandiyan@intel.com
parent d8dee42a

drivers/gpu/drm/i915/intel_audio.c

+4 −8
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 
	struct drm_connector *connector;

	struct drm_i915_private *dev_priv = to_i915(encoder->dev);

	struct i915_audio_component *acomp = dev_priv->audio_component;

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	enum port port = intel_encoder->port;



	connector = drm_select_eld(encoder);
@@ -515,7 +514,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 
						     adjusted_mode);



	mutex_lock(&dev_priv->av_mutex);

	intel_dig_port->audio_connector = connector;

	intel_encoder->audio_connector = connector;

	/* referred in audio callbacks */

	dev_priv->dig_port_map[port] = intel_encoder;

	mutex_unlock(&dev_priv->av_mutex);
@@ -536,14 +535,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) 
	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_i915_private *dev_priv = to_i915(encoder->dev);

	struct i915_audio_component *acomp = dev_priv->audio_component;

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	enum port port = intel_encoder->port;



	if (dev_priv->display.audio_codec_disable)

		dev_priv->display.audio_codec_disable(intel_encoder);



	mutex_lock(&dev_priv->av_mutex);

	intel_dig_port->audio_connector = NULL;

	intel_encoder->audio_connector = NULL;

	dev_priv->dig_port_map[port] = NULL;

	mutex_unlock(&dev_priv->av_mutex);
@@ -704,7 +702,6 @@ static int i915_audio_component_get_eld(struct device *kdev, int port, 
{

	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);

	struct intel_encoder *intel_encoder;

	struct intel_digital_port *intel_dig_port;

	const u8 *eld;

	int ret = -EINVAL;
@@ -713,10 +710,9 @@ static int i915_audio_component_get_eld(struct device *kdev, int port, 
	/* intel_encoder might be NULL for DP MST */

	if (intel_encoder) {

		ret = 0;

		intel_dig_port = enc_to_dig_port(&intel_encoder->base);

		*enabled = intel_dig_port->audio_connector != NULL;

		*enabled = intel_encoder->audio_connector != NULL;

		if (*enabled) {

			eld = intel_dig_port->audio_connector->eld;

			eld = intel_encoder->audio_connector->eld;

			ret = drm_eld_size(eld);

			memcpy(buf, eld, min(max_bytes, ret));

		}

drivers/gpu/drm/i915/intel_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ struct intel_encoder { 
	void (*suspend)(struct intel_encoder *);

	int crtc_mask;

	enum hpd_pin hpd_pin;

	/* for communication with audio component; protected by av_mutex */

	const struct drm_connector *audio_connector;

};



struct intel_panel {
@@ -960,8 +962,6 @@ struct intel_digital_port { 
	enum irqreturn (*hpd_pulse)(struct intel_digital_port *, bool);

	bool release_cl2_override;

	uint8_t max_lanes;

	/* for communication with audio component; protected by av_mutex */

	const struct drm_connector *audio_connector;

};



struct intel_dp_mst_encoder {