[alsa-devel] [Intel-gfx] [PATCH 1/4] drm/i915: Add audio pin sense / ELD callback

Jani Nikula jani.nikula at linux.intel.com
Thu Aug 27 16:24:53 CEST 2015


On Wed, 26 Aug 2015, David Henningsson <david.henningsson at canonical.com> wrote:
> On 2015-08-26 10:33, Daniel Vetter wrote:
>> On Wed, Aug 19, 2015 at 10:48:55AM +0200, David Henningsson wrote:
>>> This callback will be called by the i915 driver to notify the hda
>>> driver that its HDMI information needs to be refreshed, i e,
>>> that audio output is now available (or unavailable) - usually as a
>>> result of a monitor being plugged in (or unplugged).
>>>
>>> Signed-off-by: David Henningsson <david.henningsson at canonical.com>
>>> ---
>>>   include/drm/i915_component.h | 12 ++++++++++++
>>>   1 file changed, 12 insertions(+)
>>>
>>> diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
>>> index c9a8b64..ab5bde37 100644
>>> --- a/include/drm/i915_component.h
>>> +++ b/include/drm/i915_component.h
>>> @@ -34,6 +34,18 @@ struct i915_audio_component {
>>>   		void (*codec_wake_override)(struct device *, bool enable);
>>>   		int (*get_cdclk_freq)(struct device *);
>>>   	} *ops;
>>> +
>>> +	const struct i915_audio_component_audio_ops {
>>> +		void *audio_ptr;
>>> +		/**
>>> +		 * Call from i915 driver, notifying the HDA driver that
>>> +		 * 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);
>>> +	} *audio_ops;
>>
>> This won't work as proper kerneldoc, but you get away with it since it's
>> not pulled into the drm.tmpl. See my comments for the new set_audio_rate
>> callback.
>
> Sorry, my google failed me, so I can't find your comments for the 
> set_audio_rate callback.

It's on the related thread [1], specifically the subthread starting at
[2]. I guess there's no direct overlap between the two series, but it
would be helpful if you can look at each other's work so there's no
surprises.

BR,
Jani.


[1] http://mid.gmane.org/1439880714-40931-1-git-send-email-libin.yang@intel.com
[2] http://mid.gmane.org/20150826081735.GZ20434@phenom.ffwll.local

>
> Apart from the kerneldoc issue, are you okay with acking the patch, at 
> least the first two i915 ones, and agree with Takashi which tree this 
> should go through?
>
> -- 
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic

-- 
Jani Nikula, Intel Open Source Technology Center


More information about the Alsa-devel mailing list