ASoC: hdac_hdmi: use audio component framework to read ELD (fe27f4e0) · Commits · 戴 / test

sound/soc/codecs/hdac_hdmi.c

+56 −145

Original line number	Diff line number	Diff line
		@@ -46,6 +46,10 @@
		#define ELD_MAX_SIZE 256
		#define ELD_FIXED_BYTES 20

		#define ELD_VER_CEA_861D 2
		#define ELD_VER_PARTIAL 31
		#define ELD_MAX_MNL 16

		struct hdac_hdmi_cvt_params {
		unsigned int channels_min;
		unsigned int channels_max;
		@@ -81,8 +85,6 @@ struct hdac_hdmi_pin {
		hda_nid_t mux_nids[HDA_MAX_CONNECTIONS];
		struct hdac_hdmi_eld eld;
		struct hdac_ext_device *edev;
		int repoll_count;
		struct delayed_work work;
		struct mutex lock;
		bool chmap_set;
		unsigned char chmap[8]; /* ALSA API channel-map */
		@@ -173,80 +175,6 @@ format_constraint:

		}

		/* HDMI ELD routines */
		static unsigned int hdac_hdmi_get_eld_data(struct hdac_device *codec,
		hda_nid_t nid, int byte_index)
		{
		unsigned int val;

		val = snd_hdac_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_ELDD,
		byte_index);

		dev_dbg(&codec->dev, "HDMI: ELD data byte %d: 0x%x\n",
		byte_index, val);

		return val;
		}

		static int hdac_hdmi_get_eld_size(struct hdac_device *codec, hda_nid_t nid)
		{
		return snd_hdac_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,
		AC_DIPSIZE_ELD_BUF);
		}

		/*
		* This function queries the ELD size and ELD data and fills in the buffer
		* passed by user
		*/
		static int hdac_hdmi_get_eld(struct hdac_device *codec, hda_nid_t nid,
		unsigned char buf, int eld_size)
		{
		int i, size, ret = 0;

		/*
		* ELD size is initialized to zero in caller function. If no errors and
		* ELD is valid, actual eld_size is assigned.
		*/

		size = hdac_hdmi_get_eld_size(codec, nid);
		if (size < ELD_FIXED_BYTES \|\| size > ELD_MAX_SIZE) {
		dev_err(&codec->dev, "HDMI: invalid ELD buf size %d\n", size);
		return -ERANGE;
		}

		/* set ELD buffer */
		for (i = 0; i < size; i++) {
		unsigned int val = hdac_hdmi_get_eld_data(codec, nid, i);
		/*
		* Graphics driver might be writing to ELD buffer right now.
		* Just abort. The caller will repoll after a while.
		*/
		if (!(val & AC_ELDD_ELD_VALID)) {
		dev_err(&codec->dev,
		"HDMI: invalid ELD data byte %d\n", i);
		ret = -EINVAL;
		goto error;
		}
		val &= AC_ELDD_ELD_DATA;
		/*
		* The first byte cannot be zero. This can happen on some DVI
		* connections. Some Intel chips may also need some 250ms delay
		* to return non-zero ELD data, even when the graphics driver
		* correctly writes ELD content before setting ELD_valid bit.
		*/
		if (!val && !i) {
		dev_err(&codec->dev, "HDMI: 0 ELD data\n");
		ret = -EINVAL;
		goto error;
		}
		buf[i] = val;
		}

		*eld_size = size;
		error:
		return ret;
		}

		static int hdac_hdmi_setup_stream(struct hdac_ext_device *hdac,
		hda_nid_t cvt_nid, hda_nid_t pin_nid,
		u32 stream_tag, int format)
		@@ -1059,32 +987,59 @@ static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid)
		return hdac_hdmi_query_cvt_params(&edev->hdac, cvt);
		}

		static void hdac_hdmi_parse_eld(struct hdac_ext_device *edev,
		static int hdac_hdmi_parse_eld(struct hdac_ext_device *edev,
		struct hdac_hdmi_pin *pin)
		{
		unsigned int ver, mnl;

		ver = (pin->eld.eld_buffer[DRM_ELD_VER] & DRM_ELD_VER_MASK)
		>> DRM_ELD_VER_SHIFT;

		if (ver != ELD_VER_CEA_861D && ver != ELD_VER_PARTIAL) {
		dev_dbg(&edev->hdac.dev, "HDMI: Unknown ELD version %d\n", ver);
		return -EINVAL;
		}

		mnl = (pin->eld.eld_buffer[DRM_ELD_CEA_EDID_VER_MNL] &
		DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT;

		if (mnl > ELD_MAX_MNL) {
		dev_dbg(&edev->hdac.dev, "HDMI: MNL Invalid %d\n", mnl);
		return -EINVAL;
		}

		pin->eld.info.spk_alloc = pin->eld.eld_buffer[DRM_ELD_SPEAKER];

		return 0;
		}

		static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll)
		static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin)
		{
		struct hdac_ext_device *edev = pin->edev;
		struct hdac_hdmi_priv *hdmi = edev->private_data;
		struct hdac_hdmi_pcm *pcm;
		int val;
		int size;

		pin->repoll_count = repoll;

		pm_runtime_get_sync(&edev->hdac.dev);
		val = snd_hdac_codec_read(&edev->hdac, pin->nid, 0,
		AC_VERB_GET_PIN_SENSE, 0);
		mutex_lock(&hdmi->pin_mutex);
		pin->eld.monitor_present = false;

		dev_dbg(&edev->hdac.dev, "Pin sense val %x for pin: %d\n",
		val, pin->nid);
		size = snd_hdac_acomp_get_eld(&edev->hdac, pin->nid, -1,
		&pin->eld.monitor_present, pin->eld.eld_buffer,
		ELD_MAX_SIZE);

		if (size > 0) {
		size = min(size, ELD_MAX_SIZE);
		if (hdac_hdmi_parse_eld(edev, pin) < 0)
		size = -EINVAL;
		}

		mutex_lock(&hdmi->pin_mutex);
		pin->eld.monitor_present = !!(val & AC_PINSENSE_PRESENCE);
		pin->eld.eld_valid = !!(val & AC_PINSENSE_ELDV);
		if (size > 0) {
		pin->eld.eld_valid = true;
		pin->eld.eld_size = size;
		} else {
		pin->eld.eld_valid = false;
		pin->eld.eld_size = 0;
		}

		pcm = hdac_hdmi_get_pcm(edev, pin);

		@@ -1106,15 +1061,10 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll)
		}

		mutex_unlock(&hdmi->pin_mutex);
		goto put_hdac_device;
		return;
		}

		if (pin->eld.monitor_present && pin->eld.eld_valid) {
		/* TODO: use i915 component for reading ELD later */
		if (hdac_hdmi_get_eld(&edev->hdac, pin->nid,
		pin->eld.eld_buffer,
		&pin->eld.eld_size) == 0) {

		if (pcm) {
		dev_dbg(&edev->hdac.dev,
		"jack report for pcm=%d\n",
		@@ -1122,50 +1072,12 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll)

		snd_jack_report(pcm->jack, SND_JACK_AVOUT);
		}
		hdac_hdmi_parse_eld(edev, pin);

		print_hex_dump_debug("ELD: ",
		DUMP_PREFIX_OFFSET, 16, 1,
		pin->eld.eld_buffer, pin->eld.eld_size,
		true);
		} else {
		pin->eld.monitor_present = false;
		pin->eld.eld_valid = false;

		if (pcm) {
		dev_dbg(&edev->hdac.dev,
		"jack report for pcm=%d\n",
		pcm->pcm_id);

		snd_jack_report(pcm->jack, 0);
		}
		}
		print_hex_dump_debug("ELD: ", DUMP_PREFIX_OFFSET, 16, 1,
		pin->eld.eld_buffer, pin->eld.eld_size, false);
		}

		mutex_unlock(&hdmi->pin_mutex);

		/*
		* Sometimes the pin_sense may present invalid monitor
		* present and eld_valid. If ELD data is not valid, loop few
		* more times to get correct pin sense and valid ELD.
		*/
		if ((!pin->eld.monitor_present \|\| !pin->eld.eld_valid) && repoll)
		schedule_delayed_work(&pin->work, msecs_to_jiffies(300));

		put_hdac_device:
		pm_runtime_put_sync(&edev->hdac.dev);
		}

		static void hdac_hdmi_repoll_eld(struct work_struct *work)
		{
		struct hdac_hdmi_pin *pin =
		container_of(to_delayed_work(work), struct hdac_hdmi_pin, work);

		/* picked from legacy HDA driver */
		if (pin->repoll_count++ > 6)
		pin->repoll_count = 0;

		hdac_hdmi_present_sense(pin, pin->repoll_count);
		}

		static int hdac_hdmi_add_pin(struct hdac_ext_device *edev, hda_nid_t nid)
		@@ -1184,7 +1096,6 @@ static int hdac_hdmi_add_pin(struct hdac_ext_device *edev, hda_nid_t nid)

		pin->edev = edev;
		mutex_init(&pin->lock);
		INIT_DELAYED_WORK(&pin->work, hdac_hdmi_repoll_eld);

		return 0;
		}
		@@ -1395,7 +1306,7 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port)

		list_for_each_entry(pin, &hdmi->pin_list, head) {
		if (pin->nid == pin_nid)
		hdac_hdmi_present_sense(pin, 1);
		hdac_hdmi_present_sense(pin);
		}
		}

		@@ -1496,7 +1407,7 @@ static int hdmi_codec_probe(struct snd_soc_codec *codec)
		}

		list_for_each_entry(pin, &hdmi->pin_list, head)
		hdac_hdmi_present_sense(pin, 1);
		hdac_hdmi_present_sense(pin);

		/* Imp: Store the card pointer in hda_codec */
		edev->card = dapm->card->snd_card;
		@@ -1561,7 +1472,7 @@ static void hdmi_codec_complete(struct device *dev)
		* all pins here.
		*/
		list_for_each_entry(pin, &hdmi->pin_list, head)
		hdac_hdmi_present_sense(pin, 1);
		hdac_hdmi_present_sense(pin);

		pm_runtime_put_sync(&edev->hdac.dev);
		}

Admin message