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

Commit f0675d4a authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

drm/i915: Drop port_mst_index parameter from pin/eld callback 



The port_mst_index parameter was reserved for future use, but
maintainers prefer to add it later when it is actually used.

[Note: this is an update patch to commit [51e1d83c: drm/i915: Call
 audio pin/ELD notify function] where I mistakenly applied the older
 version.  Jani and Daniel's review tags were to the latest version,
 so I add them below, too -- tiwai]

Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6869de38

drivers/gpu/drm/i915/intel_audio.c

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 
		dev_priv->display.audio_codec_enable(connector, intel_encoder, mode);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port, 0);

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);

}



/**
@@ -447,7 +447,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) 
		dev_priv->display.audio_codec_disable(intel_encoder);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port, 0);

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);

}



/**

include/drm/i915_component.h

+1 −2
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ struct i915_audio_component { 
		 * pin sense and/or ELD information has changed.

		 * @audio_ptr:		HDA driver object

		 * @port:		Which port has changed (PORTA / PORTB / PORTC etc)

		 * @port_mst_index:	Index within that port, for DisplayPort multistreaming

		 */

		void (*pin_eld_notify)(void *audio_ptr, int port, int port_mst_index);

		void (*pin_eld_notify)(void *audio_ptr, int port);

	} *audio_ops;

};

sound/pci/hda/patch_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2324,7 +2324,7 @@ static void haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg, 
	snd_hda_codec_set_power_to_all(codec, fg, power_state);

}



static void intel_pin_eld_notify(void *audio_ptr, int port, int port_mst_index)

static void intel_pin_eld_notify(void *audio_ptr, int port)

{

	struct hda_codec *codec = audio_ptr;

	int pin_nid = port + 0x04;