mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-08 03:46:43 +07:00
f931894194
DP MST provides the capability to send multiple video and audio streams through a single port. This requires the API's between i915 and audio drivers to distinguish between multiple audio capable displays that can be connected to a port. Currently only the port identity is shared in the APIs. This patch adds support for MST with an additional parameter 'int pipe'. The existing parameter 'port' does not change it's meaning. pipe = MST : display pipe that the stream originates from Non-MST : -1 Affected APIs: struct i915_audio_component_ops - int (*sync_audio_rate)(struct device *, int port, int rate); + int (*sync_audio_rate)(struct device *, int port, int pipe, + int rate); - int (*get_eld)(struct device *, int port, bool *enabled, - unsigned char *buf, int max_bytes); + int (*get_eld)(struct device *, int port, int pipe, + bool *enabled, unsigned char *buf, int max_bytes); struct i915_audio_component_audio_ops - void (*pin_eld_notify)(void *audio_ptr, int port); + void (*pin_eld_notify)(void *audio_ptr, int port, int pipe); This patch makes dummy changes in the audio drivers (thanks Libin) for build to succeed. The audio side drivers will send the right 'pipe' values for MST in patches that will follow. v2: Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville) Included Asoc driver API compatibility changes from Jeeja. Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi) Added comment for av_enc_map[] definition. (Takashi) v3: Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville) Renamed get_saved_encoder() to get_saved_enc() to reduce line length v4: Rebased. Parameter check for pipe < -1 values in get_saved_enc() (Ville) Switched to for_each_pipe() in get_saved_enc() (Ville) Renamed 'pipe' to 'dev_id' in audio side code (Takashi) v5: Included a comment for the dev_id arg. (Libin) Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Reviewed-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
126 lines
4.1 KiB
C
126 lines
4.1 KiB
C
/*
|
|
* Copyright © 2014 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _I915_COMPONENT_H_
|
|
#define _I915_COMPONENT_H_
|
|
|
|
/* MAX_PORT is the number of port
|
|
* It must be sync with I915_MAX_PORTS defined i915_drv.h
|
|
* 5 should be enough as only HSW, BDW, SKL need such fix.
|
|
*/
|
|
#define MAX_PORTS 5
|
|
|
|
/**
|
|
* struct i915_audio_component_ops - Ops implemented by i915 driver, called by hda driver
|
|
*/
|
|
struct i915_audio_component_ops {
|
|
/**
|
|
* @owner: i915 module
|
|
*/
|
|
struct module *owner;
|
|
/**
|
|
* @get_power: get the POWER_DOMAIN_AUDIO power well
|
|
*
|
|
* Request the power well to be turned on.
|
|
*/
|
|
void (*get_power)(struct device *);
|
|
/**
|
|
* @put_power: put the POWER_DOMAIN_AUDIO power well
|
|
*
|
|
* Allow the power well to be turned off.
|
|
*/
|
|
void (*put_power)(struct device *);
|
|
/**
|
|
* @codec_wake_override: Enable/disable codec wake signal
|
|
*/
|
|
void (*codec_wake_override)(struct device *, bool enable);
|
|
/**
|
|
* @get_cdclk_freq: Get the Core Display Clock in kHz
|
|
*/
|
|
int (*get_cdclk_freq)(struct device *);
|
|
/**
|
|
* @sync_audio_rate: set n/cts based on the sample rate
|
|
*
|
|
* Called from audio driver. After audio driver sets the
|
|
* sample rate, it will call this function to set n/cts
|
|
*/
|
|
int (*sync_audio_rate)(struct device *, int port, int pipe, int rate);
|
|
/**
|
|
* @get_eld: fill the audio state and ELD bytes for the given port
|
|
*
|
|
* Called from audio driver to get the HDMI/DP audio state of the given
|
|
* digital port, and also fetch ELD bytes to the given pointer.
|
|
*
|
|
* It returns the byte size of the original ELD (not the actually
|
|
* copied size), zero for an invalid ELD, or a negative error code.
|
|
*
|
|
* Note that the returned size may be over @max_bytes. Then it
|
|
* implies that only a part of ELD has been copied to the buffer.
|
|
*/
|
|
int (*get_eld)(struct device *, int port, int pipe, bool *enabled,
|
|
unsigned char *buf, int max_bytes);
|
|
};
|
|
|
|
/**
|
|
* struct i915_audio_component_audio_ops - Ops implemented by hda driver, called by i915 driver
|
|
*/
|
|
struct i915_audio_component_audio_ops {
|
|
/**
|
|
* @audio_ptr: Pointer to be used in call to pin_eld_notify
|
|
*/
|
|
void *audio_ptr;
|
|
/**
|
|
* @pin_eld_notify: Notify the HDA driver that pin sense and/or ELD information has changed
|
|
*
|
|
* Called when the i915 driver has set up audio pipeline or has just
|
|
* begun to tear it down. This allows the HDA driver to update its
|
|
* status accordingly (even when the HDA controller is in power save
|
|
* mode).
|
|
*/
|
|
void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
|
|
};
|
|
|
|
/**
|
|
* struct i915_audio_component - Used for direct communication between i915 and hda drivers
|
|
*/
|
|
struct i915_audio_component {
|
|
/**
|
|
* @dev: i915 device, used as parameter for ops
|
|
*/
|
|
struct device *dev;
|
|
/**
|
|
* @aud_sample_rate: the array of audio sample rate per port
|
|
*/
|
|
int aud_sample_rate[MAX_PORTS];
|
|
/**
|
|
* @ops: Ops implemented by i915 driver, called by hda driver
|
|
*/
|
|
const struct i915_audio_component_ops *ops;
|
|
/**
|
|
* @audio_ops: Ops implemented by hda driver, called by i915 driver
|
|
*/
|
|
const struct i915_audio_component_audio_ops *audio_ops;
|
|
};
|
|
|
|
#endif /* _I915_COMPONENT_H_ */
|