Skip to content

L
linux
Commit 3787a398 authored by Rakesh Ughreja's avatar Rakesh Ughreja Committed by Takashi Iwai
Browse files
Options

ALSA: hdac: Remove usage of struct hdac_ext_device and use hdac_device instead 

This patch removes the hdac_ext_device structure. The legacy and
enhanced HDaudio capabilities can be handled in a backward-compatible
way without separate definitions.

Follow-up patches in this series handle the bus and driver definitions.
Signed-off-by: default avatarRakesh Ughreja <rakesh.a.ughreja@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ce397d21
Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 253 deletions
include/sound/hdaudio_ext.h
View file @ 3787a398
...@@ -181,48 +181,20 @@ struct hda_dai_map { ...@@ -181,48 +181,20 @@ struct hda_dai_map {
u32 maxbps; u32 maxbps;
}; };
#define HDA_MAX_NIDS 16
/**
* struct hdac_ext_device - HDAC Ext device
*
* @hdac: hdac core device
* @nid_list - the dai map which matches the dai-name with the nid
* @map_cur_idx - the idx in use in dai_map
* @ops - the hda codec ops common to all codec drivers
* @pvt_data - private data, for asoc contains asoc codec object
*/
struct hdac_ext_device {
struct hdac_device hdev;
struct hdac_ext_bus *ebus;
/* soc-dai to nid map */
struct hda_dai_map nid_list[HDA_MAX_NIDS];
unsigned int map_cur_idx;
/* codec ops */
struct hdac_ext_codec_ops ops;
struct snd_card *card;
void *scodec;
void *private_data;
};
struct hdac_ext_dma_params { struct hdac_ext_dma_params {
u32 format; u32 format;
u8 stream_tag; u8 stream_tag;
}; };
#define to_ehdac_device(dev) (container_of((dev), \
struct hdac_ext_device, hdev))
/* /*
* HD-audio codec base driver * HD-audio codec base driver
*/ */
struct hdac_ext_driver { struct hdac_ext_driver {
struct hdac_driver hdac; struct hdac_driver hdac;
int (*probe)(struct hdac_ext_device *dev); int (*probe)(struct hdac_device *dev);
int (*remove)(struct hdac_ext_device *dev); int (*remove)(struct hdac_device *dev);
void (*shutdown)(struct hdac_ext_device *dev); void (*shutdown)(struct hdac_device *dev);
}; };
int snd_hda_ext_driver_register(struct hdac_ext_driver *drv); int snd_hda_ext_driver_register(struct hdac_ext_driver *drv);
......
sound/hda/ext/hdac_ext_bus.c
View file @ 3787a398
...@@ -137,17 +137,16 @@ static void default_release(struct device *dev) ...@@ -137,17 +137,16 @@ static void default_release(struct device *dev)
*/ */
int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr) int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr)
{ {
struct hdac_ext_device *edev;
struct hdac_device *hdev = NULL; struct hdac_device *hdev = NULL;
struct hdac_bus *bus = ebus_to_hbus(ebus); struct hdac_bus *bus = ebus_to_hbus(ebus);
char name[15]; char name[15];
int ret; int ret;
edev = kzalloc(sizeof(*edev), GFP_KERNEL); hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);
if (!edev) if (!hdev)
return -ENOMEM; return -ENOMEM;
hdev = &edev->hdev;
edev->ebus = ebus; hdev->bus = bus;
snprintf(name, sizeof(name), "ehdaudio%dD%d", ebus->idx, addr); snprintf(name, sizeof(name), "ehdaudio%dD%d", ebus->idx, addr);
...@@ -176,10 +175,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_init); ...@@ -176,10 +175,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_init);
*/ */
void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev) void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev)
{ {
struct hdac_ext_device *edev = to_ehdac_device(hdev);
snd_hdac_device_exit(hdev); snd_hdac_device_exit(hdev);
kfree(edev); kfree(hdev);
} }
EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_exit); EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_exit);
...@@ -212,27 +209,25 @@ static inline struct hdac_ext_driver *get_edrv(struct device *dev) ...@@ -212,27 +209,25 @@ static inline struct hdac_ext_driver *get_edrv(struct device *dev)
return edrv; return edrv;
} }
static inline struct hdac_ext_device *get_edev(struct device *dev) static inline struct hdac_device *get_hdev(struct device *dev)
{ {
struct hdac_device *hdev = dev_to_hdac_dev(dev); struct hdac_device *hdev = dev_to_hdac_dev(dev);
struct hdac_ext_device *edev = to_ehdac_device(hdev); return hdev;
return edev;
} }
static int hda_ext_drv_probe(struct device *dev) static int hda_ext_drv_probe(struct device *dev)
{ {
return (get_edrv(dev))->probe(get_edev(dev)); return (get_edrv(dev))->probe(get_hdev(dev));
} }
static int hdac_ext_drv_remove(struct device *dev) static int hdac_ext_drv_remove(struct device *dev)
{ {
return (get_edrv(dev))->remove(get_edev(dev)); return (get_edrv(dev))->remove(get_hdev(dev));
} }
static void hdac_ext_drv_shutdown(struct device *dev) static void hdac_ext_drv_shutdown(struct device *dev)
{ {
return (get_edrv(dev))->shutdown(get_edev(dev)); return (get_edrv(dev))->shutdown(get_hdev(dev));
} }
/** /**
......
sound/soc/codecs/hdac_hdmi.c
View file @ 3787a398
...@@ -85,7 +85,7 @@ struct hdac_hdmi_pin { ...@@ -85,7 +85,7 @@ struct hdac_hdmi_pin {
bool mst_capable; bool mst_capable;
struct hdac_hdmi_port *ports; struct hdac_hdmi_port *ports;
int num_ports; int num_ports;
struct hdac_ext_device *edev; struct hdac_device *hdev;
}; };
struct hdac_hdmi_port { struct hdac_hdmi_port {
...@@ -126,6 +126,9 @@ struct hdac_hdmi_drv_data { ...@@ -126,6 +126,9 @@ struct hdac_hdmi_drv_data {
}; };
struct hdac_hdmi_priv { struct hdac_hdmi_priv {
struct hdac_device *hdev;
struct snd_soc_component *component;
struct snd_card *card;
struct hdac_hdmi_dai_port_map dai_map[HDA_MAX_CVTS]; struct hdac_hdmi_dai_port_map dai_map[HDA_MAX_CVTS];
struct list_head pin_list; struct list_head pin_list;
struct list_head cvt_list; struct list_head cvt_list;
...@@ -139,7 +142,7 @@ struct hdac_hdmi_priv { ...@@ -139,7 +142,7 @@ struct hdac_hdmi_priv {
struct snd_soc_dai_driver *dai_drv; struct snd_soc_dai_driver *dai_drv;
}; };
#define hdev_to_hdmi_priv(_hdev) ((to_ehdac_device(_hdev))->private_data) #define hdev_to_hdmi_priv(_hdev) dev_get_drvdata(&(_hdev)->dev)
static struct hdac_hdmi_pcm * static struct hdac_hdmi_pcm *
hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi, hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi,
...@@ -158,7 +161,7 @@ hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi, ...@@ -158,7 +161,7 @@ hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi,
static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,
struct hdac_hdmi_port *port, bool is_connect) struct hdac_hdmi_port *port, bool is_connect)
{ {
struct hdac_ext_device *edev = port->pin->edev; struct hdac_device *hdev = port->pin->hdev;
if (is_connect) if (is_connect)
snd_soc_dapm_enable_pin(port->dapm, port->jack_pin); snd_soc_dapm_enable_pin(port->dapm, port->jack_pin);
...@@ -172,7 +175,7 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, ...@@ -172,7 +175,7 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,
* ports. * ports.
*/ */
if (pcm->jack_event == 0) { if (pcm->jack_event == 0) {
dev_dbg(&edev->hdev.dev, dev_dbg(&hdev->dev,
"jack report for pcm=%d\n", "jack report for pcm=%d\n",
pcm->pcm_id); pcm->pcm_id);
snd_soc_jack_report(pcm->jack, SND_JACK_AVOUT, snd_soc_jack_report(pcm->jack, SND_JACK_AVOUT,
...@@ -198,19 +201,18 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, ...@@ -198,19 +201,18 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,
/* /*
* Get the no devices that can be connected to a port on the Pin widget. * Get the no devices that can be connected to a port on the Pin widget.
*/ */
static int hdac_hdmi_get_port_len(struct hdac_ext_device *edev, hda_nid_t nid) static int hdac_hdmi_get_port_len(struct hdac_device *hdev, hda_nid_t nid)
{ {
unsigned int caps; unsigned int caps;
unsigned int type, param; unsigned int type, param;
caps = get_wcaps(&edev->hdev, nid); caps = get_wcaps(hdev, nid);
type = get_wcaps_type(caps); type = get_wcaps_type(caps);
if (!(caps & AC_WCAP_DIGITAL) || (type != AC_WID_PIN)) if (!(caps & AC_WCAP_DIGITAL) || (type != AC_WID_PIN))
return 0; return 0;
param = snd_hdac_read_parm_uncached(&edev->hdev, nid, param = snd_hdac_read_parm_uncached(hdev, nid, AC_PAR_DEVLIST_LEN);
AC_PAR_DEVLIST_LEN);
if (param == -1) if (param == -1)
return param; return param;
...@@ -222,10 +224,10 @@ static int hdac_hdmi_get_port_len(struct hdac_ext_device *edev, hda_nid_t nid) ...@@ -222,10 +224,10 @@ static int hdac_hdmi_get_port_len(struct hdac_ext_device *edev, hda_nid_t nid)
* id selected on the pin. Return 0 means the first port entry * id selected on the pin. Return 0 means the first port entry
* is selected or MST is not supported. * is selected or MST is not supported.
*/ */
static int hdac_hdmi_port_select_get(struct hdac_ext_device *edev, static int hdac_hdmi_port_select_get(struct hdac_device *hdev,
struct hdac_hdmi_port *port) struct hdac_hdmi_port *port)
{ {
return snd_hdac_codec_read(&edev->hdev, port->pin->nid, return snd_hdac_codec_read(hdev, port->pin->nid,
0, AC_VERB_GET_DEVICE_SEL, 0); 0, AC_VERB_GET_DEVICE_SEL, 0);
} }
...@@ -233,7 +235,7 @@ static int hdac_hdmi_port_select_get(struct hdac_ext_device *edev, ...@@ -233,7 +235,7 @@ static int hdac_hdmi_port_select_get(struct hdac_ext_device *edev,
* Sets the selected port entry for the configuring Pin widget verb. * Sets the selected port entry for the configuring Pin widget verb.
* returns error if port set is not equal to port get otherwise success * returns error if port set is not equal to port get otherwise success
*/ */
static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev, static int hdac_hdmi_port_select_set(struct hdac_device *hdev,
struct hdac_hdmi_port *port) struct hdac_hdmi_port *port)
{ {
int num_ports; int num_ports;
...@@ -242,8 +244,7 @@ static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev, ...@@ -242,8 +244,7 @@ static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev,
return 0; return 0;
/* AC_PAR_DEVLIST_LEN is 0 based. */ /* AC_PAR_DEVLIST_LEN is 0 based. */
num_ports = hdac_hdmi_get_port_len(edev, port->pin->nid); num_ports = hdac_hdmi_get_port_len(hdev, port->pin->nid);
if (num_ports < 0) if (num_ports < 0)
return -EIO; return -EIO;
/* /*
...@@ -253,13 +254,13 @@ static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev, ...@@ -253,13 +254,13 @@ static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev,
if (num_ports + 1 < port->id) if (num_ports + 1 < port->id)
return 0; return 0;
snd_hdac_codec_write(&edev->hdev, port->pin->nid, 0, snd_hdac_codec_write(hdev, port->pin->nid, 0,
AC_VERB_SET_DEVICE_SEL, port->id); AC_VERB_SET_DEVICE_SEL, port->id);
if (port->id != hdac_hdmi_port_select_get(edev, port)) if (port->id != hdac_hdmi_port_select_get(hdev, port))
return -EIO; return -EIO;
dev_dbg(&edev->hdev.dev, "Selected the port=%d\n", port->id); dev_dbg(&hdev->dev, "Selected the port=%d\n", port->id);
return 0; return 0;
} }
...@@ -277,13 +278,6 @@ static struct hdac_hdmi_pcm *get_hdmi_pcm_from_id(struct hdac_hdmi_priv *hdmi, ...@@ -277,13 +278,6 @@ static struct hdac_hdmi_pcm *get_hdmi_pcm_from_id(struct hdac_hdmi_priv *hdmi,
return NULL; return NULL;
} }
static inline struct hdac_ext_device *to_hda_ext_device(struct device *dev)
{
struct hdac_device *hdev = dev_to_hdac_dev(dev);
return to_ehdac_device(hdev);
}
static unsigned int sad_format(const u8 *sad) static unsigned int sad_format(const u8 *sad)
{ {
return ((sad[0] >> 0x3) & 0x1f); return ((sad[0] >> 0x3) & 0x1f);
...@@ -324,15 +318,13 @@ static int hdac_hdmi_eld_limit_formats(struct snd_pcm_runtime *runtime, ...@@ -324,15 +318,13 @@ static int hdac_hdmi_eld_limit_formats(struct snd_pcm_runtime *runtime,
} }
static void static void
hdac_hdmi_set_dip_index(struct hdac_ext_device *edev, hda_nid_t pin_nid, hdac_hdmi_set_dip_index(struct hdac_device *hdev, hda_nid_t pin_nid,
int packet_index, int byte_index) int packet_index, int byte_index)
{ {
int val; int val;
val = (packet_index << 5) | (byte_index & 0x1f); val = (packet_index << 5) | (byte_index & 0x1f);
snd_hdac_codec_write(hdev, pin_nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);
snd_hdac_codec_write(&edev->hdev, pin_nid, 0,
AC_VERB_SET_HDMI_DIP_INDEX, val);
} }
struct dp_audio_infoframe { struct dp_audio_infoframe {
...@@ -347,14 +339,14 @@ struct dp_audio_infoframe { ...@@ -347,14 +339,14 @@ struct dp_audio_infoframe {
u8 LFEPBL01_LSV36_DM_INH7; u8 LFEPBL01_LSV36_DM_INH7;
}; };
static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *edev, static int hdac_hdmi_setup_audio_infoframe(struct hdac_device *hdev,
struct hdac_hdmi_pcm *pcm, struct hdac_hdmi_port *port) struct hdac_hdmi_pcm *pcm, struct hdac_hdmi_port *port)
{ {
uint8_t buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AUDIO_INFOFRAME_SIZE]; uint8_t buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AUDIO_INFOFRAME_SIZE];
struct hdmi_audio_infoframe frame; struct hdmi_audio_infoframe frame;
struct hdac_hdmi_pin *pin = port->pin; struct hdac_hdmi_pin *pin = port->pin;
struct dp_audio_infoframe dp_ai; struct dp_audio_infoframe dp_ai;
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_cvt *cvt = pcm->cvt; struct hdac_hdmi_cvt *cvt = pcm->cvt;
u8 *dip; u8 *dip;
int ret; int ret;
...@@ -363,11 +355,11 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *edev, ...@@ -363,11 +355,11 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *edev,
u8 conn_type; u8 conn_type;
int channels, ca; int channels, ca;
ca = snd_hdac_channel_allocation(&edev->hdev, port->eld.info.spk_alloc, ca = snd_hdac_channel_allocation(hdev, port->eld.info.spk_alloc,
pcm->channels, pcm->chmap_set, true, pcm->chmap); pcm->channels, pcm->chmap_set, true, pcm->chmap);
channels = snd_hdac_get_active_channels(ca); channels = snd_hdac_get_active_channels(ca);
hdmi->chmap.ops.set_channel_count(&edev->hdev, cvt->nid, channels); hdmi->chmap.ops.set_channel_count(hdev, cvt->nid, channels);
snd_hdac_setup_channel_mapping(&hdmi->chmap, pin->nid, false, ca, snd_hdac_setup_channel_mapping(&hdmi->chmap, pin->nid, false, ca,
pcm->channels, pcm->chmap, pcm->chmap_set); pcm->channels, pcm->chmap, pcm->chmap_set);
...@@ -400,32 +392,31 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *edev, ...@@ -400,32 +392,31 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *edev,
break; break;
default: default:
dev_err(&edev->hdev.dev, "Invalid connection type: %d\n", dev_err(&hdev->dev, "Invalid connection type: %d\n", conn_type);
conn_type);
return -EIO; return -EIO;
} }
/* stop infoframe transmission */ /* stop infoframe transmission */
hdac_hdmi_set_dip_index(edev, pin->nid, 0x0, 0x0); hdac_hdmi_set_dip_index(hdev, pin->nid, 0x0, 0x0);
snd_hdac_codec_write(&edev->hdev, pin->nid, 0, snd_hdac_codec_write(hdev, pin->nid, 0,
AC_VERB_SET_HDMI_DIP_XMIT, AC_DIPXMIT_DISABLE); AC_VERB_SET_HDMI_DIP_XMIT, AC_DIPXMIT_DISABLE);
/* Fill infoframe. Index auto-incremented */ /* Fill infoframe. Index auto-incremented */
hdac_hdmi_set_dip_index(edev, pin->nid, 0x0, 0x0); hdac_hdmi_set_dip_index(hdev, pin->nid, 0x0, 0x0);
if (conn_type == DRM_ELD_CONN_TYPE_HDMI) { if (conn_type == DRM_ELD_CONN_TYPE_HDMI) {
for (i = 0; i < sizeof(buffer); i++) for (i = 0; i < sizeof(buffer); i++)
snd_hdac_codec_write(&edev->hdev, pin->nid, 0, snd_hdac_codec_write(hdev, pin->nid, 0,
AC_VERB_SET_HDMI_DIP_DATA, buffer[i]); AC_VERB_SET_HDMI_DIP_DATA, buffer[i]);
} else { } else {
for (i = 0; i < sizeof(dp_ai); i++) for (i = 0; i < sizeof(dp_ai); i++)
snd_hdac_codec_write(&edev->hdev, pin->nid, 0, snd_hdac_codec_write(hdev, pin->nid, 0,
AC_VERB_SET_HDMI_DIP_DATA, dip[i]); AC_VERB_SET_HDMI_DIP_DATA, dip[i]);
} }
/* Start infoframe */ /* Start infoframe */
hdac_hdmi_set_dip_index(edev, pin->nid, 0x0, 0x0); hdac_hdmi_set_dip_index(hdev, pin->nid, 0x0, 0x0);
snd_hdac_codec_write(&edev->hdev, pin->nid, 0, snd_hdac_codec_write(hdev, pin->nid, 0,
AC_VERB_SET_HDMI_DIP_XMIT, AC_DIPXMIT_BEST); AC_VERB_SET_HDMI_DIP_XMIT, AC_DIPXMIT_BEST);
return 0; return 0;
...@@ -435,12 +426,12 @@ static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai, ...@@ -435,12 +426,12 @@ static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai,
unsigned int tx_mask, unsigned int rx_mask, unsigned int tx_mask, unsigned int rx_mask,
int slots, int slot_width) int slots, int slot_width)
{ {
struct hdac_ext_device *edev = snd_soc_dai_get_drvdata(dai); struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_device *hdev = hdmi->hdev;
struct hdac_hdmi_dai_port_map *dai_map; struct hdac_hdmi_dai_port_map *dai_map;
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
dev_dbg(&edev->hdev.dev, "%s: strm_tag: %d\n", __func__, tx_mask); dev_dbg(&hdev->dev, "%s: strm_tag: %d\n", __func__, tx_mask);
dai_map = &hdmi->dai_map[dai->id]; dai_map = &hdmi->dai_map[dai->id];
...@@ -455,8 +446,8 @@ static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai, ...@@ -455,8 +446,8 @@ static int hdac_hdmi_set_tdm_slot(struct snd_soc_dai *dai,
static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream, static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hparams, struct snd_soc_dai *dai) struct snd_pcm_hw_params *hparams, struct snd_soc_dai *dai)
{ {
struct hdac_ext_device *edev = snd_soc_dai_get_drvdata(dai); struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_device *hdev = hdmi->hdev;
struct hdac_hdmi_dai_port_map *dai_map; struct hdac_hdmi_dai_port_map *dai_map;
struct hdac_hdmi_port *port; struct hdac_hdmi_port *port;
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
...@@ -469,7 +460,7 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream, ...@@ -469,7 +460,7 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream,
return -ENODEV; return -ENODEV;
if ((!port->eld.monitor_present) || (!port->eld.eld_valid)) { if ((!port->eld.monitor_present) || (!port->eld.eld_valid)) {
dev_err(&edev->hdev.dev, dev_err(&hdev->dev,
"device is not configured for this pin:port%d:%d\n", "device is not configured for this pin:port%d:%d\n",
port->pin->nid, port->id); port->pin->nid, port->id);
return -ENODEV; return -ENODEV;
...@@ -489,28 +480,28 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream, ...@@ -489,28 +480,28 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int hdac_hdmi_query_port_connlist(struct hdac_ext_device *edev, static int hdac_hdmi_query_port_connlist(struct hdac_device *hdev,
struct hdac_hdmi_pin *pin, struct hdac_hdmi_pin *pin,
struct hdac_hdmi_port *port) struct hdac_hdmi_port *port)
{ {
if (!(get_wcaps(&edev->hdev, pin->nid) & AC_WCAP_CONN_LIST)) { if (!(get_wcaps(hdev, pin->nid) & AC_WCAP_CONN_LIST)) {
dev_warn(&edev->hdev.dev, dev_warn(&hdev->dev,
"HDMI: pin %d wcaps %#x does not support connection list\n", "HDMI: pin %d wcaps %#x does not support connection list\n",
pin->nid, get_wcaps(&edev->hdev, pin->nid)); pin->nid, get_wcaps(hdev, pin->nid));
return -EINVAL; return -EINVAL;
} }
if (hdac_hdmi_port_select_set(edev, port) < 0) if (hdac_hdmi_port_select_set(hdev, port) < 0)
return -EIO; return -EIO;
port->num_mux_nids = snd_hdac_get_connections(&edev->hdev, pin->nid, port->num_mux_nids = snd_hdac_get_connections(hdev, pin->nid,
port->mux_nids, HDA_MAX_CONNECTIONS); port->mux_nids, HDA_MAX_CONNECTIONS);
if (port->num_mux_nids == 0) if (port->num_mux_nids == 0)
dev_warn(&edev->hdev.dev, dev_warn(&hdev->dev,
"No connections found for pin:port %d:%d\n", "No connections found for pin:port %d:%d\n",
pin->nid, port->id); pin->nid, port->id);
dev_dbg(&edev->hdev.dev, "num_mux_nids %d for pin:port %d:%d\n", dev_dbg(&hdev->dev, "num_mux_nids %d for pin:port %d:%d\n",
port->num_mux_nids, pin->nid, port->id); port->num_mux_nids, pin->nid, port->id);
return port->num_mux_nids; return port->num_mux_nids;
...@@ -526,7 +517,7 @@ static int hdac_hdmi_query_port_connlist(struct hdac_ext_device *edev, ...@@ -526,7 +517,7 @@ static int hdac_hdmi_query_port_connlist(struct hdac_ext_device *edev,
* connected. * connected.
*/ */
static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt( static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt(
struct hdac_ext_device *edev, struct hdac_device *hdev,
struct hdac_hdmi_priv *hdmi, struct hdac_hdmi_priv *hdmi,
struct hdac_hdmi_cvt *cvt) struct hdac_hdmi_cvt *cvt)
{ {
...@@ -541,7 +532,7 @@ static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt( ...@@ -541,7 +532,7 @@ static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt(
list_for_each_entry(port, &pcm->port_list, head) { list_for_each_entry(port, &pcm->port_list, head) {
mutex_lock(&pcm->lock); mutex_lock(&pcm->lock);
ret = hdac_hdmi_query_port_connlist(edev, ret = hdac_hdmi_query_port_connlist(hdev,
port->pin, port); port->pin, port);
mutex_unlock(&pcm->lock); mutex_unlock(&pcm->lock);
if (ret < 0) if (ret < 0)
...@@ -568,8 +559,8 @@ static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt( ...@@ -568,8 +559,8 @@ static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt(
static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream, static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct hdac_ext_device *edev = snd_soc_dai_get_drvdata(dai); struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_device *hdev = hdmi->hdev;
struct hdac_hdmi_dai_port_map *dai_map; struct hdac_hdmi_dai_port_map *dai_map;
struct hdac_hdmi_cvt *cvt; struct hdac_hdmi_cvt *cvt;
struct hdac_hdmi_port *port; struct hdac_hdmi_port *port;
...@@ -578,7 +569,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream, ...@@ -578,7 +569,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
dai_map = &hdmi->dai_map[dai->id]; dai_map = &hdmi->dai_map[dai->id];
cvt = dai_map->cvt; cvt = dai_map->cvt;
port = hdac_hdmi_get_port_from_cvt(edev, hdmi, cvt); port = hdac_hdmi_get_port_from_cvt(hdev, hdmi, cvt);
/* /*
* To make PA and other userland happy. * To make PA and other userland happy.
...@@ -589,7 +580,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream, ...@@ -589,7 +580,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
if ((!port->eld.monitor_present) || if ((!port->eld.monitor_present) ||
(!port->eld.eld_valid)) { (!port->eld.eld_valid)) {
dev_warn(&edev->hdev.dev, dev_warn(&hdev->dev,
"Failed: present?:%d ELD valid?:%d pin:port: %d:%d\n", "Failed: present?:%d ELD valid?:%d pin:port: %d:%d\n",
port->eld.monitor_present, port->eld.eld_valid, port->eld.monitor_present, port->eld.eld_valid,
port->pin->nid, port->id); port->pin->nid, port->id);
...@@ -611,8 +602,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream, ...@@ -611,8 +602,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
static void hdac_hdmi_pcm_close(struct snd_pcm_substream *substream, static void hdac_hdmi_pcm_close(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct hdac_ext_device *edev = snd_soc_dai_get_drvdata(dai); struct hdac_hdmi_priv *hdmi = snd_soc_dai_get_drvdata(dai);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev);
struct hdac_hdmi_dai_port_map *dai_map; struct hdac_hdmi_dai_port_map *dai_map;
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
...@@ -695,10 +685,10 @@ static void hdac_hdmi_fill_route(struct snd_soc_dapm_route *route, ...@@ -695,10 +685,10 @@ static void hdac_hdmi_fill_route(struct snd_soc_dapm_route *route,
route->connected = handler; route->connected = handler;
} }
static struct hdac_hdmi_pcm *hdac_hdmi_get_pcm(struct hdac_ext_device *edev, static struct hdac_hdmi_pcm *hdac_hdmi_get_pcm(struct hdac_device *hdev,
struct hdac_hdmi_port *port) struct hdac_hdmi_port *port)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pcm *pcm = NULL; struct hdac_hdmi_pcm *pcm = NULL;
struct hdac_hdmi_port *p; struct hdac_hdmi_port *p;
...@@ -715,33 +705,32 @@ static struct hdac_hdmi_pcm *hdac_hdmi_get_pcm(struct hdac_ext_device *edev, ...@@ -715,33 +705,32 @@ static struct hdac_hdmi_pcm *hdac_hdmi_get_pcm(struct hdac_ext_device *edev,
return NULL; return NULL;
} }
static void hdac_hdmi_set_power_state(struct hdac_ext_device *edev, static void hdac_hdmi_set_power_state(struct hdac_device *hdev,
hda_nid_t nid, unsigned int pwr_state) hda_nid_t nid, unsigned int pwr_state)
{ {
int count; int count;
unsigned int state; unsigned int state;
if (get_wcaps(&edev->hdev, nid) & AC_WCAP_POWER) { if (get_wcaps(hdev, nid) & AC_WCAP_POWER) {
if (!snd_hdac_check_power_state(&edev->hdev, nid, pwr_state)) { if (!snd_hdac_check_power_state(hdev, nid, pwr_state)) {
for (count = 0; count < 10; count++) { for (count = 0; count < 10; count++) {
snd_hdac_codec_read(&edev->hdev, nid, 0, snd_hdac_codec_read(hdev, nid, 0,
AC_VERB_SET_POWER_STATE, AC_VERB_SET_POWER_STATE,
pwr_state); pwr_state);
state = snd_hdac_sync_power_state(&edev->hdev, state = snd_hdac_sync_power_state(hdev,
nid, pwr_state); nid, pwr_state);
if (!(state & AC_PWRST_ERROR)) if (!(state & AC_PWRST_ERROR))
break; break;
} }
} }
} }
} }
static void hdac_hdmi_set_amp(struct hdac_ext_device *edev, static void hdac_hdmi_set_amp(struct hdac_device *hdev,
hda_nid_t nid, int val) hda_nid_t nid, int val)
{ {
if (get_wcaps(&edev->hdev, nid) & AC_WCAP_OUT_AMP) if (get_wcaps(hdev, nid) & AC_WCAP_OUT_AMP)
snd_hdac_codec_write(&edev->hdev, nid, 0, snd_hdac_codec_write(hdev, nid, 0,
AC_VERB_SET_AMP_GAIN_MUTE, val); AC_VERB_SET_AMP_GAIN_MUTE, val);
} }
...@@ -750,40 +739,40 @@ static int hdac_hdmi_pin_output_widget_event(struct snd_soc_dapm_widget *w, ...@@ -750,40 +739,40 @@ static int hdac_hdmi_pin_output_widget_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kc, int event) struct snd_kcontrol *kc, int event)
{ {
struct hdac_hdmi_port *port = w->priv; struct hdac_hdmi_port *port = w->priv;
struct hdac_ext_device *edev = to_hda_ext_device(w->dapm->dev); struct hdac_device *hdev = dev_to_hdac_dev(w->dapm->dev);
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
dev_dbg(&edev->hdev.dev, "%s: widget: %s event: %x\n", dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
__func__, w->name, event); __func__, w->name, event);
pcm = hdac_hdmi_get_pcm(edev, port); pcm = hdac_hdmi_get_pcm(hdev, port);
if (!pcm) if (!pcm)
return -EIO; return -EIO;
/* set the device if pin is mst_capable */ /* set the device if pin is mst_capable */
if (hdac_hdmi_port_select_set(edev, port) < 0) if (hdac_hdmi_port_select_set(hdev, port) < 0)
return -EIO; return -EIO;
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
hdac_hdmi_set_power_state(edev, port->pin->nid, AC_PWRST_D0); hdac_hdmi_set_power_state(hdev, port->pin->nid, AC_PWRST_D0);
/* Enable out path for this pin widget */ /* Enable out path for this pin widget */
snd_hdac_codec_write(&edev->hdev, port->pin->nid, 0, snd_hdac_codec_write(hdev, port->pin->nid, 0,
AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
hdac_hdmi_set_amp(edev, port->pin->nid, AMP_OUT_UNMUTE); hdac_hdmi_set_amp(hdev, port->pin->nid, AMP_OUT_UNMUTE);
return hdac_hdmi_setup_audio_infoframe(edev, pcm, port); return hdac_hdmi_setup_audio_infoframe(hdev, pcm, port);
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
hdac_hdmi_set_amp(edev, port->pin->nid, AMP_OUT_MUTE); hdac_hdmi_set_amp(hdev, port->pin->nid, AMP_OUT_MUTE);
/* Disable out path for this pin widget */ /* Disable out path for this pin widget */
snd_hdac_codec_write(&edev->hdev, port->pin->nid, 0, snd_hdac_codec_write(hdev, port->pin->nid, 0,
AC_VERB_SET_PIN_WIDGET_CONTROL, 0); AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
hdac_hdmi_set_power_state(edev, port->pin->nid, AC_PWRST_D3); hdac_hdmi_set_power_state(hdev, port->pin->nid, AC_PWRST_D3);
break; break;
} }
...@@ -795,11 +784,11 @@ static int hdac_hdmi_cvt_output_widget_event(struct snd_soc_dapm_widget *w, ...@@ -795,11 +784,11 @@ static int hdac_hdmi_cvt_output_widget_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kc, int event) struct snd_kcontrol *kc, int event)
{ {
struct hdac_hdmi_cvt *cvt = w->priv; struct hdac_hdmi_cvt *cvt = w->priv;
struct hdac_ext_device *edev = to_hda_ext_device(w->dapm->dev); struct hdac_device *hdev = dev_to_hdac_dev(w->dapm->dev);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
dev_dbg(&edev->hdev.dev, "%s: widget: %s event: %x\n", dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
__func__, w->name, event); __func__, w->name, event);
pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, cvt); pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, cvt);
...@@ -808,29 +797,29 @@ static int hdac_hdmi_cvt_output_widget_event(struct snd_soc_dapm_widget *w, ...@@ -808,29 +797,29 @@ static int hdac_hdmi_cvt_output_widget_event(struct snd_soc_dapm_widget *w,
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
hdac_hdmi_set_power_state(edev, cvt->nid, AC_PWRST_D0); hdac_hdmi_set_power_state(hdev, cvt->nid, AC_PWRST_D0);
/* Enable transmission */ /* Enable transmission */
snd_hdac_codec_write(&edev->hdev, cvt->nid, 0, snd_hdac_codec_write(hdev, cvt->nid, 0,
AC_VERB_SET_DIGI_CONVERT_1, 1); AC_VERB_SET_DIGI_CONVERT_1, 1);
/* Category Code (CC) to zero */ /* Category Code (CC) to zero */
snd_hdac_codec_write(&edev->hdev, cvt->nid, 0, snd_hdac_codec_write(hdev, cvt->nid, 0,
AC_VERB_SET_DIGI_CONVERT_2, 0); AC_VERB_SET_DIGI_CONVERT_2, 0);
snd_hdac_codec_write(&edev->hdev, cvt->nid, 0, snd_hdac_codec_write(hdev, cvt->nid, 0,
AC_VERB_SET_CHANNEL_STREAMID, pcm->stream_tag); AC_VERB_SET_CHANNEL_STREAMID, pcm->stream_tag);
snd_hdac_codec_write(&edev->hdev, cvt->nid, 0, snd_hdac_codec_write(hdev, cvt->nid, 0,
AC_VERB_SET_STREAM_FORMAT, pcm->format); AC_VERB_SET_STREAM_FORMAT, pcm->format);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_hdac_codec_write(&edev->hdev, cvt->nid, 0, snd_hdac_codec_write(hdev, cvt->nid, 0,
AC_VERB_SET_CHANNEL_STREAMID, 0); AC_VERB_SET_CHANNEL_STREAMID, 0);
snd_hdac_codec_write(&edev->hdev, cvt->nid, 0, snd_hdac_codec_write(hdev, cvt->nid, 0,
AC_VERB_SET_STREAM_FORMAT, 0); AC_VERB_SET_STREAM_FORMAT, 0);
hdac_hdmi_set_power_state(edev, cvt->nid, AC_PWRST_D3); hdac_hdmi_set_power_state(hdev, cvt->nid, AC_PWRST_D3);
break; break;
} }
...@@ -842,10 +831,10 @@ static int hdac_hdmi_pin_mux_widget_event(struct snd_soc_dapm_widget *w, ...@@ -842,10 +831,10 @@ static int hdac_hdmi_pin_mux_widget_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kc, int event) struct snd_kcontrol *kc, int event)
{ {
struct hdac_hdmi_port *port = w->priv; struct hdac_hdmi_port *port = w->priv;
struct hdac_ext_device *edev = to_hda_ext_device(w->dapm->dev); struct hdac_device *hdev = dev_to_hdac_dev(w->dapm->dev);
int mux_idx; int mux_idx;
dev_dbg(&edev->hdev.dev, "%s: widget: %s event: %x\n", dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
__func__, w->name, event); __func__, w->name, event);
if (!kc) if (!kc)
...@@ -854,11 +843,11 @@ static int hdac_hdmi_pin_mux_widget_event(struct snd_soc_dapm_widget *w, ...@@ -854,11 +843,11 @@ static int hdac_hdmi_pin_mux_widget_event(struct snd_soc_dapm_widget *w,
mux_idx = dapm_kcontrol_get_value(kc); mux_idx = dapm_kcontrol_get_value(kc);
/* set the device if pin is mst_capable */ /* set the device if pin is mst_capable */
if (hdac_hdmi_port_select_set(edev, port) < 0) if (hdac_hdmi_port_select_set(hdev, port) < 0)
return -EIO; return -EIO;
if (mux_idx > 0) { if (mux_idx > 0) {
snd_hdac_codec_write(&edev->hdev, port->pin->nid, 0, snd_hdac_codec_write(hdev, port->pin->nid, 0,
AC_VERB_SET_CONNECT_SEL, (mux_idx - 1)); AC_VERB_SET_CONNECT_SEL, (mux_idx - 1));
} }
...@@ -877,8 +866,8 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol, ...@@ -877,8 +866,8 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol,
struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kcontrol); struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kcontrol);
struct snd_soc_dapm_context *dapm = w->dapm; struct snd_soc_dapm_context *dapm = w->dapm;
struct hdac_hdmi_port *port = w->priv; struct hdac_hdmi_port *port = w->priv;
struct hdac_ext_device *edev = to_hda_ext_device(dapm->dev); struct hdac_device *hdev = dev_to_hdac_dev(dapm->dev);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pcm *pcm = NULL; struct hdac_hdmi_pcm *pcm = NULL;
const char *cvt_name = e->texts[ucontrol->value.enumerated.item[0]]; const char *cvt_name = e->texts[ucontrol->value.enumerated.item[0]];
...@@ -931,12 +920,12 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol, ...@@ -931,12 +920,12 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol,
* care of selecting the right one and leaving all other inputs selected to * care of selecting the right one and leaving all other inputs selected to
* "NONE" * "NONE"
*/ */
static int hdac_hdmi_create_pin_port_muxs(struct hdac_ext_device *edev, static int hdac_hdmi_create_pin_port_muxs(struct hdac_device *hdev,
struct hdac_hdmi_port *port, struct hdac_hdmi_port *port,
struct snd_soc_dapm_widget *widget, struct snd_soc_dapm_widget *widget,
const char *widget_name) const char *widget_name)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pin *pin = port->pin; struct hdac_hdmi_pin *pin = port->pin;
struct snd_kcontrol_new *kc; struct snd_kcontrol_new *kc;
struct hdac_hdmi_cvt *cvt; struct hdac_hdmi_cvt *cvt;
...@@ -948,17 +937,17 @@ static int hdac_hdmi_create_pin_port_muxs(struct hdac_ext_device *edev, ...@@ -948,17 +937,17 @@ static int hdac_hdmi_create_pin_port_muxs(struct hdac_ext_device *edev,
int i = 0; int i = 0;
int num_items = hdmi->num_cvt + 1; int num_items = hdmi->num_cvt + 1;
kc = devm_kzalloc(&edev->hdev.dev, sizeof(*kc), GFP_KERNEL); kc = devm_kzalloc(&hdev->dev, sizeof(*kc), GFP_KERNEL);
if (!kc) if (!kc)
return -ENOMEM; return -ENOMEM;
se = devm_kzalloc(&edev->hdev.dev, sizeof(*se), GFP_KERNEL); se = devm_kzalloc(&hdev->dev, sizeof(*se), GFP_KERNEL);
if (!se) if (!se)
return -ENOMEM; return -ENOMEM;
snprintf(kc_name, NAME_SIZE, "Pin %d port %d Input", snprintf(kc_name, NAME_SIZE, "Pin %d port %d Input",
pin->nid, port->id); pin->nid, port->id);
kc->name = devm_kstrdup(&edev->hdev.dev, kc_name, GFP_KERNEL); kc->name = devm_kstrdup(&hdev->dev, kc_name, GFP_KERNEL);
if (!kc->name) if (!kc->name)
return -ENOMEM; return -ENOMEM;
...@@ -976,35 +965,35 @@ static int hdac_hdmi_create_pin_port_muxs(struct hdac_ext_device *edev, ...@@ -976,35 +965,35 @@ static int hdac_hdmi_create_pin_port_muxs(struct hdac_ext_device *edev,
se->mask = roundup_pow_of_two(se->items) - 1; se->mask = roundup_pow_of_two(se->items) - 1;
sprintf(mux_items, "NONE"); sprintf(mux_items, "NONE");
items[i] = devm_kstrdup(&edev->hdev.dev, mux_items, GFP_KERNEL); items[i] = devm_kstrdup(&hdev->dev, mux_items, GFP_KERNEL);
if (!items[i]) if (!items[i])
return -ENOMEM; return -ENOMEM;
list_for_each_entry(cvt, &hdmi->cvt_list, head) { list_for_each_entry(cvt, &hdmi->cvt_list, head) {
i++; i++;
sprintf(mux_items, "cvt %d", cvt->nid); sprintf(mux_items, "cvt %d", cvt->nid);
items[i] = devm_kstrdup(&edev->hdev.dev, mux_items, GFP_KERNEL); items[i] = devm_kstrdup(&hdev->dev, mux_items, GFP_KERNEL);
if (!items[i]) if (!items[i])
return -ENOMEM; return -ENOMEM;
} }
se->texts = devm_kmemdup(&edev->hdev.dev, items, se->texts = devm_kmemdup(&hdev->dev, items,
(num_items * sizeof(char *)), GFP_KERNEL); (num_items * sizeof(char *)), GFP_KERNEL);
if (!se->texts) if (!se->texts)
return -ENOMEM; return -ENOMEM;
return hdac_hdmi_fill_widget_info(&edev->hdev.dev, widget, return hdac_hdmi_fill_widget_info(&hdev->dev, widget,
snd_soc_dapm_mux, port, widget_name, NULL, kc, 1, snd_soc_dapm_mux, port, widget_name, NULL, kc, 1,
hdac_hdmi_pin_mux_widget_event, hdac_hdmi_pin_mux_widget_event,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_REG); SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_REG);
} }
/* Add cvt <- input <- mux route map */ /* Add cvt <- input <- mux route map */
static void hdac_hdmi_add_pinmux_cvt_route(struct hdac_ext_device *edev, static void hdac_hdmi_add_pinmux_cvt_route(struct hdac_device *hdev,
struct snd_soc_dapm_widget *widgets, struct snd_soc_dapm_widget *widgets,
struct snd_soc_dapm_route *route, int rindex) struct snd_soc_dapm_route *route, int rindex)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
const struct snd_kcontrol_new *kc; const struct snd_kcontrol_new *kc;
struct soc_enum *se; struct soc_enum *se;
int mux_index = hdmi->num_cvt + hdmi->num_ports; int mux_index = hdmi->num_cvt + hdmi->num_ports;
...@@ -1046,8 +1035,8 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm) ...@@ -1046,8 +1035,8 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm)
{ {
struct snd_soc_dapm_widget *widgets; struct snd_soc_dapm_widget *widgets;
struct snd_soc_dapm_route *route; struct snd_soc_dapm_route *route;
struct hdac_ext_device *edev = to_hda_ext_device(dapm->dev); struct hdac_device *hdev = dev_to_hdac_dev(dapm->dev);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct snd_soc_dai_driver *dai_drv = hdmi->dai_drv; struct snd_soc_dai_driver *dai_drv = hdmi->dai_drv;
char widget_name[NAME_SIZE]; char widget_name[NAME_SIZE];
struct hdac_hdmi_cvt *cvt; struct hdac_hdmi_cvt *cvt;
...@@ -1099,7 +1088,7 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm) ...@@ -1099,7 +1088,7 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm)
for (j = 0; j < pin->num_ports; j++) { for (j = 0; j < pin->num_ports; j++) {
sprintf(widget_name, "Pin%d-Port%d Mux", sprintf(widget_name, "Pin%d-Port%d Mux",
pin->nid, pin->ports[j].id); pin->nid, pin->ports[j].id);
ret = hdac_hdmi_create_pin_port_muxs(edev, ret = hdac_hdmi_create_pin_port_muxs(hdev,
&pin->ports[j], &widgets[i], &pin->ports[j], &widgets[i],
widget_name); widget_name);
if (ret < 0) if (ret < 0)
...@@ -1134,7 +1123,7 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm) ...@@ -1134,7 +1123,7 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm)
} }
} }
hdac_hdmi_add_pinmux_cvt_route(edev, widgets, route, i); hdac_hdmi_add_pinmux_cvt_route(hdev, widgets, route, i);
snd_soc_dapm_new_controls(dapm, widgets, snd_soc_dapm_new_controls(dapm, widgets,
((2 * hdmi->num_ports) + hdmi->num_cvt)); ((2 * hdmi->num_ports) + hdmi->num_cvt));
...@@ -1146,9 +1135,9 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm) ...@@ -1146,9 +1135,9 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm)
} }
static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev) static int hdac_hdmi_init_dai_map(struct hdac_device *hdev)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_dai_port_map *dai_map; struct hdac_hdmi_dai_port_map *dai_map;
struct hdac_hdmi_cvt *cvt; struct hdac_hdmi_cvt *cvt;
int dai_id = 0; int dai_id = 0;
...@@ -1164,7 +1153,7 @@ static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev) ...@@ -1164,7 +1153,7 @@ static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev)
dai_id++; dai_id++;
if (dai_id == HDA_MAX_CVTS) { if (dai_id == HDA_MAX_CVTS) {
dev_warn(&edev->hdev.dev, dev_warn(&hdev->dev,
"Max dais supported: %d\n", dai_id); "Max dais supported: %d\n", dai_id);
break; break;
} }
...@@ -1173,9 +1162,9 @@ static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev) ...@@ -1173,9 +1162,9 @@ static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev)
return 0; return 0;
} }
static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid) static int hdac_hdmi_add_cvt(struct hdac_device *hdev, hda_nid_t nid)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_cvt *cvt; struct hdac_hdmi_cvt *cvt;
char name[NAME_SIZE]; char name[NAME_SIZE];
...@@ -1190,10 +1179,10 @@ static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid) ...@@ -1190,10 +1179,10 @@ static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid)
list_add_tail(&cvt->head, &hdmi->cvt_list); list_add_tail(&cvt->head, &hdmi->cvt_list);
hdmi->num_cvt++; hdmi->num_cvt++;
return hdac_hdmi_query_cvt_params(&edev->hdev, cvt); return hdac_hdmi_query_cvt_params(hdev, cvt);
} }
static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev, static int hdac_hdmi_parse_eld(struct hdac_device *hdev,
struct hdac_hdmi_port *port) struct hdac_hdmi_port *port)
{ {
unsigned int ver, mnl; unsigned int ver, mnl;
...@@ -1202,7 +1191,7 @@ static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev, ...@@ -1202,7 +1191,7 @@ static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev,
>> DRM_ELD_VER_SHIFT; >> DRM_ELD_VER_SHIFT;
if (ver != ELD_VER_CEA_861D && ver != ELD_VER_PARTIAL) { if (ver != ELD_VER_CEA_861D && ver != ELD_VER_PARTIAL) {
dev_err(&edev->hdev.dev, "HDMI: Unknown ELD version %d\n", ver); dev_err(&hdev->dev, "HDMI: Unknown ELD version %d\n", ver);
return -EINVAL; return -EINVAL;
} }
...@@ -1210,7 +1199,7 @@ static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev, ...@@ -1210,7 +1199,7 @@ static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev,
DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT; DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT;
if (mnl > ELD_MAX_MNL) { if (mnl > ELD_MAX_MNL) {
dev_err(&edev->hdev.dev, "HDMI: MNL Invalid %d\n", mnl); dev_err(&hdev->dev, "HDMI: MNL Invalid %d\n", mnl);
return -EINVAL; return -EINVAL;
} }
...@@ -1222,8 +1211,8 @@ static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev, ...@@ -1222,8 +1211,8 @@ static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev,
static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,
struct hdac_hdmi_port *port) struct hdac_hdmi_port *port)
{ {
struct hdac_ext_device *edev = pin->edev; struct hdac_device *hdev = pin->hdev;
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
int size = 0; int size = 0;
int port_id = -1; int port_id = -1;
...@@ -1241,14 +1230,14 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, ...@@ -1241,14 +1230,14 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,
if (pin->mst_capable) if (pin->mst_capable)
port_id = port->id; port_id = port->id;
size = snd_hdac_acomp_get_eld(&edev->hdev, pin->nid, port_id, size = snd_hdac_acomp_get_eld(hdev, pin->nid, port_id,
&port->eld.monitor_present, &port->eld.monitor_present,
port->eld.eld_buffer, port->eld.eld_buffer,
ELD_MAX_SIZE); ELD_MAX_SIZE);
if (size > 0) { if (size > 0) {
size = min(size, ELD_MAX_SIZE); size = min(size, ELD_MAX_SIZE);
if (hdac_hdmi_parse_eld(edev, port) < 0) if (hdac_hdmi_parse_eld(hdev, port) < 0)
size = -EINVAL; size = -EINVAL;
} }
...@@ -1260,11 +1249,11 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, ...@@ -1260,11 +1249,11 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,
port->eld.eld_size = 0; port->eld.eld_size = 0;
} }
pcm = hdac_hdmi_get_pcm(edev, port); pcm = hdac_hdmi_get_pcm(hdev, port);
if (!port->eld.monitor_present || !port->eld.eld_valid) { if (!port->eld.monitor_present || !port->eld.eld_valid) {
dev_err(&edev->hdev.dev, "%s: disconnect for pin:port %d:%d\n", dev_err(&hdev->dev, "%s: disconnect for pin:port %d:%d\n",
__func__, pin->nid, port->id); __func__, pin->nid, port->id);
/* /*
...@@ -1316,9 +1305,9 @@ static int hdac_hdmi_add_ports(struct hdac_hdmi_priv *hdmi, ...@@ -1316,9 +1305,9 @@ static int hdac_hdmi_add_ports(struct hdac_hdmi_priv *hdmi,
return 0; return 0;
} }
static int hdac_hdmi_add_pin(struct hdac_ext_device *edev, hda_nid_t nid) static int hdac_hdmi_add_pin(struct hdac_device *hdev, hda_nid_t nid)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pin *pin; struct hdac_hdmi_pin *pin;
int ret; int ret;
...@@ -1328,7 +1317,7 @@ static int hdac_hdmi_add_pin(struct hdac_ext_device *edev, hda_nid_t nid) ...@@ -1328,7 +1317,7 @@ static int hdac_hdmi_add_pin(struct hdac_ext_device *edev, hda_nid_t nid)
pin->nid = nid; pin->nid = nid;
pin->mst_capable = false; pin->mst_capable = false;
pin->edev = edev; pin->hdev = hdev;
ret = hdac_hdmi_add_ports(hdmi, pin); ret = hdac_hdmi_add_ports(hdmi, pin);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -1459,15 +1448,14 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdev, ...@@ -1459,15 +1448,14 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdev,
* Parse all nodes and store the cvt/pin nids in array * Parse all nodes and store the cvt/pin nids in array
* Add one time initialization for pin and cvt widgets * Add one time initialization for pin and cvt widgets
*/ */
static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev, static int hdac_hdmi_parse_and_map_nid(struct hdac_device *hdev,
struct snd_soc_dai_driver **dais, int *num_dais) struct snd_soc_dai_driver **dais, int *num_dais)
{ {
hda_nid_t nid; hda_nid_t nid;
int i, num_nodes; int i, num_nodes;
struct hdac_hdmi_cvt *temp_cvt, *cvt_next; struct hdac_hdmi_cvt *temp_cvt, *cvt_next;
struct hdac_hdmi_pin *temp_pin, *pin_next; struct hdac_hdmi_pin *temp_pin, *pin_next;
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_device *hdev = &edev->hdev;
int ret; int ret;
hdac_hdmi_skl_enable_all_pins(hdev); hdac_hdmi_skl_enable_all_pins(hdev);
...@@ -1492,13 +1480,13 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev, ...@@ -1492,13 +1480,13 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev,
switch (type) { switch (type) {
case AC_WID_AUD_OUT: case AC_WID_AUD_OUT:
ret = hdac_hdmi_add_cvt(edev, nid); ret = hdac_hdmi_add_cvt(hdev, nid);
if (ret < 0) if (ret < 0)
goto free_widgets; goto free_widgets;
break; break;
case AC_WID_PIN: case AC_WID_PIN:
ret = hdac_hdmi_add_pin(edev, nid); ret = hdac_hdmi_add_pin(hdev, nid);
if (ret < 0) if (ret < 0)
goto free_widgets; goto free_widgets;
break; break;
...@@ -1518,7 +1506,7 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev, ...@@ -1518,7 +1506,7 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev,
} }
*num_dais = hdmi->num_cvt; *num_dais = hdmi->num_cvt;
ret = hdac_hdmi_init_dai_map(edev); ret = hdac_hdmi_init_dai_map(hdev);
if (ret < 0) if (ret < 0)
goto free_widgets; goto free_widgets;
...@@ -1544,17 +1532,17 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev, ...@@ -1544,17 +1532,17 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev,
static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe) static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe)
{ {
struct hdac_ext_device *edev = aptr; struct hdac_device *hdev = aptr;
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pin *pin = NULL; struct hdac_hdmi_pin *pin = NULL;
struct hdac_hdmi_port *hport = NULL; struct hdac_hdmi_port *hport = NULL;
struct snd_soc_component *component = edev->scodec; struct snd_soc_component *component = hdmi->component;
int i; int i;
/* Don't know how this mapping is derived */ /* Don't know how this mapping is derived */
hda_nid_t pin_nid = port + 0x04; hda_nid_t pin_nid = port + 0x04;
dev_dbg(&edev->hdev.dev, "%s: for pin:%d port=%d\n", __func__, dev_dbg(&hdev->dev, "%s: for pin:%d port=%d\n", __func__,
pin_nid, pipe); pin_nid, pipe);
/* /*
...@@ -1567,7 +1555,7 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe) ...@@ -1567,7 +1555,7 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe)
SNDRV_CTL_POWER_D0) SNDRV_CTL_POWER_D0)
return; return;
if (atomic_read(&edev->hdev.in_pm)) if (atomic_read(&hdev->in_pm))
return; return;
list_for_each_entry(pin, &hdmi->pin_list, head) { list_for_each_entry(pin, &hdmi->pin_list, head) {
...@@ -1614,15 +1602,15 @@ static struct snd_pcm *hdac_hdmi_get_pcm_from_id(struct snd_soc_card *card, ...@@ -1614,15 +1602,15 @@ static struct snd_pcm *hdac_hdmi_get_pcm_from_id(struct snd_soc_card *card,
/* create jack pin kcontrols */ /* create jack pin kcontrols */
static int create_fill_jack_kcontrols(struct snd_soc_card *card, static int create_fill_jack_kcontrols(struct snd_soc_card *card,
struct hdac_ext_device *edev) struct hdac_device *hdev)
{ {
struct hdac_hdmi_pin *pin; struct hdac_hdmi_pin *pin;
struct snd_kcontrol_new *kc; struct snd_kcontrol_new *kc;
char kc_name[NAME_SIZE], xname[NAME_SIZE]; char kc_name[NAME_SIZE], xname[NAME_SIZE];
char *name; char *name;
int i = 0, j; int i = 0, j;
struct snd_soc_component *component = edev->scodec; struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct snd_soc_component *component = hdmi->component;
kc = devm_kcalloc(component->dev, hdmi->num_ports, kc = devm_kcalloc(component->dev, hdmi->num_ports,
sizeof(*kc), GFP_KERNEL); sizeof(*kc), GFP_KERNEL);
...@@ -1659,8 +1647,8 @@ static int create_fill_jack_kcontrols(struct snd_soc_card *card, ...@@ -1659,8 +1647,8 @@ static int create_fill_jack_kcontrols(struct snd_soc_card *card,
int hdac_hdmi_jack_port_init(struct snd_soc_component *component, int hdac_hdmi_jack_port_init(struct snd_soc_component *component,
struct snd_soc_dapm_context *dapm) struct snd_soc_dapm_context *dapm)
{ {
struct hdac_ext_device *edev = snd_soc_component_get_drvdata(component); struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_device *hdev = hdmi->hdev;
struct hdac_hdmi_pin *pin; struct hdac_hdmi_pin *pin;
struct snd_soc_dapm_widget *widgets; struct snd_soc_dapm_widget *widgets;
struct snd_soc_dapm_route *route; struct snd_soc_dapm_route *route;
...@@ -1715,7 +1703,7 @@ int hdac_hdmi_jack_port_init(struct snd_soc_component *component, ...@@ -1715,7 +1703,7 @@ int hdac_hdmi_jack_port_init(struct snd_soc_component *component,
return ret; return ret;
/* Add Jack Pin switch Kcontrol */ /* Add Jack Pin switch Kcontrol */
ret = create_fill_jack_kcontrols(dapm->card, edev); ret = create_fill_jack_kcontrols(dapm->card, hdev);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -1735,8 +1723,8 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, ...@@ -1735,8 +1723,8 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device,
struct snd_soc_jack *jack) struct snd_soc_jack *jack)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct hdac_ext_device *edev = snd_soc_component_get_drvdata(component); struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_device *hdev = hdmi->hdev;
struct hdac_hdmi_pcm *pcm; struct hdac_hdmi_pcm *pcm;
struct snd_pcm *snd_pcm; struct snd_pcm *snd_pcm;
int err; int err;
...@@ -1758,7 +1746,7 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, ...@@ -1758,7 +1746,7 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device,
if (snd_pcm) { if (snd_pcm) {
err = snd_hdac_add_chmap_ctls(snd_pcm, device, &hdmi->chmap); err = snd_hdac_add_chmap_ctls(snd_pcm, device, &hdmi->chmap);
if (err < 0) { if (err < 0) {
dev_err(&edev->hdev.dev, dev_err(&hdev->dev,
"chmap control add failed with err: %d for pcm: %d\n", "chmap control add failed with err: %d for pcm: %d\n",
err, device); err, device);
kfree(pcm); kfree(pcm);
...@@ -1772,7 +1760,7 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, ...@@ -1772,7 +1760,7 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device,
} }
EXPORT_SYMBOL_GPL(hdac_hdmi_jack_init); EXPORT_SYMBOL_GPL(hdac_hdmi_jack_init);
static void hdac_hdmi_present_sense_all_pins(struct hdac_ext_device *edev, static void hdac_hdmi_present_sense_all_pins(struct hdac_device *hdev,
struct hdac_hdmi_priv *hdmi, bool detect_pin_caps) struct hdac_hdmi_priv *hdmi, bool detect_pin_caps)
{ {
int i; int i;
...@@ -1781,7 +1769,7 @@ static void hdac_hdmi_present_sense_all_pins(struct hdac_ext_device *edev, ...@@ -1781,7 +1769,7 @@ static void hdac_hdmi_present_sense_all_pins(struct hdac_ext_device *edev,
list_for_each_entry(pin, &hdmi->pin_list, head) { list_for_each_entry(pin, &hdmi->pin_list, head) {
if (detect_pin_caps) { if (detect_pin_caps) {
if (hdac_hdmi_get_port_len(edev, pin->nid) == 0) if (hdac_hdmi_get_port_len(hdev, pin->nid) == 0)
pin->mst_capable = false; pin->mst_capable = false;
else else
pin->mst_capable = true; pin->mst_capable = true;
...@@ -1798,68 +1786,68 @@ static void hdac_hdmi_present_sense_all_pins(struct hdac_ext_device *edev, ...@@ -1798,68 +1786,68 @@ static void hdac_hdmi_present_sense_all_pins(struct hdac_ext_device *edev,
static int hdmi_codec_probe(struct snd_soc_component *component) static int hdmi_codec_probe(struct snd_soc_component *component)
{ {
struct hdac_ext_device *edev = snd_soc_component_get_drvdata(component); struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_device *hdev = hdmi->hdev;
struct snd_soc_dapm_context *dapm = struct snd_soc_dapm_context *dapm =
snd_soc_component_get_dapm(component); snd_soc_component_get_dapm(component);
struct hdac_ext_link *hlink = NULL; struct hdac_ext_link *hlink = NULL;
int ret; int ret;
edev->scodec = component; hdmi->component = component;
/* /*
* hold the ref while we probe, also no need to drop the ref on * hold the ref while we probe, also no need to drop the ref on
* exit, we call pm_runtime_suspend() so that will do for us * exit, we call pm_runtime_suspend() so that will do for us
*/ */
hlink = snd_hdac_ext_bus_get_link(edev->ebus, dev_name(&edev->hdev.dev)); hlink = snd_hdac_ext_bus_get_link(hbus_to_ebus(hdev->bus),
dev_name(&hdev->dev));
if (!hlink) { if (!hlink) {
dev_err(&edev->hdev.dev, "hdac link not found\n"); dev_err(&hdev->dev, "hdac link not found\n");
return -EIO; return -EIO;
} }
snd_hdac_ext_bus_link_get(edev->ebus, hlink); snd_hdac_ext_bus_link_get(hbus_to_ebus(hdev->bus), hlink);
ret = create_fill_widget_route_map(dapm); ret = create_fill_widget_route_map(dapm);
if (ret < 0) if (ret < 0)
return ret; return ret;
aops.audio_ptr = edev; aops.audio_ptr = hdev;
ret = snd_hdac_i915_register_notifier(&aops); ret = snd_hdac_i915_register_notifier(&aops);
if (ret < 0) { if (ret < 0) {
dev_err(&edev->hdev.dev, "notifier register failed: err: %d\n", dev_err(&hdev->dev, "notifier register failed: err: %d\n", ret);
ret);
return ret; return ret;
} }
hdac_hdmi_present_sense_all_pins(edev, hdmi, true); hdac_hdmi_present_sense_all_pins(hdev, hdmi, true);
/* Imp: Store the card pointer in hda_codec */ /* Imp: Store the card pointer in hda_codec */
edev->card = dapm->card->snd_card; hdmi->card = dapm->card->snd_card;
/* /*
* hdac_device core already sets the state to active and calls * hdac_device core already sets the state to active and calls
* get_noresume. So enable runtime and set the device to suspend. * get_noresume. So enable runtime and set the device to suspend.
*/ */
pm_runtime_enable(&edev->hdev.dev); pm_runtime_enable(&hdev->dev);
pm_runtime_put(&edev->hdev.dev); pm_runtime_put(&hdev->dev);
pm_runtime_suspend(&edev->hdev.dev); pm_runtime_suspend(&hdev->dev);
return 0; return 0;
} }
static void hdmi_codec_remove(struct snd_soc_component *component) static void hdmi_codec_remove(struct snd_soc_component *component)
{ {
struct hdac_ext_device *edev = snd_soc_component_get_drvdata(component); struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component);
struct hdac_device *hdev = hdmi->hdev;
pm_runtime_disable(&edev->hdev.dev); pm_runtime_disable(&hdev->dev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int hdmi_codec_prepare(struct device *dev) static int hdmi_codec_prepare(struct device *dev)
{ {
struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdev = dev_to_hdac_dev(dev);
struct hdac_device *hdev = &edev->hdev;
pm_runtime_get_sync(&edev->hdev.dev); pm_runtime_get_sync(&hdev->dev);
/* /*
* Power down afg. * Power down afg.
...@@ -1876,16 +1864,15 @@ static int hdmi_codec_prepare(struct device *dev) ...@@ -1876,16 +1864,15 @@ static int hdmi_codec_prepare(struct device *dev)
static void hdmi_codec_complete(struct device *dev) static void hdmi_codec_complete(struct device *dev)
{ {
struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdev = dev_to_hdac_dev(dev);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_device *hdev = &edev->hdev;
/* Power up afg */ /* Power up afg */
snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE, snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE,
AC_PWRST_D0); AC_PWRST_D0);
hdac_hdmi_skl_enable_all_pins(&edev->hdev); hdac_hdmi_skl_enable_all_pins(hdev);
hdac_hdmi_skl_enable_dp12(&edev->hdev); hdac_hdmi_skl_enable_dp12(hdev);
/* /*
* As the ELD notify callback request is not entertained while the * As the ELD notify callback request is not entertained while the
...@@ -1893,9 +1880,9 @@ static void hdmi_codec_complete(struct device *dev) ...@@ -1893,9 +1880,9 @@ static void hdmi_codec_complete(struct device *dev)
* all pins here. pin capablity change is not support, so use the * all pins here. pin capablity change is not support, so use the
* already set pin caps. * already set pin caps.
*/ */
hdac_hdmi_present_sense_all_pins(edev, hdmi, false); hdac_hdmi_present_sense_all_pins(hdev, hdmi, false);
pm_runtime_put_sync(&edev->hdev.dev); pm_runtime_put_sync(&hdev->dev);
} }
#else #else
#define hdmi_codec_prepare NULL #define hdmi_codec_prepare NULL
...@@ -1922,7 +1909,6 @@ static void hdac_hdmi_get_chmap(struct hdac_device *hdev, int pcm_idx, ...@@ -1922,7 +1909,6 @@ static void hdac_hdmi_get_chmap(struct hdac_device *hdev, int pcm_idx,
static void hdac_hdmi_set_chmap(struct hdac_device *hdev, int pcm_idx, static void hdac_hdmi_set_chmap(struct hdac_device *hdev, int pcm_idx,
unsigned char *chmap, int prepared) unsigned char *chmap, int prepared)
{ {
struct hdac_ext_device *edev = to_ehdac_device(hdev);
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pcm *pcm = get_hdmi_pcm_from_id(hdmi, pcm_idx); struct hdac_hdmi_pcm *pcm = get_hdmi_pcm_from_id(hdmi, pcm_idx);
struct hdac_hdmi_port *port; struct hdac_hdmi_port *port;
...@@ -1938,7 +1924,7 @@ static void hdac_hdmi_set_chmap(struct hdac_device *hdev, int pcm_idx, ...@@ -1938,7 +1924,7 @@ static void hdac_hdmi_set_chmap(struct hdac_device *hdev, int pcm_idx,
memcpy(pcm->chmap, chmap, ARRAY_SIZE(pcm->chmap)); memcpy(pcm->chmap, chmap, ARRAY_SIZE(pcm->chmap));
list_for_each_entry(port, &pcm->port_list, head) list_for_each_entry(port, &pcm->port_list, head)
if (prepared) if (prepared)
hdac_hdmi_setup_audio_infoframe(edev, pcm, port); hdac_hdmi_setup_audio_infoframe(hdev, pcm, port);
mutex_unlock(&pcm->lock); mutex_unlock(&pcm->lock);
} }
...@@ -1987,10 +1973,9 @@ static struct hdac_hdmi_drv_data intel_drv_data = { ...@@ -1987,10 +1973,9 @@ static struct hdac_hdmi_drv_data intel_drv_data = {
.vendor_nid = INTEL_VENDOR_NID, .vendor_nid = INTEL_VENDOR_NID,
}; };
static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev) static int hdac_hdmi_dev_probe(struct hdac_device *hdev)
{ {
struct hdac_device *hdev = &edev->hdev; struct hdac_hdmi_priv *hdmi_priv = NULL;
struct hdac_hdmi_priv *hdmi_priv;
struct snd_soc_dai_driver *hdmi_dais = NULL; struct snd_soc_dai_driver *hdmi_dais = NULL;
struct hdac_ext_link *hlink = NULL; struct hdac_ext_link *hlink = NULL;
int num_dais = 0; int num_dais = 0;
...@@ -1999,24 +1984,25 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev) ...@@ -1999,24 +1984,25 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
const struct hda_device_id *hdac_id = hdac_get_device_id(hdev, hdrv); const struct hda_device_id *hdac_id = hdac_get_device_id(hdev, hdrv);
/* hold the ref while we probe */ /* hold the ref while we probe */
hlink = snd_hdac_ext_bus_get_link(edev->ebus, dev_name(&edev->hdev.dev)); hlink = snd_hdac_ext_bus_get_link(hbus_to_ebus(hdev->bus),
dev_name(&hdev->dev));
if (!hlink) { if (!hlink) {
dev_err(&edev->hdev.dev, "hdac link not found\n"); dev_err(&hdev->dev, "hdac link not found\n");
return -EIO; return -EIO;
} }
snd_hdac_ext_bus_link_get(edev->ebus, hlink); snd_hdac_ext_bus_link_get(hbus_to_ebus(hdev->bus), hlink);
hdmi_priv = devm_kzalloc(&hdev->dev, sizeof(*hdmi_priv), GFP_KERNEL); hdmi_priv = devm_kzalloc(&hdev->dev, sizeof(*hdmi_priv), GFP_KERNEL);
if (hdmi_priv == NULL) if (hdmi_priv == NULL)
return -ENOMEM; return -ENOMEM;
edev->private_data = hdmi_priv;
snd_hdac_register_chmap_ops(hdev, &hdmi_priv->chmap); snd_hdac_register_chmap_ops(hdev, &hdmi_priv->chmap);
hdmi_priv->chmap.ops.get_chmap = hdac_hdmi_get_chmap; hdmi_priv->chmap.ops.get_chmap = hdac_hdmi_get_chmap;
hdmi_priv->chmap.ops.set_chmap = hdac_hdmi_set_chmap; hdmi_priv->chmap.ops.set_chmap = hdac_hdmi_set_chmap;
hdmi_priv->chmap.ops.is_pcm_attached = is_hdac_hdmi_pcm_attached; hdmi_priv->chmap.ops.is_pcm_attached = is_hdac_hdmi_pcm_attached;
hdmi_priv->chmap.ops.get_spk_alloc = hdac_hdmi_get_spk_alloc; hdmi_priv->chmap.ops.get_spk_alloc = hdac_hdmi_get_spk_alloc;
hdmi_priv->hdev = hdev;
if (!hdac_id) if (!hdac_id)
return -ENODEV; return -ENODEV;
...@@ -2027,7 +2013,7 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev) ...@@ -2027,7 +2013,7 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
else else
hdmi_priv->drv_data = &intel_drv_data; hdmi_priv->drv_data = &intel_drv_data;
dev_set_drvdata(&hdev->dev, edev); dev_set_drvdata(&hdev->dev, hdmi_priv);
INIT_LIST_HEAD(&hdmi_priv->pin_list); INIT_LIST_HEAD(&hdmi_priv->pin_list);
INIT_LIST_HEAD(&hdmi_priv->cvt_list); INIT_LIST_HEAD(&hdmi_priv->cvt_list);
...@@ -2038,15 +2024,15 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev) ...@@ -2038,15 +2024,15 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
* Turned off in the runtime_suspend during the first explicit * Turned off in the runtime_suspend during the first explicit
* pm_runtime_suspend call. * pm_runtime_suspend call.
*/ */
ret = snd_hdac_display_power(edev->hdev.bus, true); ret = snd_hdac_display_power(hdev->bus, true);
if (ret < 0) { if (ret < 0) {
dev_err(&edev->hdev.dev, dev_err(&hdev->dev,
"Cannot turn on display power on i915 err: %d\n", "Cannot turn on display power on i915 err: %d\n",
ret); ret);
return ret; return ret;
} }
ret = hdac_hdmi_parse_and_map_nid(edev, &hdmi_dais, &num_dais); ret = hdac_hdmi_parse_and_map_nid(hdev, &hdmi_dais, &num_dais);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, dev_err(&hdev->dev,
"Failed in parse and map nid with err: %d\n", ret); "Failed in parse and map nid with err: %d\n", ret);
...@@ -2058,14 +2044,14 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev) ...@@ -2058,14 +2044,14 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
ret = devm_snd_soc_register_component(&hdev->dev, &hdmi_hda_codec, ret = devm_snd_soc_register_component(&hdev->dev, &hdmi_hda_codec,
hdmi_dais, num_dais); hdmi_dais, num_dais);
snd_hdac_ext_bus_link_put(edev->ebus, hlink); snd_hdac_ext_bus_link_put(hbus_to_ebus(hdev->bus), hlink);
return ret; return ret;
} }
static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev) static int hdac_hdmi_dev_remove(struct hdac_device *hdev)
{ {
struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
struct hdac_hdmi_pin *pin, *pin_next; struct hdac_hdmi_pin *pin, *pin_next;
struct hdac_hdmi_cvt *cvt, *cvt_next; struct hdac_hdmi_cvt *cvt, *cvt_next;
struct hdac_hdmi_pcm *pcm, *pcm_next; struct hdac_hdmi_pcm *pcm, *pcm_next;
...@@ -2105,8 +2091,7 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev) ...@@ -2105,8 +2091,7 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int hdac_hdmi_runtime_suspend(struct device *dev) static int hdac_hdmi_runtime_suspend(struct device *dev)
{ {
struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdev = dev_to_hdac_dev(dev);
struct hdac_device *hdev = &edev->hdev;
struct hdac_bus *bus = hdev->bus; struct hdac_bus *bus = hdev->bus;
struct hdac_ext_bus *ebus = hbus_to_ebus(bus); struct hdac_ext_bus *ebus = hbus_to_ebus(bus);
struct hdac_ext_link *hlink = NULL; struct hdac_ext_link *hlink = NULL;
...@@ -2129,7 +2114,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) ...@@ -2129,7 +2114,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
AC_PWRST_D3); AC_PWRST_D3);
err = snd_hdac_display_power(bus, false); err = snd_hdac_display_power(bus, false);
if (err < 0) { if (err < 0) {
dev_err(bus->dev, "Cannot turn on display power on i915\n"); dev_err(dev, "Cannot turn on display power on i915\n");
return err; return err;
} }
...@@ -2146,8 +2131,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) ...@@ -2146,8 +2131,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
static int hdac_hdmi_runtime_resume(struct device *dev) static int hdac_hdmi_runtime_resume(struct device *dev)
{ {
struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdev = dev_to_hdac_dev(dev);
struct hdac_device *hdev = &edev->hdev;
struct hdac_bus *bus = hdev->bus; struct hdac_bus *bus = hdev->bus;
struct hdac_ext_bus *ebus = hbus_to_ebus(bus); struct hdac_ext_bus *ebus = hbus_to_ebus(bus);
struct hdac_ext_link *hlink = NULL; struct hdac_ext_link *hlink = NULL;
...@@ -2169,12 +2153,12 @@ static int hdac_hdmi_runtime_resume(struct device *dev) ...@@ -2169,12 +2153,12 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
err = snd_hdac_display_power(bus, true); err = snd_hdac_display_power(bus, true);
if (err < 0) { if (err < 0) {
dev_err(bus->dev, "Cannot turn on display power on i915\n"); dev_err(dev, "Cannot turn on display power on i915\n");
return err; return err;
} }
hdac_hdmi_skl_enable_all_pins(&edev->hdev); hdac_hdmi_skl_enable_all_pins(hdev);
hdac_hdmi_skl_enable_dp12(&edev->hdev); hdac_hdmi_skl_enable_dp12(hdev);
/* Power up afg */ /* Power up afg */
snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE, snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7