Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 15:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Add the pin / port mapping on Intel ILK and VLV

Browse Source 
Intel IronLake and ValleyView platforms have different HDMI widget pin
and digital port mapping from other newer ones.  The recent ones
(HSW+) have NID 0x05 to 0x07 for port B to port D, while these chips
have NID 0x04 to 0x06.

For adapting this mapping, pass the codec object instead of the bus
object to snd_hdac_sync_audio_rate() and snd_hdac_acomp_get_eld() so
that they can check the codec ID and calculate the mapping properly.

The changes in the HDMI codec driver side will follow in the later
patch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2016-03-21 14:41:58 +01:00
parent e85015a379
commit d745f5e7b8
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/sound/hda_i915.h
View File

@ -10,8 +10,8 @@
int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable); int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);
int snd_hdac_display_power(struct hdac_bus *bus, bool enable); int snd_hdac_display_power(struct hdac_bus *bus, bool enable);
int snd_hdac_get_display_clk(struct hdac_bus *bus); int snd_hdac_get_display_clk(struct hdac_bus *bus);
int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid, int rate); int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid, int rate);
int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid, int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid,
bool *audio_enabled, char *buffer, int max_bytes); bool *audio_enabled, char *buffer, int max_bytes);
int snd_hdac_i915_init(struct hdac_bus *bus); int snd_hdac_i915_init(struct hdac_bus *bus);
int snd_hdac_i915_exit(struct hdac_bus *bus); int snd_hdac_i915_exit(struct hdac_bus *bus);
@ -29,12 +29,12 @@ static inline int snd_hdac_get_display_clk(struct hdac_bus *bus)
{ {
return 0; return 0;
} }
static inline int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid, static inline int snd_hdac_sync_audio_rate(struct hdac_device *codec,
int rate) hda_nid_t nid, int rate)
{ {
return 0; return 0;
} }
static inline int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid, static inline int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid,
bool *audio_enabled, char *buffer, bool *audio_enabled, char *buffer,
int max_bytes) int max_bytes)
{ {

45
sound/hda/hdac_i915.c
View File

@ -118,22 +118,40 @@ int snd_hdac_get_display_clk(struct hdac_bus *bus)
} }
EXPORT_SYMBOL_GPL(snd_hdac_get_display_clk); EXPORT_SYMBOL_GPL(snd_hdac_get_display_clk);
/* There is a fixed mapping between audio pin node and display port /* There is a fixed mapping between audio pin node and display port.
* on current Intel platforms: * on SNB, IVY, HSW, BSW, SKL, BXT, KBL:
* Pin Widget 5 - PORT B (port = 1 in i915 driver) * Pin Widget 5 - PORT B (port = 1 in i915 driver)
* Pin Widget 6 - PORT C (port = 2 in i915 driver) * Pin Widget 6 - PORT C (port = 2 in i915 driver)
* Pin Widget 7 - PORT D (port = 3 in i915 driver) * Pin Widget 7 - PORT D (port = 3 in i915 driver)
*
* on VLV, ILK:
* Pin Widget 4 - PORT B (port = 1 in i915 driver)
* Pin Widget 5 - PORT C (port = 2 in i915 driver)
* Pin Widget 6 - PORT D (port = 3 in i915 driver)
*/ */
static int pin2port(hda_nid_t pin_nid) static int pin2port(struct hdac_device *codec, hda_nid_t pin_nid)
{ {
if (WARN_ON(pin_nid < 5 || pin_nid > 7)) int base_nid;
switch (codec->vendor_id) {
case 0x80860054: /* ILK */
case 0x80862804: /* ILK */
case 0x80862882: /* VLV */
base_nid = 3;
break;
default:
base_nid = 4;
break;
}
if (WARN_ON(pin_nid <= base_nid || pin_nid > base_nid + 3))
return -1; return -1;
return pin_nid - 4; return pin_nid - base_nid;
} }
/** /**
* snd_hdac_sync_audio_rate - Set N/CTS based on the sample rate * snd_hdac_sync_audio_rate - Set N/CTS based on the sample rate
* @bus: HDA core bus * @codec: HDA codec
* @nid: the pin widget NID * @nid: the pin widget NID
* @rate: the sample rate to set * @rate: the sample rate to set
* *
@ -143,14 +161,15 @@ static int pin2port(hda_nid_t pin_nid)
* This function sets N/CTS value based on the given sample rate. * This function sets N/CTS value based on the given sample rate.
* Returns zero for success, or a negative error code. * Returns zero for success, or a negative error code.
*/ */
int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid, int rate) int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid, int rate)
{ {
struct hdac_bus *bus = codec->bus;
struct i915_audio_component *acomp = bus->audio_component; struct i915_audio_component *acomp = bus->audio_component;
int port; int port;
if (!acomp || !acomp->ops || !acomp->ops->sync_audio_rate) if (!acomp || !acomp->ops || !acomp->ops->sync_audio_rate)
return -ENODEV; return -ENODEV;
port = pin2port(nid); port = pin2port(codec, nid);
if (port < 0) if (port < 0)
return -EINVAL; return -EINVAL;
return acomp->ops->sync_audio_rate(acomp->dev, port, rate); return acomp->ops->sync_audio_rate(acomp->dev, port, rate);
@ -159,7 +178,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_sync_audio_rate);
/** /**
* snd_hdac_acomp_get_eld - Get the audio state and ELD via component * snd_hdac_acomp_get_eld - Get the audio state and ELD via component
* @bus: HDA core bus * @codec: HDA codec
* @nid: the pin widget NID * @nid: the pin widget NID
* @audio_enabled: the pointer to store the current audio state * @audio_enabled: the pointer to store the current audio state
* @buffer: the buffer pointer to store ELD bytes * @buffer: the buffer pointer to store ELD bytes
@ -177,16 +196,17 @@ EXPORT_SYMBOL_GPL(snd_hdac_sync_audio_rate);
* thus it may be over @max_bytes. If it's over @max_bytes, it implies * thus it may be over @max_bytes. If it's over @max_bytes, it implies
* that only a part of ELD bytes have been fetched. * that only a part of ELD bytes have been fetched.
*/ */
int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid, int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid,
bool *audio_enabled, char *buffer, int max_bytes) bool *audio_enabled, char *buffer, int max_bytes)
{ {
struct hdac_bus *bus = codec->bus;
struct i915_audio_component *acomp = bus->audio_component; struct i915_audio_component *acomp = bus->audio_component;
int port; int port;
if (!acomp || !acomp->ops || !acomp->ops->get_eld) if (!acomp || !acomp->ops || !acomp->ops->get_eld)
return -ENODEV; return -ENODEV;
port = pin2port(nid); port = pin2port(codec, nid);
if (port < 0) if (port < 0)
return -EINVAL; return -EINVAL;
return acomp->ops->get_eld(acomp->dev, port, audio_enabled, return acomp->ops->get_eld(acomp->dev, port, audio_enabled,
@ -286,6 +306,9 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
struct i915_audio_component *acomp; struct i915_audio_component *acomp;
int ret; int ret;
if (WARN_ON(hdac_acomp))
return -EBUSY;
acomp = kzalloc(sizeof(*acomp), GFP_KERNEL); acomp = kzalloc(sizeof(*acomp), GFP_KERNEL);
if (!acomp) if (!acomp)
return -ENOMEM; return -ENOMEM;

4
sound/pci/hda/patch_hdmi.c
View File

@ -1486,7 +1486,7 @@ static void sync_eld_via_acomp(struct hda_codec *codec,
mutex_lock(&per_pin->lock); mutex_lock(&per_pin->lock);
eld->monitor_present = false; eld->monitor_present = false;
size = snd_hdac_acomp_get_eld(&codec->bus->core, per_pin->pin_nid, size = snd_hdac_acomp_get_eld(&codec->core, per_pin->pin_nid,
&eld->monitor_present, eld->eld_buffer, &eld->monitor_present, eld->eld_buffer,
ELD_MAX_SIZE); ELD_MAX_SIZE);
if (size > 0) { if (size > 0) {
@ -1740,7 +1740,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
/* Call sync_audio_rate to set the N/CTS/M manually if necessary */ /* Call sync_audio_rate to set the N/CTS/M manually if necessary */
/* Todo: add DP1.2 MST audio support later */ /* Todo: add DP1.2 MST audio support later */
if (codec_has_acomp(codec)) if (codec_has_acomp(codec))
snd_hdac_sync_audio_rate(&codec->bus->core, pin_nid, runtime->rate); snd_hdac_sync_audio_rate(&codec->core, pin_nid, runtime->rate);
non_pcm = check_non_pcm_per_cvt(codec, cvt_nid); non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);
mutex_lock(&per_pin->lock); mutex_lock(&per_pin->lock);