Skip to contentSkip to conversation

Add support for Legacy HDMI audio drivers

PATCH Superseded Jerome Anand 7 participants 39 messages Dec 12, 2016 – Dec 15, 2016

Subsystems (5)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Add support for Legacy HDMI audio drivers

Legacy (CherryTrail/ Baytrail) HDMI audio drivers added

Legacy hdmi audio-Gfx interaction/ interfacing is updated to use irq chip framework

Jerome Anand (7):
drm/i915: setup bridge for HDMI LPE audio driver drm/i915: Add support for audio driver notifications
ALSA: add shell for Intel HDMI LPE audio driver
ALSA: x86: hdmi: Add audio support for BYT and CHT
ALSA: x86: hdmi: Improve position reporting
ALSA: x86: hdmi: Fixup some monitor
ALSA: x86: hdmi: continue playback even when display resolution
changes

 Documentation/gpu/i915.rst             |    9 +
 drivers/gpu/drm/i915/Makefile          |    3 +
 drivers/gpu/drm/i915/i915_drv.c        |    8 +-
 drivers/gpu/drm/i915/i915_drv.h        |   18 +
 drivers/gpu/drm/i915/i915_irq.c        |   27 +
 drivers/gpu/drm/i915/i915_reg.h        |    3 +
 drivers/gpu/drm/i915/intel_audio.c     |    8 +
 drivers/gpu/drm/i915/intel_hdmi.c      |    1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c |  409 +++++++
 include/drm/intel_lpe_audio.h          |   46 +
 sound/Kconfig                          |    2 +
 sound/Makefile                         |    2 +-
 sound/x86/Kconfig                      |   16 +
 sound/x86/Makefile                     |   10 +
 sound/x86/intel_hdmi_audio.c           | 1932 ++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_audio.h           |  201 ++++
 sound/x86/intel_hdmi_audio_if.c        |  551 +++++++++
 sound/x86/intel_hdmi_lpe_audio.c       |  626 +++++++++++
 sound/x86/intel_hdmi_lpe_audio.h       |  692 ++++++++++++
 19 files changed, 4561 insertions(+), 3 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c
 create mode 100644 include/drm/intel_lpe_audio.h
 create mode 100644 sound/x86/Kconfig
 create mode 100644 sound/x86/Makefile
 create mode 100644 sound/x86/intel_hdmi_audio.c
 create mode 100644 sound/x86/intel_hdmi_audio.h
 create mode 100644 sound/x86/intel_hdmi_audio_if.c
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.c
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.h
Signature · 7 lines
2.9.3

base-commit: f6a248e2507f98d7eb1f4fec8cfcbf685a33d289
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/7 drm/i915: setup bridge for HDMI LPE audio driver

Enable support for HDMI LPE audio mode on Baytrail and Cherrytrail when HDaudio controller is not detected

Setup minimum required resources during i915_driver_load:
1. Create a platform device to share MMIO/IRQ resources
2. Make the platform device child of i915 device for runtime PM.
3. Create IRQ chip to forward HDMI LPE audio irqs.

HDMI LPE audio driver (a standalone sound driver) probes the LPE audio device and creates a new sound card.

---
 Documentation/gpu/i915.rst             |   9 +
 drivers/gpu/drm/i915/Makefile          |   3 +
 drivers/gpu/drm/i915/i915_drv.c        |   8 +-
 drivers/gpu/drm/i915/i915_drv.h        |  15 ++
 drivers/gpu/drm/i915/i915_irq.c        |  27 +++
 drivers/gpu/drm/i915/i915_reg.h        |   3 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 363 +++++++++++++++++++++++++++++++++
 include/drm/intel_lpe_audio.h          |  45 ++++
 8 files changed, 471 insertions(+), 2 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c
 create mode 100644 include/drm/intel_lpe_audio.h
Documentation/gpu/i915.rst +9 -0
index 3843ef6..f94a4e5 100644
@@ -213,6 +213,15 @@ Video BIOS Table (VBT)
 .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h
    :internal:
 
+intel hdmi lpe audio support
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :doc:  LPE Audio integration for HDMI or DP playback
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :internal:
+
 Memory Management and Command Submission
 ========================================
 
drivers/gpu/drm/i915/Makefile +3 -0
index 3c30916..9d478c4 100644
@@ -127,6 +127,9 @@ i915-y += intel_gvt.o
 include $(src)/gvt/Makefile
 endif
 
+# LPE Audio for VLV and CHT
+i915-y += intel_lpe_audio.o
+
 obj-$(CONFIG_DRM_I915) += i915.o
 
 CFLAGS_i915_trace_points.o := -I$(src)
drivers/gpu/drm/i915/i915_drv.c +6 -2
index 6428588..92796fd 100644
@@ -1132,7 +1132,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
 	if (IS_GEN5(dev_priv))
 		intel_gpu_ips_init(dev_priv);
 
-	i915_audio_component_init(dev_priv);
+	if (intel_lpe_audio_init(dev_priv) < 0)
+		i915_audio_component_init(dev_priv);
 
 	/*
 	 * Some ports require correctly set-up hpd registers for detection to
@@ -1150,7 +1151,10 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
  */
 static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 {
-	i915_audio_component_cleanup(dev_priv);
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_teardown(dev_priv);
+	else
+		i915_audio_component_cleanup(dev_priv);
 
 	intel_gpu_ips_teardown();
 	acpi_video_unregister();
drivers/gpu/drm/i915/i915_drv.h +15 -0
index 40c55c9..1317834 100644
@@ -2514,6 +2514,12 @@ struct drm_i915_private {
 	/* Used to save the pipe-to-encoder mapping for audio */
 	struct intel_encoder *av_enc_map[I915_MAX_PIPES];
 
+	/* necessary resource sharing with HDMI LPE audio driver. */
+	struct {
+		struct platform_device *platdev;
+		int	irq;
+	} lpe_audio;
+
 	/*
 	 * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
 	 * will be rejected. Instead look for a better place.
@@ -2912,6 +2918,8 @@ intel_info(const struct drm_i915_private *dev_priv)
 
 #define HAS_POOLED_EU(dev_priv)	((dev_priv)->info.has_pooled_eu)
 
+#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->lpe_audio.platdev != NULL)
+
 #define INTEL_PCH_DEVICE_ID_MASK		0xff00
 #define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00
 #define INTEL_PCH_CPT_DEVICE_ID_TYPE		0x1c00
@@ -3682,6 +3690,13 @@ extern int i915_restore_state(struct drm_i915_private *dev_priv);
 void i915_setup_sysfs(struct drm_i915_private *dev_priv);
 void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
 
+/* i915_lpe_audio.c */
+int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);
+int  intel_lpe_audio_setup(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
+bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv);
+
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
 extern void intel_teardown_gmbus(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_irq.c +27 -0
index a0e70f5..9b72e77 100644
@@ -1894,6 +1894,14 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
 		/*
+		 * LPE audio interrupts are only enabled on Baytrail and
+		 * CherryView platforms without HDaudio
+		 */
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
+		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
 		 */
@@ -1974,6 +1982,15 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
 		/*
+		 * LPE audio interrupts are only enabled on Baytrail and
+		 * CherryView platforms without HDaudio
+		 */
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT |
+			   I915_LPE_PIPE_C_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
+		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
 		 */
@@ -2914,6 +2931,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 	u32 pipestat_mask;
 	u32 enable_mask;
 	enum pipe pipe;
+	u32 val;
 
 	pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
 			PIPE_CRC_DONE_INTERRUPT_STATUS;
@@ -2930,6 +2948,15 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 
 	WARN_ON(dev_priv->irq_mask != ~0);
 
+	/* add interrupt masks unconditially here, the actual unmask
+	 * will take place only if the LPE_AUDIO mode is detected
+	 */
+	val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT |
+		I915_LPE_PIPE_C_INTERRUPT);
+
+	enable_mask |= val;
+
 	dev_priv->irq_mask = ~enable_mask;
 
 	GEN5_IRQ_INIT(VLV_, dev_priv->irq_mask, enable_mask);
drivers/gpu/drm/i915/i915_reg.h +3 -0
index 90685d2..6fa0e25 100644
@@ -2424,6 +2424,9 @@ enum skl_disp_power_wells {
 #define I915_ASLE_INTERRUPT				(1<<0)
 #define I915_BSD_USER_INTERRUPT				(1<<25)
 
+#define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
+#define I915_HDMI_LPE_AUDIO_SIZE	0x1000
+
 #define GEN6_BSD_RNCID			_MMIO(0x12198)
 
 #define GEN7_FF_THREAD_MODE		_MMIO(0x20a0)
drivers/gpu/drm/i915/intel_lpe_audio.c new file +363 -0

363 lines not on this page · raw message

include/drm/intel_lpe_audio.h new file +45 -0

45 lines not on this page · raw message

Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

Quoted 3 lines · Jerome Anand
drivers/gpu/drm/i915/intel_lpe_audio.c new file +0 -0

(snip)

Quoted 1 line

+static struct platform_device*

Missing space.

drivers/gpu/drm/i915/intel_lpe_audio.c line 82

Quoted 11 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +11 -0
+lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
+{
+	struct drm_device *dev = &dev_priv->drm;
+	int ret;
+	struct resource rsc[2] = {};
+	struct platform_device *platdev;
+	u64 *dma_mask;
+	struct intel_hdmi_lpe_audio_pdata *pdata;
+
+	if (dev_priv->lpe_audio.irq < 0)
+		return ERR_PTR(-EINVAL);

This was already tested, no?

Quoted 46 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +46 -0
+
+	platdev = platform_device_alloc("hdmi-lpe-audio", -1);
+	if (!platdev) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate LPE audio platform device\n");
+		goto err;
+	}
+
+	/* to work-around check_addr in nommu_map_sg() */
+	dma_mask = kmalloc(sizeof(*platdev->dev.dma_mask), GFP_KERNEL);
+	if (!dma_mask) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate dma_mask\n");
+		goto err_put_dev;
+	}
+	*dma_mask = DMA_BIT_MASK(32);
+	platdev->dev.dma_mask = dma_mask;
+	platdev->dev.coherent_dma_mask = *dma_mask;
+
+	rsc[0].start    = rsc[0].end = dev_priv->lpe_audio.irq;
+	rsc[0].flags    = IORESOURCE_IRQ;
+	rsc[0].name     = "hdmi-lpe-audio-irq";
+
+	rsc[1].start    = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE;
+	rsc[1].end      = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE + I915_HDMI_LPE_AUDIO_SIZE - 1;
+	rsc[1].flags    = IORESOURCE_MEM;
+	rsc[1].name     = "hdmi-lpe-audio-mmio";
+
+	ret = platform_device_add_resources(platdev, rsc, 2);
+	if (ret) {
+		DRM_ERROR("Failed to add resource for platform device: %d\n",
+			ret);
+		goto err_put_dev;
+	}
+
+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+
+	if (pdata == NULL) {
+		ret = -ENOMEM;
+		goto err_put_dev;
+	}
+	platdev->dev.platform_data = pdata;
+	spin_lock_init(&pdata->lpe_audio_slock);
+

drivers/gpu/drm/i915/intel_lpe_audio.c line 138

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+	/* for LPE audio driver's runtime-PM */
+	platdev->dev.parent = dev->dev;
+	ret = platform_device_add(platdev);
+	if (ret) {
+		DRM_ERROR("Failed to add LPE audio platform device: %d\n",
+			ret);
+		goto err_put_dev;
+	}
+
+	return platdev;

I guess using platform_device_register_full() makes the code a bit simpler.

static struct platform_device * lpe_audio_platdev_create(struct drm_i915_private *dev_priv)

{
	struct drm_device *dev = &dev_priv->drm;
	struct platform_device_info pinfo = {};
	struct resource rsc[2];
	struct platform_device *platdev;
	struct intel_hdmi_lpe_audio_pdata *pdata;

	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
	if (!pdata)
		return ERR_PTR(-ENOMEM);
	spin_lock_init(&pdata->lpe_audio_slock);

	rsc[0].start    = rsc[0].end = dev_priv->lpe_audio.irq;
	rsc[0].flags    = IORESOURCE_IRQ;
	rsc[0].name     = "hdmi-lpe-audio-irq";

	rsc[1].start    = pci_resource_start(dev->pdev, 0) +
		I915_HDMI_LPE_AUDIO_BASE;
	rsc[1].end      = pci_resource_start(dev->pdev, 0) +
		I915_HDMI_LPE_AUDIO_BASE + I915_HDMI_LPE_AUDIO_SIZE - 1;
	rsc[1].flags    = IORESOURCE_MEM;
	rsc[1].name     = "hdmi-lpe-audio-mmio";

	pinfo.parent = dev->dev;
	pinfo.name = "hdmi-lpe-audio";
	pinfo.id = -1;
	pinfo.res = res;
	pinfo.num_res = 2;
	pinfo.data = pdata;
	pinfo.size_data = sizeof(*pdata);
	pinfo.dma_mask = DMA_BIT_MASK(32);
	
	platdev = platform_device_register_full(&pinfo);
	if (IS_ERR(platdev)) {
		ret = PTR_ERR(platdev);
		DRM_ERROR("Failed to allocate LPE audio platform device\n");
		goto err;
	}

	return platdev;

err:

	kfree(pdata);
	return ERR_PTR(ret);
}
Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+/**
+ * intel_lpe_audio_irq_handler() - forwards the LPE audio irq
+ * @dev_priv: the i915 drm device private data
+ *
+ * the LPE Audio irq is forwarded to the irq handler registered by LPE audio

drivers/gpu/drm/i915/intel_lpe_audio.c line 229

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+ * driver.
+ */
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv)
+{
+	int ret;
+
+	ret = generic_handle_irq(dev_priv->lpe_audio.irq);
+	if (ret)
+		DRM_ERROR_RATELIMITED("error handling LPE audio irq: %d\n",
+				ret);

This function may be called even without LPE registered, so safer to have HAS_LPE_AUDIO() check.

Quoted 16 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +16 -0
+}
+
+/**
+ * intel_lpe_audio_detect() - check & setup lpe audio if present
+ * @dev_priv: the i915 drm device private data
+ *
+ * Detect if lpe audio is present
+ *
+ * Return: true if lpe audio present else Return = false
+ */
+bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv)
+{
+	int lpe_present = false;
+
+	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+		static const struct pci_device_id atom_hdaudio_ids[] = {

drivers/gpu/drm/i915/intel_lpe_audio.c line 255

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+			/* Baytrail */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f04)},
+			/* Braswell */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2284)},
+			{}
+		};
+
+		if (!pci_dev_present(atom_hdaudio_ids)) {
+			DRM_INFO("%s%s\n", "HDaudio controller not detected,",
+				"using LPE audio instead\n");

Why %s%s? Just keep one line without line breakage. The 80 chars rule is just a suggestion, no strict rule at all.

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+/**
+ * intel_lpe_audio_teardown() - destroy the bridge between HDMI LPE
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * release all the resources for LPE audio <-> i915 bridge.
+ */
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
+{
+	unsigned long irqflags;

drivers/gpu/drm/i915/intel_lpe_audio.c line 353

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+	struct irq_desc *desc;
+
+	if (!HAS_LPE_AUDIO(dev_priv))
+		return;
+
+	desc = irq_to_desc(dev_priv->lpe_audio.irq);
+
+	/**
+	 * mask LPE audio irq before destroying
+	 */

No need for kernel-doc comment here.

drivers/gpu/drm/i915/intel_lpe_audio.c line 362

Quoted 9 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +9 -0
+	lpe_audio_irq_mask(&desc->irq_data);
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	lpe_audio_platdev_destroy(dev_priv);
+
+	irq_free_desc(dev_priv->lpe_audio.irq);
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

What's the reason of this spinlock?

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

Quoted 15 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 5:13 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

Quoted 1 line · Jerome Anand
Quoted 7 lines
Quoted 2 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +0 -0

(snip)

Quoted 1 line

+static struct platform_device*

Missing space.

OK

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +4 -0
+lpe_audio_platdev_create(struct drm_i915_private *dev_priv) {
+	struct drm_device *dev = &dev_priv->drm;
+	int ret;
+	struct resource rsc[2] = {};
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 82

Quoted 6 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +6 -0
+	struct platform_device *platdev;
+	u64 *dma_mask;
+	struct intel_hdmi_lpe_audio_pdata *pdata;
+
+	if (dev_priv->lpe_audio.irq < 0)
+		return ERR_PTR(-EINVAL);

This was already tested, no?

OK - can be removed

Quoted 56 lines

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+
+	platdev = platform_device_alloc("hdmi-lpe-audio", -1);
+	if (!platdev) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate LPE audio platform

device\n");

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+		goto err;
+	}
+
+	/* to work-around check_addr in nommu_map_sg() */
+	dma_mask = kmalloc(sizeof(*platdev->dev.dma_mask),

GFP_KERNEL);

Quoted 7 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +7 -0
+	if (!dma_mask) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate dma_mask\n");
+		goto err_put_dev;
+	}
+	*dma_mask = DMA_BIT_MASK(32);
+	platdev->dev.dma_mask = dma_mask;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+	platdev->dev.coherent_dma_mask = *dma_mask;
+
+	rsc[0].start    = rsc[0].end = dev_priv->lpe_audio.irq;
+	rsc[0].flags    = IORESOURCE_IRQ;
+	rsc[0].name     = "hdmi-lpe-audio-irq";
+
+	rsc[1].start    = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE;
+	rsc[1].end      = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE +

I915_HDMI_LPE_AUDIO_SIZE - 1;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 6 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +6 -0
+	rsc[1].flags    = IORESOURCE_MEM;
+	rsc[1].name     = "hdmi-lpe-audio-mmio";
+
+	ret = platform_device_add_resources(platdev, rsc, 2);
+	if (ret) {
+		DRM_ERROR("Failed to add resource for platform device:

%d\n",

Quoted 8 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +8 -0
+			ret);
+		goto err_put_dev;
+	}
+
+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+
+	if (pdata == NULL) {
+		ret = -ENOMEM;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+		goto err_put_dev;
+	}
+	platdev->dev.platform_data = pdata;
+	spin_lock_init(&pdata->lpe_audio_slock);
+
+	/* for LPE audio driver's runtime-PM */
+	platdev->dev.parent = dev->dev;
+	ret = platform_device_add(platdev);
+	if (ret) {
+		DRM_ERROR("Failed to add LPE audio platform device:

%d\n",

Quoted 8 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 138

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+			ret);
+		goto err_put_dev;
+	}
+
+	return platdev;

I guess using platform_device_register_full() makes the code a bit simpler.

OK - agreed, but will keep it since its acked by Daniel.

Quoted 65 lines

static struct platform_device *

lpe_audio_platdev_create(struct drm_i915_private *dev_priv) {
	struct drm_device *dev = &dev_priv->drm;
	struct platform_device_info pinfo = {};
	struct resource rsc[2];
	struct platform_device *platdev;
	struct intel_hdmi_lpe_audio_pdata *pdata;

	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
	if (!pdata)
		return ERR_PTR(-ENOMEM);
	spin_lock_init(&pdata->lpe_audio_slock);

	rsc[0].start    = rsc[0].end = dev_priv->lpe_audio.irq;
	rsc[0].flags    = IORESOURCE_IRQ;
	rsc[0].name     = "hdmi-lpe-audio-irq";

	rsc[1].start    = pci_resource_start(dev->pdev, 0) +
		I915_HDMI_LPE_AUDIO_BASE;
	rsc[1].end      = pci_resource_start(dev->pdev, 0) +
		I915_HDMI_LPE_AUDIO_BASE +
I915_HDMI_LPE_AUDIO_SIZE - 1;
	rsc[1].flags    = IORESOURCE_MEM;
	rsc[1].name     = "hdmi-lpe-audio-mmio";

	pinfo.parent = dev->dev;
	pinfo.name = "hdmi-lpe-audio";
	pinfo.id = -1;
	pinfo.res = res;
	pinfo.num_res = 2;
	pinfo.data = pdata;
	pinfo.size_data = sizeof(*pdata);
	pinfo.dma_mask = DMA_BIT_MASK(32);

	platdev = platform_device_register_full(&pinfo);
	if (IS_ERR(platdev)) {
		ret = PTR_ERR(platdev);
		DRM_ERROR("Failed to allocate LPE audio platform
device\n");
		goto err;
	}

	return platdev;
   err:
	kfree(pdata);
	return ERR_PTR(ret);
}
Quoted 4 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +4 -0
+/**
+ * intel_lpe_audio_irq_handler() - forwards the LPE audio irq
+ * @dev_priv: the i915 drm device private data
+ *

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+ * the LPE Audio irq is forwarded to the irq handler registered by
+LPE audio
+ * driver.
+ */
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv) {
+	int ret;
+
+	ret = generic_handle_irq(dev_priv->lpe_audio.irq);
+	if (ret)
+		DRM_ERROR_RATELIMITED("error handling LPE audio irq:

%d\n",

Quoted 5 lines

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 1 line
drivers/gpu/drm/i915/intel_lpe_audio.c new file +1 -0
+				ret);

This function may be called even without LPE registered, so safer to have HAS_LPE_AUDIO() check.

OK

Quoted 25 lines
Quoted 14 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +13 -0
+}
+
+/**
+ * intel_lpe_audio_detect() - check & setup lpe audio if present
+ * @dev_priv: the i915 drm device private data
+ *
+ * Detect if lpe audio is present
+ *
+ * Return: true if lpe audio present else Return = false  */ bool
+intel_lpe_audio_detect(struct drm_i915_private *dev_priv) {
+	int lpe_present = false;
+
+	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+		static const struct pci_device_id atom_hdaudio_ids[] = {
+			/* Baytrail */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f04)},
+			/* Braswell */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2284)},
+			{}
+		};
+
+		if (!pci_dev_present(atom_hdaudio_ids)) {
+			DRM_INFO("%s%s\n", "HDaudio controller not

detected,",

Quoted 5 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 255

Quoted 1 line
drivers/gpu/drm/i915/intel_lpe_audio.c new file +1 -0
+				"using LPE audio instead\n");

Why %s%s? Just keep one line without line breakage. The 80 chars rule is just a suggestion, no strict rule at all.

OK

Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +13 -0
+/**
+ * intel_lpe_audio_teardown() - destroy the bridge between HDMI LPE
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * release all the resources for LPE audio <-> i915 bridge.
+ */
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) {
+	unsigned long irqflags;
+	struct irq_desc *desc;
+
+	if (!HAS_LPE_AUDIO(dev_priv))
+		return;
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 353

Quoted 6 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +6 -0
+
+	desc = irq_to_desc(dev_priv->lpe_audio.irq);
+
+	/**
+	 * mask LPE audio irq before destroying
+	 */

No need for kernel-doc comment here.

OK

Quoted 12 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 362

Quoted 9 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +9 -0
+	lpe_audio_irq_mask(&desc->irq_data);
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	lpe_audio_platdev_destroy(dev_priv);
+
+	irq_free_desc(dev_priv->lpe_audio.irq);
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

What's the reason of this spinlock?

JIC - probably not needed now

Quoted 4 lines

thanks,

Takashi

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by on v1 1/7
#4 lore raw

Re: [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

In reply to Jerome Anand
Quoted 131 lines · Jerome Anand

Enable support for HDMI LPE audio mode on Baytrail and Cherrytrail when HDaudio controller is not detected

Setup minimum required resources during i915_driver_load:
1. Create a platform device to share MMIO/IRQ resources
2. Make the platform device child of i915 device for runtime PM.
3. Create IRQ chip to forward HDMI LPE audio irqs.

HDMI LPE audio driver (a standalone sound driver) probes the LPE audio device and creates a new sound card.

---
 Documentation/gpu/i915.rst             |   9 +
 drivers/gpu/drm/i915/Makefile          |   3 +
 drivers/gpu/drm/i915/i915_drv.c        |   8 +-
 drivers/gpu/drm/i915/i915_drv.h        |  15 ++
 drivers/gpu/drm/i915/i915_irq.c        |  27 +++
 drivers/gpu/drm/i915/i915_reg.h        |   3 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 363 +++++++++++++++++++++++++++++++++
 include/drm/intel_lpe_audio.h          |  45 ++++
 8 files changed, 471 insertions(+), 2 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c
 create mode 100644 include/drm/intel_lpe_audio.h
Documentation/gpu/i915.rst +9 -0
index 3843ef6..f94a4e5 100644
@@ -213,6 +213,15 @@ Video BIOS Table (VBT)
 .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h
    :internal:
 
+intel hdmi lpe audio support
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :doc:  LPE Audio integration for HDMI or DP playback
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :internal:
+
 Memory Management and Command Submission
 ========================================
 
drivers/gpu/drm/i915/Makefile +3 -0
index 3c30916..9d478c4 100644
@@ -127,6 +127,9 @@ i915-y += intel_gvt.o
 include $(src)/gvt/Makefile
 endif
 
+# LPE Audio for VLV and CHT
+i915-y += intel_lpe_audio.o
+
 obj-$(CONFIG_DRM_I915) += i915.o
 
 CFLAGS_i915_trace_points.o := -I$(src)
drivers/gpu/drm/i915/i915_drv.c +6 -2
index 6428588..92796fd 100644
@@ -1132,7 +1132,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
 	if (IS_GEN5(dev_priv))
 		intel_gpu_ips_init(dev_priv);
 
-	i915_audio_component_init(dev_priv);
+	if (intel_lpe_audio_init(dev_priv) < 0)
+		i915_audio_component_init(dev_priv);
 
 	/*
 	 * Some ports require correctly set-up hpd registers for detection to
@@ -1150,7 +1151,10 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
  */
 static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 {
-	i915_audio_component_cleanup(dev_priv);
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_teardown(dev_priv);
+	else
+		i915_audio_component_cleanup(dev_priv);
 
 	intel_gpu_ips_teardown();
 	acpi_video_unregister();
drivers/gpu/drm/i915/i915_drv.h +15 -0
index 40c55c9..1317834 100644
@@ -2514,6 +2514,12 @@ struct drm_i915_private {
 	/* Used to save the pipe-to-encoder mapping for audio */
 	struct intel_encoder *av_enc_map[I915_MAX_PIPES];
 
+	/* necessary resource sharing with HDMI LPE audio driver. */
+	struct {
+		struct platform_device *platdev;
+		int	irq;
+	} lpe_audio;
+
 	/*
 	 * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
 	 * will be rejected. Instead look for a better place.
@@ -2912,6 +2918,8 @@ intel_info(const struct drm_i915_private *dev_priv)
 
 #define HAS_POOLED_EU(dev_priv)	((dev_priv)->info.has_pooled_eu)
 
+#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->lpe_audio.platdev != NULL)
+
 #define INTEL_PCH_DEVICE_ID_MASK		0xff00
 #define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00
 #define INTEL_PCH_CPT_DEVICE_ID_TYPE		0x1c00
@@ -3682,6 +3690,13 @@ extern int i915_restore_state(struct drm_i915_private *dev_priv);
 void i915_setup_sysfs(struct drm_i915_private *dev_priv);
 void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
 
+/* i915_lpe_audio.c */
+int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);
+int  intel_lpe_audio_setup(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
+bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv);
+
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
 extern void intel_teardown_gmbus(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_irq.c +0 -0
index a0e70f5..9b72e77 100644

drivers/gpu/drm/i915/i915_irq.c static irqreturn_t valleyview_irq_handler(int irq, void *arg) · line 1899

Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +3 -0
@@ -1894,6 +1894,14 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
 		/*
+		 * LPE audio interrupts are only enabled on Baytrail and
+		 * CherryView platforms without HDaudio
+		 */

Bikeshed: I don't see much how this comment adds anything, unconditionally handling interrupts but only enabling them in hw when needed is the normal pattern in i915. Same below.

Quoted 33 lines
drivers/gpu/drm/i915/i915_irq.c +15 -0
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
+		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
 		 */
@@ -1974,6 +1982,15 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
 		/*
+		 * LPE audio interrupts are only enabled on Baytrail and
+		 * CherryView platforms without HDaudio
+		 */
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT |
+			   I915_LPE_PIPE_C_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
+		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
 		 */
@@ -2914,6 +2931,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 	u32 pipestat_mask;
 	u32 enable_mask;
 	enum pipe pipe;
+	u32 val;
 
 	pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
 			PIPE_CRC_DONE_INTERRUPT_STATUS;

drivers/gpu/drm/i915/i915_irq.c static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv) · line 2953

Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +3 -0
@@ -2930,6 +2948,15 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 
 	WARN_ON(dev_priv->irq_mask != ~0);
 
+	/* add interrupt masks unconditially here, the actual unmask
+	 * will take place only if the LPE_AUDIO mode is detected
+	 */

Same here, this is just how we roll.

Quoted 176 lines
drivers/gpu/drm/i915/i915_irq.c +6 -0
+	val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT |
+		I915_LPE_PIPE_C_INTERRUPT);
+
+	enable_mask |= val;
+
 	dev_priv->irq_mask = ~enable_mask;
 
 	GEN5_IRQ_INIT(VLV_, dev_priv->irq_mask, enable_mask);
drivers/gpu/drm/i915/i915_reg.h +3 -0
index 90685d2..6fa0e25 100644
@@ -2424,6 +2424,9 @@ enum skl_disp_power_wells {
 #define I915_ASLE_INTERRUPT				(1<<0)
 #define I915_BSD_USER_INTERRUPT				(1<<25)
 
+#define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
+#define I915_HDMI_LPE_AUDIO_SIZE	0x1000
+
 #define GEN6_BSD_RNCID			_MMIO(0x12198)
 
 #define GEN7_FF_THREAD_MODE		_MMIO(0x20a0)
drivers/gpu/drm/i915/intel_lpe_audio.c new file +147 -0
new file mode 100644
index 0000000..e12e5f7
@@ -0,0 +1,363 @@
+/*
+ * Copyright © 2016 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.
+ *
+ * Authors:
+ *    Pierre-Louis Bossart <[email protected]>
+ *    Jerome Anand <[email protected]>
+ *    based on VED patches
+ *
+ */
+
+/**
+ * DOC: LPE Audio integration for HDMI or DP playback
+ *
+ * Motivation:
+ * Atom platforms (e.g. valleyview and cherryTrail) integrates a DMA-based
+ * interface as an alternative to the traditional HDaudio path. While this
+ * mode is unrelated to the LPE aka SST audio engine, the documentation refers
+ * to this mode as LPE so we keep this notation for the sake of consistency.
+ *
+ * The interface is handled by a separate standalone driver maintained in the
+ * ALSA subsystem for simplicity. To minimize the interaction between the two
+ * subsystems, a bridge is setup between the hdmi-lpe-audio and i915:
+ * 1. Create a platform device to share MMIO/IRQ resources
+ * 2. Make the platform device child of i915 device for runtime PM.
+ * 3. Create IRQ chip to forward the LPE audio irqs.
+ * the hdmi-lpe-audio driver probes the lpe audio device and creates a new
+ * sound card
+ *
+ * Threats:
+ * Due to the restriction in Linux platform device model, user need manually
+ * uninstall the hdmi-lpe-audio driver before uninstalling i915 module,
+ * otherwise we might run into use-after-free issues after i915 removes the
+ * platform device: even though hdmi-lpe-audio driver is released, the modules
+ * is still in "installed" status.
+ *
+ * Implementation:
+ * The MMIO/REG platform resources are created according to the registers
+ * specification.
+ * When forwarding LPE audio irqs, the flow control handler selection depends
+ * on the platform, for example on valleyview handle_simple_irq is enough.
+ *
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+
+#include "i915_drv.h"
+#include <linux/delay.h>
+#include <drm/intel_lpe_audio.h>
+
+static struct platform_device*
+lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
+{
+	struct drm_device *dev = &dev_priv->drm;
+	int ret;
+	struct resource rsc[2] = {};
+	struct platform_device *platdev;
+	u64 *dma_mask;
+	struct intel_hdmi_lpe_audio_pdata *pdata;
+
+	if (dev_priv->lpe_audio.irq < 0)
+		return ERR_PTR(-EINVAL);
+
+	platdev = platform_device_alloc("hdmi-lpe-audio", -1);
+	if (!platdev) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate LPE audio platform device\n");
+		goto err;
+	}
+
+	/* to work-around check_addr in nommu_map_sg() */
+	dma_mask = kmalloc(sizeof(*platdev->dev.dma_mask), GFP_KERNEL);
+	if (!dma_mask) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate dma_mask\n");
+		goto err_put_dev;
+	}
+	*dma_mask = DMA_BIT_MASK(32);
+	platdev->dev.dma_mask = dma_mask;
+	platdev->dev.coherent_dma_mask = *dma_mask;
+
+	rsc[0].start    = rsc[0].end = dev_priv->lpe_audio.irq;
+	rsc[0].flags    = IORESOURCE_IRQ;
+	rsc[0].name     = "hdmi-lpe-audio-irq";
+
+	rsc[1].start    = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE;
+	rsc[1].end      = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE + I915_HDMI_LPE_AUDIO_SIZE - 1;
+	rsc[1].flags    = IORESOURCE_MEM;
+	rsc[1].name     = "hdmi-lpe-audio-mmio";
+
+	ret = platform_device_add_resources(platdev, rsc, 2);
+	if (ret) {
+		DRM_ERROR("Failed to add resource for platform device: %d\n",
+			ret);
+		goto err_put_dev;
+	}
+
+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+
+	if (pdata == NULL) {
+		ret = -ENOMEM;
+		goto err_put_dev;
+	}
+	platdev->dev.platform_data = pdata;
+	spin_lock_init(&pdata->lpe_audio_slock);
+
+	/* for LPE audio driver's runtime-PM */
+	platdev->dev.parent = dev->dev;
+	ret = platform_device_add(platdev);
+	if (ret) {
+		DRM_ERROR("Failed to add LPE audio platform device: %d\n",
+			ret);
+		goto err_put_dev;
+	}
+
+	return platdev;
+err_put_dev:
+	platform_device_put(platdev);
+	kfree(dma_mask);
+err:
+	return ERR_PTR(ret);
+}
+
+static void lpe_audio_platdev_destroy(struct drm_i915_private *dev_priv)
+{

drivers/gpu/drm/i915/intel_lpe_audio.c line 157

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+	platform_device_unregister(dev_priv->lpe_audio.platdev);
+	kfree(dev_priv->lpe_audio.platdev->dev.dma_mask);
+}
+
+static void lpe_audio_irq_unmask(struct irq_data *d)
+{
+	struct drm_i915_private *dev_priv = d->chip_data;
+	unsigned long irqflags;
+	u32 val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT);

PIPE_C missing?

drivers/gpu/drm/i915/intel_lpe_audio.c line 169

Quoted 12 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +12 -0
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	/*
+	 * VLV_IER is already set in the vlv_display_postinstall(),
+	 * we only change VLV_IIR and VLV_IMR
+	 */
+	dev_priv->irq_mask &= ~val;
+	I915_WRITE(VLV_IIR, val);
+	I915_WRITE(VLV_IIR, val);
+	I915_WRITE(VLV_IMR, dev_priv->irq_mask);
+	POSTING_READ(VLV_IMR);

vlv_update_display_irq similar to ilk_update_display_irq in i915_irq.c would be good imo. And again the comment kinda explains the usual. Same below.

Quoted 235 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +194 -0
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+}
+
+static void lpe_audio_irq_mask(struct irq_data *d)
+{
+	struct drm_i915_private *dev_priv = d->chip_data;
+	unsigned long irqflags;
+	u32 val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT);
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	/*
+	 * VLV_IER is already set in the vlv_display_postinstall(),
+	 * we only change VLV_IIR and VLV_IMR
+	 */
+	dev_priv->irq_mask |= val;
+	I915_WRITE(VLV_IMR, dev_priv->irq_mask);
+	I915_WRITE(VLV_IIR, val);
+	I915_WRITE(VLV_IIR, val);
+	POSTING_READ(VLV_IIR);
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+}
+
+static struct irq_chip lpe_audio_irqchip = {
+	.name = "hdmi_lpe_audio_irqchip",
+	.irq_mask = lpe_audio_irq_mask,
+	.irq_unmask = lpe_audio_irq_unmask,
+};
+
+static int lpe_audio_irq_init(struct drm_i915_private *dev_priv)
+{
+	int irq = dev_priv->lpe_audio.irq;
+
+	WARN_ON(!intel_irqs_enabled(dev_priv));
+	irq_set_chip_and_handler_name(irq,
+				&lpe_audio_irqchip,
+				handle_simple_irq,
+				"hdmi_lpe_audio_irq_handler");
+
+	return irq_set_chip_data(irq, dev_priv);
+}
+
+/**
+ * intel_lpe_audio_irq_handler() - forwards the LPE audio irq
+ * @dev_priv: the i915 drm device private data
+ *
+ * the LPE Audio irq is forwarded to the irq handler registered by LPE audio
+ * driver.
+ */
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv)
+{
+	int ret;
+
+	ret = generic_handle_irq(dev_priv->lpe_audio.irq);
+	if (ret)
+		DRM_ERROR_RATELIMITED("error handling LPE audio irq: %d\n",
+				ret);
+}
+
+/**
+ * intel_lpe_audio_detect() - check & setup lpe audio if present
+ * @dev_priv: the i915 drm device private data
+ *
+ * Detect if lpe audio is present
+ *
+ * Return: true if lpe audio present else Return = false
+ */
+bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv)
+{
+	int lpe_present = false;
+
+	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+		static const struct pci_device_id atom_hdaudio_ids[] = {
+			/* Baytrail */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f04)},
+			/* Braswell */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2284)},
+			{}
+		};
+
+		if (!pci_dev_present(atom_hdaudio_ids)) {
+			DRM_INFO("%s%s\n", "HDaudio controller not detected,",
+				"using LPE audio instead\n");
+			lpe_present = true;
+		}
+	}
+	return lpe_present;
+}
+
+/**
+ * intel_lpe_audio_setup() - setup the bridge between HDMI LPE Audio
+ * driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * set up the minimum required resources for the bridge: irq chip,
+ * platform resource and platform device. i915 device is set as parent
+ * of the new platform device.
+ *
+ * Return: 0 if successful. non-zero if allocation/initialization fails
+ */
+int intel_lpe_audio_setup(struct drm_i915_private *dev_priv)
+{
+	int ret;
+
+	dev_priv->lpe_audio.irq = irq_alloc_desc(0);
+	if (dev_priv->lpe_audio.irq < 0) {
+		DRM_ERROR("Failed to allocate IRQ desc: %d\n",
+			dev_priv->lpe_audio.irq);
+		ret = dev_priv->lpe_audio.irq;
+		goto err;
+	}
+
+	DRM_DEBUG("irq = %d\n", dev_priv->lpe_audio.irq);
+
+	ret = lpe_audio_irq_init(dev_priv);
+
+	if (ret) {
+		DRM_ERROR("Failed to initialize irqchip for lpe audio: %d\n",
+			ret);
+		goto err_free_irq;
+	}
+
+	dev_priv->lpe_audio.platdev = lpe_audio_platdev_create(dev_priv);
+
+	if (IS_ERR(dev_priv->lpe_audio.platdev)) {
+		ret = PTR_ERR(dev_priv->lpe_audio.platdev);
+		DRM_ERROR("Failed to create lpe audio platform device: %d\n",
+			ret);
+		goto err_free_irq;
+	}
+
+	return 0;
+err_free_irq:
+	irq_free_desc(dev_priv->lpe_audio.irq);
+err:
+	dev_priv->lpe_audio.irq = -1;
+	dev_priv->lpe_audio.platdev = NULL;
+	return ret;
+}
+
+
+/**
+ * intel_lpe_audio_init() - detect and setup the bridge between HDMI LPE Audio
+ * driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * Return: 0 if successful. non-zero if detection or
+ * llocation/initialization fails
+ */
+int intel_lpe_audio_init(struct drm_i915_private *dev_priv)
+{
+	int ret = -ENODEV;
+
+	if (intel_lpe_audio_detect(dev_priv)) {
+		ret = intel_lpe_audio_setup(dev_priv);
+		if (ret < 0)
+			DRM_ERROR("failed to setup LPE Audio bridge\n");
+	}
+	return ret;
+}
+
+/**
+ * intel_lpe_audio_teardown() - destroy the bridge between HDMI LPE
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * release all the resources for LPE audio <-> i915 bridge.
+ */
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
+{
+	unsigned long irqflags;
+	struct irq_desc *desc;
+
+	if (!HAS_LPE_AUDIO(dev_priv))
+		return;
+
+	desc = irq_to_desc(dev_priv->lpe_audio.irq);
+
+	/**
+	 * mask LPE audio irq before destroying
+	 */
+	lpe_audio_irq_mask(&desc->irq_data);
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	lpe_audio_platdev_destroy(dev_priv);
+
+	irq_free_desc(dev_priv->lpe_audio.irq);
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+}
include/drm/intel_lpe_audio.h new file +35 -0
new file mode 100644
index 0000000..a64c449
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2016 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 _INTEL_LPE_AUDIO_H_
+#define _INTEL_LPE_AUDIO_H_
+
+#include <linux/types.h>
+
+#define HDMI_MAX_ELD_BYTES	128
+
+struct intel_hdmi_lpe_audio_eld {
+	int port_id;
+	unsigned char eld_data[HDMI_MAX_ELD_BYTES];
+};
+

include/drm/intel_lpe_audio.h line 45

Quoted 10 lines
include/drm/intel_lpe_audio.h new file +10 -0
+struct intel_hdmi_lpe_audio_pdata {
+	bool notify_pending;
+	int tmds_clock_speed;
+	bool hdmi_connected;
+	struct intel_hdmi_lpe_audio_eld eld;
+	void (*notify_audio_lpe)(void *audio_ptr);
+	spinlock_t lpe_audio_slock;
+};
+
+#endif /* _I915_LPE_AUDIO_H_ */

Besides the few bikesheds seems all reasonable, with those addressed

... for merging through sound tree. Since we're super early in 4.11 a topic branch for me to pull in to avoid sync headaches would be good. -Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

Re: [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

Quoted 3 lines · Daniel Vetter

... for merging through sound tree. Since we're super early in 4.11 a topic branch for me to pull in to avoid sync headaches would be good.

Sure, I'll branch from some vanilla rc like 4.10-rc1.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Re: [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

In reply to Daniel Vetter
Quoted 155 lines

-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, December 14, 2016 6:22 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

Quoted 14 lines · Jerome Anand

Enable support for HDMI LPE audio mode on Baytrail and Cherrytrail when HDaudio controller is not detected

Setup minimum required resources during i915_driver_load:
1. Create a platform device to share MMIO/IRQ resources 2. Make the platform device child of i915 device for runtime PM.
3. Create IRQ chip to forward HDMI LPE audio irqs.

HDMI LPE audio driver (a standalone sound driver) probes the LPE audio device and creates a new sound card.

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

Quoted 8 lines
---
 Documentation/gpu/i915.rst             |   9 +
 drivers/gpu/drm/i915/Makefile          |   3 +
 drivers/gpu/drm/i915/i915_drv.c        |   8 +-
 drivers/gpu/drm/i915/i915_drv.h        |  15 ++
 drivers/gpu/drm/i915/i915_irq.c        |  27 +++
 drivers/gpu/drm/i915/i915_reg.h        |   3 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 363

+++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/i915_drv.c static void i915_driver_register(struct

Quoted 43 lines
 include/drm/intel_lpe_audio.h          |  45 ++++
 8 files changed, 471 insertions(+), 2 deletions(-)  create mode
100644 drivers/gpu/drm/i915/intel_lpe_audio.c
 create mode 100644 include/drm/intel_lpe_audio.h
Documentation/gpu/i915.rst +0 -0
index 3843ef6..f94a4e5 100644
@@ -213,6 +213,15 @@ Video BIOS Table (VBT)  .. kernel-doc::

drivers/gpu/drm/i915/intel_vbt_defs.h
:internal:

Documentation/gpu/i915.rst +9 -0
+intel hdmi lpe audio support
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :doc:  LPE Audio integration for HDMI or DP playback
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :internal:
+
 Memory Management and Command Submission

========================================

(quoted diff) +0 -0

b/drivers/gpu/drm/i915/Makefile index 3c30916..9d478c4 100644

drivers/gpu/drm/i915/Makefile +0 -0
@@ -127,6 +127,9 @@ i915-y += intel_gvt.o  include $(src)/gvt/Makefile

endif

drivers/gpu/drm/i915/Makefile +3 -0
+# LPE Audio for VLV and CHT
+i915-y += intel_lpe_audio.o
+
 obj-$(CONFIG_DRM_I915) += i915.o
 
 CFLAGS_i915_trace_points.o := -I$(src) diff --git

a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6428588..92796fd 100644

drivers/gpu/drm/i915/i915_drv.c +0 -0
@@ -1132,7 +1132,8 @@ static void i915_driver_register(struct

drm_i915_private *dev_priv)

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +2 -1
 	if (IS_GEN5(dev_priv))
 		intel_gpu_ips_init(dev_priv);
 
-	i915_audio_component_init(dev_priv);
+	if (intel_lpe_audio_init(dev_priv) < 0)
+		i915_audio_component_init(dev_priv);
 
 	/*
 	 * Some ports require correctly set-up hpd registers for detection

to @@ -1150,7 +1151,10 @@ static void i915_driver_register(struct

drm_i915_private *dev_priv)

Quoted 17 lines

*/
static void i915_driver_unregister(struct drm_i915_private *dev_priv)
{

drivers/gpu/drm/i915/i915_drv.c +4 -1
-	i915_audio_component_cleanup(dev_priv);
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_teardown(dev_priv);
+	else
+		i915_audio_component_cleanup(dev_priv);
 
 	intel_gpu_ips_teardown();
 	acpi_video_unregister();
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.h index 40c55c9..1317834 100644

drivers/gpu/drm/i915/i915_drv.h +0 -0
@@ -2514,6 +2514,12 @@ struct drm_i915_private {
 	/* Used to save the pipe-to-encoder mapping for audio */

drivers/gpu/drm/i915/i915_drv.h struct drm_i915_private { · line 2524

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +6 -0
 	struct intel_encoder *av_enc_map[I915_MAX_PIPES];
 
+	/* necessary resource sharing with HDMI LPE audio driver. */
+	struct {
+		struct platform_device *platdev;
+		int	irq;
+	} lpe_audio;
+
 	/*
 	 * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your

patch

drivers/gpu/drm/i915/i915_irq.c static irqreturn_t valleyview_irq_handler(int irq,

Quoted 32 lines
drivers/gpu/drm/i915/i915_drv.h +3 -0
 	 * will be rejected. Instead look for a better place.
@@ -2912,6 +2918,8 @@ intel_info(const struct drm_i915_private
 *dev_priv)
 
 #define HAS_POOLED_EU(dev_priv)	((dev_priv)->info.has_pooled_eu)
 
+#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->lpe_audio.platdev !=
+NULL)
+
 #define INTEL_PCH_DEVICE_ID_MASK		0xff00
 #define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00
 #define INTEL_PCH_CPT_DEVICE_ID_TYPE		0x1c00
@@ -3682,6 +3690,13 @@ extern int i915_restore_state(struct

drm_i915_private *dev_priv); void i915_setup_sysfs(struct drm_i915_private *dev_priv); void i915_teardown_sysfs(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_drv.h +7 -0
+/* i915_lpe_audio.c */
+int  intel_lpe_audio_init(struct drm_i915_private *dev_priv); int
+intel_lpe_audio_setup(struct drm_i915_private *dev_priv); void
+intel_lpe_audio_teardown(struct drm_i915_private *dev_priv); void
+intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv); bool
+intel_lpe_audio_detect(struct drm_i915_private *dev_priv);
+
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);

extern void intel_teardown_gmbus(struct drm_i915_private *dev_priv);

(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_irq.c index a0e70f5..9b72e77 100644

drivers/gpu/drm/i915/i915_irq.c +0 -0
@@ -1894,6 +1894,14 @@ static irqreturn_t valleyview_irq_handler(int irq,

void *arg)

Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
Quoted 9 lines

drivers/gpu/drm/i915/i915_irq.c static irqreturn_t valleyview_irq_handler(int irq, void *arg) · line 1899

Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +3 -0
 		/*
+		 * LPE audio interrupts are only enabled on Baytrail and
+		 * CherryView platforms without HDaudio
+		 */

Bikeshed: I don't see much how this comment adds anything, unconditionally handling interrupts but only enabling them in hw when needed is the normal pattern in i915. Same below.

OK - comment can be removed

Quoted 10 lines

drivers/gpu/drm/i915/i915_irq.c static irqreturn_t cherryview_irq_handler(int irq,

Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +5 -0
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
+		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
 		 */
@@ -1974,6 +1982,15 @@ static irqreturn_t cherryview_irq_handler(int irq,

void *arg)

Quoted 6 lines

drivers/gpu/drm/i915/i915_irq.c static irqreturn_t valleyview_irq_handler(int irq, void *arg) · line 1899

Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +3 -0
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
 		/*
+		 * LPE audio interrupts are only enabled on Baytrail and
+		 * CherryView platforms without HDaudio
+		 */

OK - comment can be removed

Quoted 21 lines

drivers/gpu/drm/i915/i915_irq.c static void vlv_display_irq_postinstall(struct

Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +6 -0
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT |
+			   I915_LPE_PIPE_C_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
+		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
 		 */
@@ -2914,6 +2931,7 @@ static void vlv_display_irq_postinstall(struct

drm_i915_private *dev_priv)

Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +1 -0
 	u32 pipestat_mask;
 	u32 enable_mask;
 	enum pipe pipe;
+	u32 val;
 
 	pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
 			PIPE_CRC_DONE_INTERRUPT_STATUS;
@@ -2930,6 +2948,15 @@ static void vlv_display_irq_postinstall(struct
 drm_i915_private *dev_priv)
 
Quoted 8 lines

drivers/gpu/drm/i915/i915_irq.c static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv) · line 2953

Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +3 -0
 	WARN_ON(dev_priv->irq_mask != ~0);
 
+	/* add interrupt masks unconditially here, the actual unmask
+	 * will take place only if the LPE_AUDIO mode is detected
+	 */

Same here, this is just how we roll.

OK - comment can be removed

Quoted 218 lines
Quoted 14 lines
drivers/gpu/drm/i915/i915_irq.c +6 -0
+	val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT |
+		I915_LPE_PIPE_C_INTERRUPT);
+
+	enable_mask |= val;
+
 	dev_priv->irq_mask = ~enable_mask;
 

GEN5_IRQ_INIT(VLV_, dev_priv->irq_mask, enable_mask); diff --git
a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 90685d2..6fa0e25 100644

drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 2425

Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +0 -0
@@ -2424,6 +2424,9 @@ enum skl_disp_power_wells {
 #define I915_ASLE_INTERRUPT				(1<<0)
 #define I915_BSD_USER_INTERRUPT
	(1<<25)

drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 2426

Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +1 -0
+#define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE +

0x65000)

Quoted 24 lines
drivers/gpu/drm/i915/i915_reg.h +2 -0
+#define I915_HDMI_LPE_AUDIO_SIZE	0x1000
+
 #define GEN6_BSD_RNCID			_MMIO(0x12198)
 
 #define GEN7_FF_THREAD_MODE		_MMIO(0x20a0)
drivers/gpu/drm/i915/intel_lpe_audio.c new file +12 -0
new file mode 100644
index 0000000..e12e5f7
@@ -0,0 +1,363 @@
+/*
+ * Copyright (c) 2016 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

drivers/gpu/drm/i915/intel_lpe_audio.c line 22

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+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,

drivers/gpu/drm/i915/intel_lpe_audio.c line 26

Quoted 4 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +4 -0
+EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN

NO EVENT

drivers/gpu/drm/i915/intel_lpe_audio.c line 28

Quoted 2 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +2 -0
+SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,

DAMAGES

drivers/gpu/drm/i915/intel_lpe_audio.c line 30

Quoted 2 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +2 -0
+OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

OTHERWISE,

drivers/gpu/drm/i915/intel_lpe_audio.c line 32

Quoted 2 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +2 -0
+ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE

OR

Quoted 11 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +11 -0
+OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Pierre-Louis Bossart <[email protected]>
+ *    Jerome Anand <[email protected]>
+ *    based on VED patches
+ *
+ */
+
+/**

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+ * DOC: LPE Audio integration for HDMI or DP playback
+ *
+ * Motivation:
+ * Atom platforms (e.g. valleyview and cherryTrail) integrates a
+DMA-based
+ * interface as an alternative to the traditional HDaudio path. While
+this
+ * mode is unrelated to the LPE aka SST audio engine, the
+documentation refers
+ * to this mode as LPE so we keep this notation for the sake of

consistency.

Quoted 21 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +21 -0
+ *
+ * The interface is handled by a separate standalone driver
+maintained in the
+ * ALSA subsystem for simplicity. To minimize the interaction between
+the two
+ * subsystems, a bridge is setup between the hdmi-lpe-audio and i915:
+ * 1. Create a platform device to share MMIO/IRQ resources
+ * 2. Make the platform device child of i915 device for runtime PM.
+ * 3. Create IRQ chip to forward the LPE audio irqs.
+ * the hdmi-lpe-audio driver probes the lpe audio device and creates
+a new
+ * sound card
+ *
+ * Threats:
+ * Due to the restriction in Linux platform device model, user need
+manually
+ * uninstall the hdmi-lpe-audio driver before uninstalling i915
+module,
+ * otherwise we might run into use-after-free issues after i915
+removes the
+ * platform device: even though hdmi-lpe-audio driver is released,

drivers/gpu/drm/i915/intel_lpe_audio.c line 84

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+the modules
+ * is still in "installed" status.
+ *
+ * Implementation:
+ * The MMIO/REG platform resources are created according to the
+registers
+ * specification.
+ * When forwarding LPE audio irqs, the flow control handler selection
+depends
+ * on the platform, for example on valleyview handle_simple_irq is

enough.

Quoted 17 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +17 -0
+ *
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+
+#include "i915_drv.h"
+#include <linux/delay.h>
+#include <drm/intel_lpe_audio.h>
+
+static struct platform_device*
+lpe_audio_platdev_create(struct drm_i915_private *dev_priv) {
+	struct drm_device *dev = &dev_priv->drm;
+	int ret;
+	struct resource rsc[2] = {};
+	struct platform_device *platdev;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+	u64 *dma_mask;
+	struct intel_hdmi_lpe_audio_pdata *pdata;
+
+	if (dev_priv->lpe_audio.irq < 0)
+		return ERR_PTR(-EINVAL);
+
+	platdev = platform_device_alloc("hdmi-lpe-audio", -1);
+	if (!platdev) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate LPE audio platform

device\n");

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+		goto err;
+	}
+
+	/* to work-around check_addr in nommu_map_sg() */
+	dma_mask = kmalloc(sizeof(*platdev->dev.dma_mask),

GFP_KERNEL);

Quoted 7 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +7 -0
+	if (!dma_mask) {
+		ret = -ENOMEM;
+		DRM_ERROR("Failed to allocate dma_mask\n");
+		goto err_put_dev;
+	}
+	*dma_mask = DMA_BIT_MASK(32);
+	platdev->dev.dma_mask = dma_mask;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+	platdev->dev.coherent_dma_mask = *dma_mask;
+
+	rsc[0].start    = rsc[0].end = dev_priv->lpe_audio.irq;
+	rsc[0].flags    = IORESOURCE_IRQ;
+	rsc[0].name     = "hdmi-lpe-audio-irq";
+
+	rsc[1].start    = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE;
+	rsc[1].end      = pci_resource_start(dev->pdev, 0) +
+		I915_HDMI_LPE_AUDIO_BASE +

I915_HDMI_LPE_AUDIO_SIZE - 1;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 6 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +6 -0
+	rsc[1].flags    = IORESOURCE_MEM;
+	rsc[1].name     = "hdmi-lpe-audio-mmio";
+
+	ret = platform_device_add_resources(platdev, rsc, 2);
+	if (ret) {
+		DRM_ERROR("Failed to add resource for platform device:

%d\n",

Quoted 8 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +8 -0
+			ret);
+		goto err_put_dev;
+	}
+
+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+
+	if (pdata == NULL) {
+		ret = -ENOMEM;

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+		goto err_put_dev;
+	}
+	platdev->dev.platform_data = pdata;
+	spin_lock_init(&pdata->lpe_audio_slock);
+
+	/* for LPE audio driver's runtime-PM */
+	platdev->dev.parent = dev->dev;
+	ret = platform_device_add(platdev);
+	if (ret) {
+		DRM_ERROR("Failed to add LPE audio platform device:

%d\n",

Quoted 17 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +17 -0
+			ret);
+		goto err_put_dev;
+	}
+
+	return platdev;
+err_put_dev:
+	platform_device_put(platdev);
+	kfree(dma_mask);
+err:
+	return ERR_PTR(ret);
+}
+
+static void lpe_audio_platdev_destroy(struct drm_i915_private
+*dev_priv) {
+	platform_device_unregister(dev_priv->lpe_audio.platdev);
+	kfree(dev_priv->lpe_audio.platdev->dev.dma_mask);
+}
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 157

Quoted 6 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +6 -0
+
+static void lpe_audio_irq_unmask(struct irq_data *d) {
+	struct drm_i915_private *dev_priv = d->chip_data;
+	unsigned long irqflags;
+	u32 val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT);

PIPE_C missing?

No PIPE_C on vlv

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +7 -0
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	/*
+	 * VLV_IER is already set in the vlv_display_postinstall(),
+	 * we only change VLV_IIR and VLV_IMR
+	 */
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 169

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+	dev_priv->irq_mask &= ~val;
+	I915_WRITE(VLV_IIR, val);
+	I915_WRITE(VLV_IIR, val);
+	I915_WRITE(VLV_IMR, dev_priv->irq_mask);
+	POSTING_READ(VLV_IMR);

vlv_update_display_irq similar to ilk_update_display_irq in i915_irq.c would be good imo. And again the comment kinda explains the usual. Same below.

OK - comment can be removed

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +7 -0
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags); }
+
+static void lpe_audio_irq_mask(struct irq_data *d) {
+	struct drm_i915_private *dev_priv = d->chip_data;
+	unsigned long irqflags;
+	u32 val = (I915_LPE_PIPE_A_INTERRUPT |
Quoted 8 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 164

Quoted 8 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +8 -0
+		I915_LPE_PIPE_B_INTERRUPT);
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	/*
+	 * VLV_IER is already set in the vlv_display_postinstall(),
+	 * we only change VLV_IIR and VLV_IMR
+	 */

OK - comment can be removed

Quoted 244 lines
Quoted 29 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +29 -0
+	dev_priv->irq_mask |= val;
+	I915_WRITE(VLV_IMR, dev_priv->irq_mask);
+	I915_WRITE(VLV_IIR, val);
+	I915_WRITE(VLV_IIR, val);
+	POSTING_READ(VLV_IIR);
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags); }
+
+static struct irq_chip lpe_audio_irqchip = {
+	.name = "hdmi_lpe_audio_irqchip",
+	.irq_mask = lpe_audio_irq_mask,
+	.irq_unmask = lpe_audio_irq_unmask,
+};
+
+static int lpe_audio_irq_init(struct drm_i915_private *dev_priv) {
+	int irq = dev_priv->lpe_audio.irq;
+
+	WARN_ON(!intel_irqs_enabled(dev_priv));
+	irq_set_chip_and_handler_name(irq,
+				&lpe_audio_irqchip,
+				handle_simple_irq,
+				"hdmi_lpe_audio_irq_handler");
+
+	return irq_set_chip_data(irq, dev_priv); }
+
+/**
+ * intel_lpe_audio_irq_handler() - forwards the LPE audio irq
+ * @dev_priv: the i915 drm device private data
+ *

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+ * the LPE Audio irq is forwarded to the irq handler registered by
+LPE audio
+ * driver.
+ */
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv) {
+	int ret;
+
+	ret = generic_handle_irq(dev_priv->lpe_audio.irq);
+	if (ret)
+		DRM_ERROR_RATELIMITED("error handling LPE audio irq:

%d\n",

Quoted 14 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +14 -0
+				ret);
+}
+
+/**
+ * intel_lpe_audio_detect() - check & setup lpe audio if present
+ * @dev_priv: the i915 drm device private data
+ *
+ * Detect if lpe audio is present
+ *
+ * Return: true if lpe audio present else Return = false  */ bool
+intel_lpe_audio_detect(struct drm_i915_private *dev_priv) {
+	int lpe_present = false;
+
+	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+		static const struct pci_device_id atom_hdaudio_ids[] = {
+			/* Baytrail */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f04)},
+			/* Braswell */
+			{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2284)},
+			{}
+		};
+
+		if (!pci_dev_present(atom_hdaudio_ids)) {
+			DRM_INFO("%s%s\n", "HDaudio controller not

detected,",

Quoted 35 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +35 -0
+				"using LPE audio instead\n");
+			lpe_present = true;
+		}
+	}
+	return lpe_present;
+}
+
+/**
+ * intel_lpe_audio_setup() - setup the bridge between HDMI LPE Audio
+ * driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * set up the minimum required resources for the bridge: irq chip,
+ * platform resource and platform device. i915 device is set as
+parent
+ * of the new platform device.
+ *
+ * Return: 0 if successful. non-zero if allocation/initialization
+fails  */ int intel_lpe_audio_setup(struct drm_i915_private
+*dev_priv) {
+	int ret;
+
+	dev_priv->lpe_audio.irq = irq_alloc_desc(0);
+	if (dev_priv->lpe_audio.irq < 0) {
+		DRM_ERROR("Failed to allocate IRQ desc: %d\n",
+			dev_priv->lpe_audio.irq);
+		ret = dev_priv->lpe_audio.irq;
+		goto err;
+	}
+
+	DRM_DEBUG("irq = %d\n", dev_priv->lpe_audio.irq);
+
+	ret = lpe_audio_irq_init(dev_priv);
+
+	if (ret) {

drivers/gpu/drm/i915/intel_lpe_audio.c

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +10 -0
+		DRM_ERROR("Failed to initialize irqchip for lpe audio: %d\n",
+			ret);
+		goto err_free_irq;
+	}
+
+	dev_priv->lpe_audio.platdev = lpe_audio_platdev_create(dev_priv);
+
+	if (IS_ERR(dev_priv->lpe_audio.platdev)) {
+		ret = PTR_ERR(dev_priv->lpe_audio.platdev);
+		DRM_ERROR("Failed to create lpe audio platform device:

%d\n",

Quoted 80 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +62 -0
+			ret);
+		goto err_free_irq;
+	}
+
+	return 0;
+err_free_irq:
+	irq_free_desc(dev_priv->lpe_audio.irq);
+err:
+	dev_priv->lpe_audio.irq = -1;
+	dev_priv->lpe_audio.platdev = NULL;
+	return ret;
+}
+
+
+/**
+ * intel_lpe_audio_init() - detect and setup the bridge between HDMI
+LPE Audio
+ * driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * Return: 0 if successful. non-zero if detection or
+ * llocation/initialization fails
+ */
+int intel_lpe_audio_init(struct drm_i915_private *dev_priv) {
+	int ret = -ENODEV;
+
+	if (intel_lpe_audio_detect(dev_priv)) {
+		ret = intel_lpe_audio_setup(dev_priv);
+		if (ret < 0)
+			DRM_ERROR("failed to setup LPE Audio bridge\n");
+	}
+	return ret;
+}
+
+/**
+ * intel_lpe_audio_teardown() - destroy the bridge between HDMI LPE
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ *
+ * release all the resources for LPE audio <-> i915 bridge.
+ */
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) {
+	unsigned long irqflags;
+	struct irq_desc *desc;
+
+	if (!HAS_LPE_AUDIO(dev_priv))
+		return;
+
+	desc = irq_to_desc(dev_priv->lpe_audio.irq);
+
+	/**
+	 * mask LPE audio irq before destroying
+	 */
+	lpe_audio_irq_mask(&desc->irq_data);
+
+	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+
+	lpe_audio_platdev_destroy(dev_priv);
+
+	irq_free_desc(dev_priv->lpe_audio.irq);
+
+	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags); }
(quoted diff) +0 -0

b/include/drm/intel_lpe_audio.h new file mode 100644 index 0000000..a64c449

include/drm/intel_lpe_audio.h new file +12 -0
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 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

include/drm/intel_lpe_audio.h line 22

Quoted 10 lines
include/drm/intel_lpe_audio.h new file +10 -0
+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,

include/drm/intel_lpe_audio.h line 26

Quoted 4 lines
include/drm/intel_lpe_audio.h new file +4 -0
+EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN

NO EVENT

include/drm/intel_lpe_audio.h line 28

Quoted 2 lines
include/drm/intel_lpe_audio.h new file +2 -0
+SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,

DAMAGES

include/drm/intel_lpe_audio.h line 30

Quoted 2 lines
include/drm/intel_lpe_audio.h new file +2 -0
+OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

OTHERWISE,

include/drm/intel_lpe_audio.h line 32

Quoted 2 lines
include/drm/intel_lpe_audio.h new file +2 -0
+ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE

OR

Quoted 15 lines
include/drm/intel_lpe_audio.h new file +15 -0
+OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef _INTEL_LPE_AUDIO_H_
+#define _INTEL_LPE_AUDIO_H_
+
+#include <linux/types.h>
+
+#define HDMI_MAX_ELD_BYTES	128
+
+struct intel_hdmi_lpe_audio_eld {
+	int port_id;
+	unsigned char eld_data[HDMI_MAX_ELD_BYTES]; };
+

include/drm/intel_lpe_audio.h line 45

Quoted 10 lines
include/drm/intel_lpe_audio.h new file +10 -0
+struct intel_hdmi_lpe_audio_pdata {
+	bool notify_pending;
+	int tmds_clock_speed;
+	bool hdmi_connected;
+	struct intel_hdmi_lpe_audio_eld eld;
+	void (*notify_audio_lpe)(void *audio_ptr);
+	spinlock_t lpe_audio_slock;
+};
+
+#endif /* _I915_LPE_AUDIO_H_ */

Besides the few bikesheds seems all reasonable, with those addressed

Quoted 2 lines

Thanks

Quoted 7 lines

... for merging through sound tree. Since we're super early in 4.11 a topic branch for me to pull in to avoid sync headaches would be good. -Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

Re: [alsa-devel] [PATCH 1/7] drm/i915: setup bridge for HDMI LPE audio driver

In reply to Daniel Vetter
Quoted 11 lines
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c line 157

Quoted 6 lines
drivers/gpu/drm/i915/intel_lpe_audio.c new file +5 -0
+static void lpe_audio_irq_unmask(struct irq_data *d) {
+	struct drm_i915_private *dev_priv = d->chip_data;
+	unsigned long irqflags;
+	u32 val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT);

PIPE_C missing?

No PIPE_C on vlv

Good catch Daniel.
We initially had PIPE_C everyhwere, thinking that it's harmless on Baytrail. Ville had a comment that there was no PIPE_C on BYT so we removed it for Baytrail-only code, here it makes no sense to me. we have the same problem in lpe_audio_irq_mask

Quoted 9 lines
Quoted 4 lines

Besides the few bikesheds seems all reasonable, with those addressed

Thanks

Quoted 2 lines

... for merging through sound tree. Since we're super early in 4.11 a topic branch for me to pull in to avoid sync headaches would be good.

Thanks for the reviews and ack, we'll fix the comments shortly.
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

PATCH 2/7 drm/i915: Add support for audio driver notifications

In reply to Jerome Anand

Notifiations like mode change, hot plug and edid to the audio driver are added. This is inturn used by the audio driver for its functionality.

A new interface file capturing the notifications needed by the audio driver is added

---
 drivers/gpu/drm/i915/i915_drv.h        |  3 +++
 drivers/gpu/drm/i915/intel_audio.c     |  8 ++++++
 drivers/gpu/drm/i915/intel_hdmi.c      |  1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 46 ++++++++++++++++++++++++++++++++++
 include/drm/intel_lpe_audio.h          |  1 +
 5 files changed, 59 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
index 1317834..0dbe91a 100644
@@ -3696,6 +3696,9 @@ int  intel_lpe_audio_setup(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
 bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_audio.c +8 -0
index 3bbc96c..77cd086 100644
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -630,6 +631,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, connector->eld, port,
+			crtc_state->port_clock, true);
 }
 
 /**
@@ -663,6 +668,9 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, NULL, port, 0, true);
 }
 
 /**
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 0bcfead..377584e1 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)
drivers/gpu/drm/i915/intel_lpe_audio.c +46 -0

49 lines not on this page · raw message

include/drm/intel_lpe_audio.h +1 -0
index a64c449..952de05 100644
@@ -25,6 +25,7 @@
 #define _INTEL_LPE_AUDIO_H_
 
 #include <linux/types.h>
+#include <linux/spinlock_types.h>
 
 #define HDMI_MAX_ELD_BYTES	128
 
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 56 lines · Jerome Anand

Notifiations like mode change, hot plug and edid to the audio driver are added. This is inturn used by the audio driver for its functionality.

A new interface file capturing the notifications needed by the audio driver is added

---
 drivers/gpu/drm/i915/i915_drv.h        |  3 +++
 drivers/gpu/drm/i915/intel_audio.c     |  8 ++++++
 drivers/gpu/drm/i915/intel_hdmi.c      |  1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 46 ++++++++++++++++++++++++++++++++++
 include/drm/intel_lpe_audio.h          |  1 +
 5 files changed, 59 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
index 1317834..0dbe91a 100644
@@ -3696,6 +3696,9 @@ int  intel_lpe_audio_setup(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
 bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_audio.c +5 -0
index 3bbc96c..77cd086 100644
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -630,6 +631,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, connector->eld, port,
+			crtc_state->port_clock, true);
 }
 
 /**

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_disable(struct intel_encoder *intel_encoder) · line 673

Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +3 -0
@@ -663,6 +668,9 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, NULL, port, 0, true);

Does it still notify as connected?

Quoted 33 lines
drivers/gpu/drm/i915/intel_audio.c +0 -0
 }
 
 /**
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 0bcfead..377584e1 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)
drivers/gpu/drm/i915/intel_lpe_audio.c +10 -0
index e12e5f7..a141a9c 100644
@@ -361,3 +361,49 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
 
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
+
+
+/**
+ * intel_lpe_audio_notify() - notify lpe audio event
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ * @eld : ELD data
+ * @port: port id
+ * @tmds_clk_speed: tmds clock frequency in Hz
+ * @connected: hdmi connected/disconnected

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 383

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +10 -0
+ *
+ * Notify lpe audio driver of eld change.
+ */
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected)
+{
+	unsigned long irq_flags;
+
+	if (HAS_LPE_AUDIO(dev_priv)) {

Just bail out here when !HAS_LPE_AUDIO(). Then the rest needs less indentation and will be more readable.

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +5 -0
+		struct intel_hdmi_lpe_audio_pdata *pdata = dev_get_platdata(
+			&(dev_priv->lpe_audio.platdev->dev));
+
+		spin_lock_irqsave(&pdata->lpe_audio_slock,
+			irq_flags);

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 398

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +10 -0
+
+		if (eld != NULL) {
+			memcpy(pdata->eld.eld_data, eld,
+				HDMI_MAX_ELD_BYTES);
+			pdata->eld.port_id = port;
+
+			if (tmds_clk_speed)
+				pdata->tmds_clock_speed =
+					tmds_clk_speed;
+		}

If eld==NULL means that no ELD is found (or disconnected), it's better to clear pdata eld as well, so that we don't leak the previous ELD.

Quoted 16 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +11 -0
+		pdata->hdmi_connected = connected;
+		if (pdata->notify_audio_lpe)
+			pdata->notify_audio_lpe(
+				(eld != NULL) ? &pdata->eld : NULL);
+		else
+			pdata->notify_pending = true;
+
+		spin_unlock_irqrestore(&pdata->lpe_audio_slock,
+			irq_flags);
+	}
+}
include/drm/intel_lpe_audio.h +0 -0
index a64c449..952de05 100644

include/drm/intel_lpe_audio.h line 28

Quoted 4 lines
include/drm/intel_lpe_audio.h +1 -0
@@ -25,6 +25,7 @@
 #define _INTEL_LPE_AUDIO_H_
 
 #include <linux/types.h>
+#include <linux/spinlock_types.h>

Why do we need to add a header at this point out of sudden?

thanks,

Takashi

Quoted 6 lines
include/drm/intel_lpe_audio.h +0 -0
 #define HDMI_MAX_ELD_BYTES	128
 
Signature · 1 line
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 78 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 5:21 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 8 lines · Jerome Anand

Notifiations like mode change, hot plug and edid to the audio driver are added. This is inturn used by the audio driver for its functionality.

A new interface file capturing the notifications needed by the audio driver is added

Quoted 8 lines

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

---
 drivers/gpu/drm/i915/i915_drv.h        |  3 +++
 drivers/gpu/drm/i915/intel_audio.c     |  8 ++++++
 drivers/gpu/drm/i915/intel_hdmi.c      |  1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 46

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_enable(struct

Quoted 32 lines
 include/drm/intel_lpe_audio.h          |  1 +
 5 files changed, 59 insertions(+)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.h index 1317834..0dbe91a 100644

drivers/gpu/drm/i915/i915_drv.h +0 -0
@@ -3696,6 +3696,9 @@ int  intel_lpe_audio_setup(struct
drm_i915_private *dev_priv);  void intel_lpe_audio_teardown(struct
drm_i915_private *dev_priv);  void intel_lpe_audio_irq_handler(struct
drm_i915_private *dev_priv);  bool intel_lpe_audio_detect(struct

drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_drv.h +3 -1
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv); diff
--git a/drivers/gpu/drm/i915/intel_audio.c

b/drivers/gpu/drm/i915/intel_audio.c
index 3bbc96c..77cd086 100644

drivers/gpu/drm/i915/intel_audio.c +1 -0
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -630,6 +631,10 @@ void intel_audio_codec_enable(struct

intel_encoder *intel_encoder,

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_disable(struct

Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +4 -0
 	if (acomp && acomp->audio_ops && acomp->audio_ops-
 pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops-
 audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, connector->eld, port,
+			crtc_state->port_clock, true);
 }

/**

drivers/gpu/drm/i915/intel_audio.c +0 -0
@@ -663,6 +668,9 @@ void intel_audio_codec_disable(struct

intel_encoder *intel_encoder)

Quoted 11 lines

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_disable(struct intel_encoder *intel_encoder) · line 673

Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +3 -0
 	if (acomp && acomp->audio_ops && acomp->audio_ops-
 pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops-
 audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, NULL, port, 0, true);

Does it still notify as connected?

OK - this will be changed

Quoted 41 lines
Quoted 41 lines
drivers/gpu/drm/i915/intel_audio.c +0 -0
 }

/**

drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 0bcfead..377584e1 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi

*intel_hdmi) diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
index e12e5f7..a141a9c 100644

drivers/gpu/drm/i915/intel_lpe_audio.c +15 -0
@@ -361,3 +361,49 @@ void intel_lpe_audio_teardown(struct
 drm_i915_private *dev_priv)
 
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);  }
+
+
+/**
+ * intel_lpe_audio_notify() - notify lpe audio event
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ * @eld : ELD data
+ * @port: port id
+ * @tmds_clk_speed: tmds clock frequency in Hz
+ * @connected: hdmi connected/disconnected
+ *
+ * Notify lpe audio driver of eld change.
+ */
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 383

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +5 -0
+			bool connected)
+{
+	unsigned long irq_flags;
+
+	if (HAS_LPE_AUDIO(dev_priv)) {

Just bail out here when !HAS_LPE_AUDIO(). Then the rest needs less indentation and will be more readable.

OK

Quoted 11 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct · line 384

Quoted 1 line
drivers/gpu/drm/i915/intel_lpe_audio.c +1 -0
+		struct intel_hdmi_lpe_audio_pdata *pdata =

dev_get_platdata(

Quoted 9 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +9 -0
+			&(dev_priv->lpe_audio.platdev->dev));
+
+		spin_lock_irqsave(&pdata->lpe_audio_slock,
+			irq_flags);
+
+		if (eld != NULL) {
+			memcpy(pdata->eld.eld_data, eld,
+				HDMI_MAX_ELD_BYTES);
+			pdata->eld.port_id = port;
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 398

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +5 -0
+
+			if (tmds_clk_speed)
+				pdata->tmds_clock_speed =
+					tmds_clk_speed;
+		}

If eld==NULL means that no ELD is found (or disconnected), it's better to clear pdata eld as well, so that we don't leak the previous ELD.

OK

Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +11 -0
+		pdata->hdmi_connected = connected;
+		if (pdata->notify_audio_lpe)
+			pdata->notify_audio_lpe(
+				(eld != NULL) ? &pdata->eld : NULL);
+		else
+			pdata->notify_pending = true;
+
+		spin_unlock_irqrestore(&pdata->lpe_audio_slock,
+			irq_flags);
+	}
+}
(quoted diff) +0 -0

b/include/drm/intel_lpe_audio.h index a64c449..952de05 100644

include/drm/intel_lpe_audio.h +0 -0
@@ -25,6 +25,7 @@
 #define _INTEL_LPE_AUDIO_H_
 
Quoted 5 lines

include/drm/intel_lpe_audio.h line 28

Quoted 2 lines
include/drm/intel_lpe_audio.h +1 -0
 #include <linux/types.h>
+#include <linux/spinlock_types.h>

Why do we need to add a header at this point out of sudden?

It was for some warning removal. I'll try to remove this if not applicable now.

Quoted 12 lines

thanks,

Takashi

Quoted 6 lines
include/drm/intel_lpe_audio.h +0 -1
 #define HDMI_MAX_ELD_BYTES	128
 
--

2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 90 lines · Jerome
Quoted 78 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 5:21 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 8 lines · Jerome Anand

Notifiations like mode change, hot plug and edid to the audio driver are added. This is inturn used by the audio driver for its functionality.

A new interface file capturing the notifications needed by the audio driver is added

Quoted 8 lines

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

---
 drivers/gpu/drm/i915/i915_drv.h        |  3 +++
 drivers/gpu/drm/i915/intel_audio.c     |  8 ++++++
 drivers/gpu/drm/i915/intel_hdmi.c      |  1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 46

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_enable(struct

Quoted 32 lines
 include/drm/intel_lpe_audio.h          |  1 +
 5 files changed, 59 insertions(+)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.h index 1317834..0dbe91a 100644

drivers/gpu/drm/i915/i915_drv.h +0 -0
@@ -3696,6 +3696,9 @@ int  intel_lpe_audio_setup(struct
drm_i915_private *dev_priv);  void intel_lpe_audio_teardown(struct
drm_i915_private *dev_priv);  void intel_lpe_audio_irq_handler(struct
drm_i915_private *dev_priv);  bool intel_lpe_audio_detect(struct

drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_drv.h +3 -1
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv); diff
--git a/drivers/gpu/drm/i915/intel_audio.c

b/drivers/gpu/drm/i915/intel_audio.c
index 3bbc96c..77cd086 100644

drivers/gpu/drm/i915/intel_audio.c +1 -0
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -630,6 +631,10 @@ void intel_audio_codec_enable(struct

intel_encoder *intel_encoder,

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_disable(struct

Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +4 -0
 	if (acomp && acomp->audio_ops && acomp->audio_ops-
 pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops-
 audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, connector->eld, port,
+			crtc_state->port_clock, true);
 }

/**

drivers/gpu/drm/i915/intel_audio.c +0 -0
@@ -663,6 +668,9 @@ void intel_audio_codec_disable(struct

intel_encoder *intel_encoder)

Quoted 11 lines

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_disable(struct intel_encoder *intel_encoder) · line 673

Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +3 -0
 	if (acomp && acomp->audio_ops && acomp->audio_ops-
 pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops-
 audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, NULL, port, 0, true);

Does it still notify as connected?

Quoted 1 line

OK - this will be changed

The entire 'connected' parameter seems superfluous.

Also why aren't we passing 'pipe' along here? How is the audio driver supposed to find the right thing to use?

Quoted 116 lines
Quoted 42 lines
Quoted 42 lines
drivers/gpu/drm/i915/intel_audio.c +0 -0
 }

/**

drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 0bcfead..377584e1 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi

*intel_hdmi) diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
index e12e5f7..a141a9c 100644

drivers/gpu/drm/i915/intel_lpe_audio.c +15 -0
@@ -361,3 +361,49 @@ void intel_lpe_audio_teardown(struct
 drm_i915_private *dev_priv)
 
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);  }
+
+
+/**
+ * intel_lpe_audio_notify() - notify lpe audio event
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ * @eld : ELD data
+ * @port: port id
+ * @tmds_clk_speed: tmds clock frequency in Hz
+ * @connected: hdmi connected/disconnected
+ *
+ * Notify lpe audio driver of eld change.
+ */
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 383

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +5 -0
+			bool connected)
+{
+	unsigned long irq_flags;
+
+	if (HAS_LPE_AUDIO(dev_priv)) {

Just bail out here when !HAS_LPE_AUDIO(). Then the rest needs less indentation and will be more readable.

OK

Quoted 11 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct · line 384

Quoted 1 line
drivers/gpu/drm/i915/intel_lpe_audio.c +1 -0
+		struct intel_hdmi_lpe_audio_pdata *pdata =

dev_get_platdata(

Quoted 9 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +9 -0
+			&(dev_priv->lpe_audio.platdev->dev));
+
+		spin_lock_irqsave(&pdata->lpe_audio_slock,
+			irq_flags);
+
+		if (eld != NULL) {
+			memcpy(pdata->eld.eld_data, eld,
+				HDMI_MAX_ELD_BYTES);
+			pdata->eld.port_id = port;
Quoted 9 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 398

Quoted 5 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +5 -0
+
+			if (tmds_clk_speed)
+				pdata->tmds_clock_speed =
+					tmds_clk_speed;
+		}

If eld==NULL means that no ELD is found (or disconnected), it's better to clear pdata eld as well, so that we don't leak the previous ELD.

OK

Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +11 -0
+		pdata->hdmi_connected = connected;
+		if (pdata->notify_audio_lpe)
+			pdata->notify_audio_lpe(
+				(eld != NULL) ? &pdata->eld : NULL);
+		else
+			pdata->notify_pending = true;
+
+		spin_unlock_irqrestore(&pdata->lpe_audio_slock,
+			irq_flags);
+	}
+}
(quoted diff) +0 -0

b/include/drm/intel_lpe_audio.h index a64c449..952de05 100644

include/drm/intel_lpe_audio.h +0 -0
@@ -25,6 +25,7 @@
 #define _INTEL_LPE_AUDIO_H_
 
Quoted 5 lines

include/drm/intel_lpe_audio.h line 28

Quoted 2 lines
include/drm/intel_lpe_audio.h +1 -0
 #include <linux/types.h>
+#include <linux/spinlock_types.h>

Why do we need to add a header at this point out of sudden?

It was for some warning removal. I'll try to remove this if not applicable now.

Quoted 12 lines

thanks,

Takashi

Quoted 6 lines
include/drm/intel_lpe_audio.h +0 -1
 #define HDMI_MAX_ELD_BYTES	128
 
--

2.9.3

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

In reply to Jerome Anand
Quoted 96 lines · Jerome Anand

Notifiations like mode change, hot plug and edid to the audio driver are added. This is inturn used by the audio driver for its functionality.

A new interface file capturing the notifications needed by the audio driver is added

---
 drivers/gpu/drm/i915/i915_drv.h        |  3 +++
 drivers/gpu/drm/i915/intel_audio.c     |  8 ++++++
 drivers/gpu/drm/i915/intel_hdmi.c      |  1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 46 ++++++++++++++++++++++++++++++++++
 include/drm/intel_lpe_audio.h          |  1 +
 5 files changed, 59 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
index 1317834..0dbe91a 100644
@@ -3696,6 +3696,9 @@ int  intel_lpe_audio_setup(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
 bool intel_lpe_audio_detect(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_audio.c +8 -0
index 3bbc96c..77cd086 100644
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -630,6 +631,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, connector->eld, port,
+			crtc_state->port_clock, true);
 }
 
 /**
@@ -663,6 +668,9 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, NULL, port, 0, true);
 }
 
 /**
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 0bcfead..377584e1 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)
drivers/gpu/drm/i915/intel_lpe_audio.c +12 -0
index e12e5f7..a141a9c 100644
@@ -361,3 +361,49 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
 
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
+
+
+/**
+ * intel_lpe_audio_notify() - notify lpe audio event
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ * @eld : ELD data
+ * @port: port id
+ * @tmds_clk_speed: tmds clock frequency in Hz
+ * @connected: hdmi connected/disconnected
+ *
+ * Notify lpe audio driver of eld change.

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 385

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +10 -0
+ */
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected)
+{
+	unsigned long irq_flags;
+
+	if (HAS_LPE_AUDIO(dev_priv)) {
+		struct intel_hdmi_lpe_audio_pdata *pdata = dev_get_platdata(
+			&(dev_priv->lpe_audio.platdev->dev));

Only noticed it here, but why again do we need to re-roll our intel-only hdmi/eld notification? The one we have for hda is somewhat justified since it went in at roughly the same time as the new shared one across a bunch of soc. But this one here is just a reinvented wheel.

And yes this code has been hanging around internally for years, but that's kinda not a good excuse.

Obviously this comment applies to patch 1 too.

i915 integration otherwise looks reasonable.
-Daniel

Quoted 43 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +24 -0
+
+		spin_lock_irqsave(&pdata->lpe_audio_slock,
+			irq_flags);
+
+		if (eld != NULL) {
+			memcpy(pdata->eld.eld_data, eld,
+				HDMI_MAX_ELD_BYTES);
+			pdata->eld.port_id = port;
+
+			if (tmds_clk_speed)
+				pdata->tmds_clock_speed =
+					tmds_clk_speed;
+		}
+		pdata->hdmi_connected = connected;
+		if (pdata->notify_audio_lpe)
+			pdata->notify_audio_lpe(
+				(eld != NULL) ? &pdata->eld : NULL);
+		else
+			pdata->notify_pending = true;
+
+		spin_unlock_irqrestore(&pdata->lpe_audio_slock,
+			irq_flags);
+	}
+}
include/drm/intel_lpe_audio.h +1 -0
index a64c449..952de05 100644
@@ -25,6 +25,7 @@
 #define _INTEL_LPE_AUDIO_H_
 
 #include <linux/types.h>
+#include <linux/spinlock_types.h>
 
 #define HDMI_MAX_ELD_BYTES	128
 
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 10 lines · Daniel Vetter

Only noticed it here, but why again do we need to re-roll our intel-only hdmi/eld notification? The one we have for hda is somewhat justified since it went in at roughly the same time as the new shared one across a bunch of soc. But this one here is just a reinvented wheel.

And yes this code has been hanging around internally for years, but that's kinda not a good excuse.

Obviously this comment applies to patch 1 too.

Yeah, a unified common interface would be better, really. I'm basically OK with the current implementation, though, as long as it works. But if we can sort it out quickly, it's better.

That said, we may reuse i915_audio_component stuff -- or at least, reuse the object used there without actual component binding (the lpe driver doesn't need the component because it's a strong dependency unlike HD-audio case), and just add a few more fields there. Instead of exposing the resource, we can provide the register accessor there, too.

It's just an idea, so not necessarily serious taken. But we can think of unification more easily now than later.

BTW, now one thing came to my mind: don't we need the power control (pm and power well domain) when accessing from the sound driver side? The HD-audio component object has the gfx side callback points for such.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 24 lines · Takashi Iwai
Quoted 10 lines · Daniel Vetter

Only noticed it here, but why again do we need to re-roll our intel-only hdmi/eld notification? The one we have for hda is somewhat justified since it went in at roughly the same time as the new shared one across a bunch of soc. But this one here is just a reinvented wheel.

And yes this code has been hanging around internally for years, but that's kinda not a good excuse.

Obviously this comment applies to patch 1 too.

Yeah, a unified common interface would be better, really. I'm basically OK with the current implementation, though, as long as it works. But if we can sort it out quickly, it's better.

That said, we may reuse i915_audio_component stuff -- or at least, reuse the object used there without actual component binding (the lpe driver doesn't need the component because it's a strong dependency unlike HD-audio case), and just add a few more fields there. Instead of exposing the resource, we can provide the register accessor there, too.

Quoted 8 lines

It's just an idea, so not necessarily serious taken. But we can think of unification more easily now than later.

BTW, now one thing came to my mind: don't we need the power control (pm and power well domain) when accessing from the sound driver side? The HD-audio component object has the gfx side callback points for such.

The code hasn't actually been around for years. We threw away the legacy driver and restarted the i915 integration pretty much from scratch using the feedback on the intel-gfx mailing list, specifically Jesse Barnes and Ville Syrjala, with only basic programming sequences and register definitions kept on the audio side. The volume of code required on the i915 side was reduced by probably 50%, with useless stuff taken out left and right. We're down to ~500 lines changed on the i915 side with about 400 just for the interface in the new intel_lpe_audio.c file.

The initial idea for the rework was to use the component framework. Then during the initial review it was suggested that component framework wasn't that great and that the design should follow the example of the VED integration with a subdevice created and pdata used to communicate between the i915 and audio sides. I threw the initial component framework patches away and we started in this direction.

There is no power domain here and in general no issue with probe happening independently at different times, the subdevice/pdata is simple enough to model the hardware. If there is an agreement to push for a unified interface, that's fine and I will commit to port the code as needed. We can modify the interface, all that's needed is to provide the ELD and let the audio side program a window of register space on the i915 side. But quite frankly I'd rather see the code being merged first to expand the userbase, today HDMI can only be enabled with out-of-tree patches pulled from my github ported on the last 6 kernel versions. I also plan to work an update on DisplayPort support since there are CHT devices on the market now.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#15 lore raw

Re: [PATCH 2/7] drm/i915: Add support for audio driver notifications

In reply to Daniel Vetter
Quoted 132 lines

-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, December 14, 2016 6:26 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 2/7] drm/i915: Add support for audio driver notifications

Quoted 7 lines · Jerome Anand

Notifiations like mode change, hot plug and edid to the audio driver are added. This is inturn used by the audio driver for its functionality.

A new interface file capturing the notifications needed by the audio driver is added

Quoted 8 lines

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

---
 drivers/gpu/drm/i915/i915_drv.h        |  3 +++
 drivers/gpu/drm/i915/intel_audio.c     |  8 ++++++
 drivers/gpu/drm/i915/intel_hdmi.c      |  1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c | 46

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_enable(struct

Quoted 32 lines
 include/drm/intel_lpe_audio.h          |  1 +
 5 files changed, 59 insertions(+)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.h index 1317834..0dbe91a 100644

drivers/gpu/drm/i915/i915_drv.h +0 -0
@@ -3696,6 +3696,9 @@ int  intel_lpe_audio_setup(struct
drm_i915_private *dev_priv);  void intel_lpe_audio_teardown(struct
drm_i915_private *dev_priv);  void intel_lpe_audio_irq_handler(struct
drm_i915_private *dev_priv);  bool intel_lpe_audio_detect(struct

drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_drv.h +3 -1
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_i915_private *dev_priv); diff
--git a/drivers/gpu/drm/i915/intel_audio.c

b/drivers/gpu/drm/i915/intel_audio.c
index 3bbc96c..77cd086 100644

drivers/gpu/drm/i915/intel_audio.c +1 -0
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -630,6 +631,10 @@ void intel_audio_codec_enable(struct

intel_encoder *intel_encoder,

drivers/gpu/drm/i915/intel_audio.c void intel_audio_codec_disable(struct

Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +4 -0
 	if (acomp && acomp->audio_ops && acomp->audio_ops-
 pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops-
 audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, connector->eld, port,
+			crtc_state->port_clock, true);
 }

/**

drivers/gpu/drm/i915/intel_audio.c +0 -0
@@ -663,6 +668,9 @@ void intel_audio_codec_disable(struct

intel_encoder *intel_encoder)

Quoted 44 lines
drivers/gpu/drm/i915/intel_audio.c +3 -0
 	if (acomp && acomp->audio_ops && acomp->audio_ops-
 pin_eld_notify)
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops-
 audio_ptr,
 						 (int) port, (int) pipe);
+
+	if (HAS_LPE_AUDIO(dev_priv))
+		intel_lpe_audio_notify(dev_priv, NULL, port, 0, true);
 }

/**

drivers/gpu/drm/i915/intel_hdmi.c +1 -0
index 0bcfead..377584e1 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi

*intel_hdmi) diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
index e12e5f7..a141a9c 100644

drivers/gpu/drm/i915/intel_lpe_audio.c +11 -0
@@ -361,3 +361,49 @@ void intel_lpe_audio_teardown(struct
 drm_i915_private *dev_priv)
 
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);  }
+
+
+/**
+ * intel_lpe_audio_notify() - notify lpe audio event
+ * audio driver and i915
+ * @dev_priv: the i915 drm device private data
+ * @eld : ELD data
+ * @port: port id
+ * @tmds_clk_speed: tmds clock frequency in Hz
+ * @connected: hdmi connected/disconnected
+ *

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct · line 384

Quoted 10 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +10 -0
+ * Notify lpe audio driver of eld change.
+ */
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			void *eld, int port, int tmds_clk_speed,
+			bool connected)
+{
+	unsigned long irq_flags;
+
+	if (HAS_LPE_AUDIO(dev_priv)) {
+		struct intel_hdmi_lpe_audio_pdata *pdata =

dev_get_platdata(

Quoted 7 lines

drivers/gpu/drm/i915/intel_lpe_audio.c void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) · line 385

Quoted 1 line
drivers/gpu/drm/i915/intel_lpe_audio.c +1 -0
+			&(dev_priv->lpe_audio.platdev->dev));

Only noticed it here, but why again do we need to re-roll our intel-only hdmi/eld notification? The one we have for hda is somewhat justified since it went in at roughly the same time as the new shared one across a bunch of soc. But this one here is just a reinvented wheel.

Am not sure whether I understand your comment fully. But this interface is intel specific and it is only between intel hdmi audio/i915 drivers.

Quoted 47 lines

And yes this code has been hanging around internally for years, but that's kinda not a good excuse.

Obviously this comment applies to patch 1 too.

i915 integration otherwise looks reasonable.
-Daniel

Quoted 39 lines
drivers/gpu/drm/i915/intel_lpe_audio.c +24 -0
+
+		spin_lock_irqsave(&pdata->lpe_audio_slock,
+			irq_flags);
+
+		if (eld != NULL) {
+			memcpy(pdata->eld.eld_data, eld,
+				HDMI_MAX_ELD_BYTES);
+			pdata->eld.port_id = port;
+
+			if (tmds_clk_speed)
+				pdata->tmds_clock_speed =
+					tmds_clk_speed;
+		}
+		pdata->hdmi_connected = connected;
+		if (pdata->notify_audio_lpe)
+			pdata->notify_audio_lpe(
+				(eld != NULL) ? &pdata->eld : NULL);
+		else
+			pdata->notify_pending = true;
+
+		spin_unlock_irqrestore(&pdata->lpe_audio_slock,
+			irq_flags);
+	}
+}
(quoted diff) +0 -0

b/include/drm/intel_lpe_audio.h index a64c449..952de05 100644

include/drm/intel_lpe_audio.h +1 -1
@@ -25,6 +25,7 @@
 #define _INTEL_LPE_AUDIO_H_
 
 #include <linux/types.h>
+#include <linux/spinlock_types.h>
 
 #define HDMI_MAX_ELD_BYTES	128
 
--

2.9.3

Quoted 9 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw

PATCH 3/7 ALSA: add shell for Intel HDMI LPE audio driver

In reply to Jerome Anand

On Baytrail and Cherrytrail, HDaudio may be fused out or disabled by the BIOS. This driver enables an alternate path to the i915 display registers and DMA.

Although there is no hardware path between i915 display and LPE/SST audio clusters, this HDMI capability is referred to in the documentation as "HDMI LPE Audio" so we keep the name for consistency. There is no hardware path or control dependencies with the LPE/SST DSP functionality.

The hdmi-lpe-audio driver will be probed when the i915 driver creates a child platform device.

Since this driver is neither SoC nor PCI, a new x86 folder is added

---
 sound/Kconfig                    |   2 +
 sound/Makefile                   |   2 +-
 sound/x86/Kconfig                |  16 +
 sound/x86/Makefile               |   8 +
 sound/x86/intel_hdmi_lpe_audio.c | 622 +++++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_lpe_audio.h | 692 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 1341 insertions(+), 1 deletion(-)
 create mode 100644 sound/x86/Kconfig
 create mode 100644 sound/x86/Makefile
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.c
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.h
sound/Kconfig +2 -0
index 5a240e0..ee2e69a 100644
@@ -108,6 +108,8 @@ source "sound/parisc/Kconfig"
 
 source "sound/soc/Kconfig"
 
+source "sound/x86/Kconfig"
+
 endif # SND
 
 menuconfig SOUND_PRIME
sound/Makefile +1 -1
index c41bdf5..6de45d2 100644
@@ -5,7 +5,7 @@ obj-$(CONFIG_SOUND) += soundcore.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
-	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/
+	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/
 obj-$(CONFIG_SND_AOA) += aoa/
 
 # This one must be compilable even if sound is configured out
sound/x86/Kconfig new file +16 -0
new file mode 100644
index 0000000..182adf3
@@ -0,0 +1,16 @@
+menuconfig SND_X86
+	tristate "X86 sound devices"
+	---help---
+
+	  X86 sound devices that don't fall under SoC or PCI categories
+
+if SND_X86
+
+config HDMI_LPE_AUDIO
+	tristate "HDMI audio without HDaudio on Intel Atom platforms"
+	depends on DRM_I915
+        default n
+        help
+          Choose this option to support HDMI LPE Audio mode
+
+endif	# SND_X86
sound/x86/Makefile new file +8 -0
new file mode 100644
index 0000000..78b2ae1
@@ -0,0 +1,8 @@
+DRIVER_NAME := hdmi_lpe_audio
+
+ccflags-y += -Idrivers/gpu/drm/i915
+
+$(DRIVER_NAME)-objs += \
+	intel_hdmi_lpe_audio.o
+
+obj-$(CONFIG_HDMI_LPE_AUDIO) += $(DRIVER_NAME).o
sound/x86/intel_hdmi_lpe_audio.c new file +622 -0

622 lines not on this page · raw message

sound/x86/intel_hdmi_lpe_audio.h new file +692 -0

692 lines not on this page · raw message

Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#17 lore raw

Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 10 lines · Jerome Anand

On Baytrail and Cherrytrail, HDaudio may be fused out or disabled by the BIOS. This driver enables an alternate path to the i915 display registers and DMA.

Although there is no hardware path between i915 display and LPE/SST audio clusters, this HDMI capability is referred to in the documentation as "HDMI LPE Audio" so we keep the name for consistency. There is no hardware path or control dependencies with the LPE/SST DSP functionality.

Quoted 7 lines

The hdmi-lpe-audio driver will be probed when the i915 driver creates a child platform device.

Since this driver is neither SoC nor PCI, a new x86 folder is added

Why do we need a "shell" and indirect calls?
This is a small driver set, so it's not utterly unacceptable, but it still makes things a bit more complicated than necessary, so I'd like to understand the idea behind it.

Quoted 49 lines
---
 sound/Kconfig                    |   2 +
 sound/Makefile                   |   2 +-
 sound/x86/Kconfig                |  16 +
 sound/x86/Makefile               |   8 +
 sound/x86/intel_hdmi_lpe_audio.c | 622 +++++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_lpe_audio.h | 692 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 1341 insertions(+), 1 deletion(-)
 create mode 100644 sound/x86/Kconfig
 create mode 100644 sound/x86/Makefile
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.c
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.h
sound/Kconfig +2 -0
index 5a240e0..ee2e69a 100644
@@ -108,6 +108,8 @@ source "sound/parisc/Kconfig"
 
 source "sound/soc/Kconfig"
 
+source "sound/x86/Kconfig"
+
 endif # SND
 
 menuconfig SOUND_PRIME
sound/Makefile +1 -1
index c41bdf5..6de45d2 100644
@@ -5,7 +5,7 @@ obj-$(CONFIG_SOUND) += soundcore.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
-	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/
+	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/
 obj-$(CONFIG_SND_AOA) += aoa/
 
 # This one must be compilable even if sound is configured out
sound/x86/Kconfig new file +4 -0
new file mode 100644
index 0000000..182adf3
@@ -0,0 +1,16 @@
+menuconfig SND_X86
+	tristate "X86 sound devices"
+	---help---
+

sound/x86/Kconfig line 14

Quoted 10 lines
sound/x86/Kconfig new file +10 -0
+	  X86 sound devices that don't fall under SoC or PCI categories
+
+if SND_X86
+
+config HDMI_LPE_AUDIO
+	tristate "HDMI audio without HDaudio on Intel Atom platforms"
+	depends on DRM_I915
+        default n
+        help
+          Choose this option to support HDMI LPE Audio mode

Please fix the indentation. Also a bit more description would be more user-friendly.

sound/x86/Makefile line 3

Quoted 11 lines
sound/x86/Kconfig new file +2 -0
+
+endif	# SND_X86
sound/x86/Makefile new file +3 -0
new file mode 100644
index 0000000..78b2ae1
@@ -0,0 +1,8 @@
+DRIVER_NAME := hdmi_lpe_audio
+
+ccflags-y += -Idrivers/gpu/drm/i915

Is it just for intel_lpe_audio.h? Then rather put intel_lpe_audio.h to include/drm.

sound/x86/Makefile line 8

Quoted 4 lines
sound/x86/Makefile new file +4 -0
+$(DRIVER_NAME)-objs += \
+	intel_hdmi_lpe_audio.o
+
+obj-$(CONFIG_HDMI_LPE_AUDIO) += $(DRIVER_NAME).o

Don't use substitution, it's rather confusing. Also, we give "snd-" prefix for the sound driver in general. If no big reason against it, keep this rule please.

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.c new file +0 -0

(snip)

Quoted 13 lines
sound/x86/intel_hdmi_lpe_audio.c new file +12 -0
@@ -0,0 +1,622 @@
+/*
+ *  intel_hdmi_lpe_audio.c - Intel HDMI LPE audio driver for Atom platforms
+ *
+ *  Copyright (C) 2016 Intel Corp
+ *  Authors:
+ *		Jerome Anand <[email protected]>
+ *		Aravind Siddappaji <[email protected]>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.

sound/x86/intel_hdmi_lpe_audio.c line 22

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#define pr_fmt(fmt)	"hdmi_lpe_audio: " fmt

Better to use dev_*() variant.

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+#include <linux/platform_device.h>
+#include <linux/irqreturn.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <sound/pcm.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>

sound/x86/intel_hdmi_lpe_audio.c line 43

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <sound/initval.h>
+#include <drm/intel_lpe_audio.h>
+#include "intel_hdmi_lpe_audio.h"
+
+/* globals*/
+struct platform_device *gpdev;
+int _hdmi_state;
+union otm_hdmi_eld_t hdmi_eld;

For the global variables, give some prefix, as we have no proper namespace in C.

And, what's the reason to keep copies of the state here? Can't we peek the pdata at each time?

Quoted 8 lines
sound/x86/intel_hdmi_lpe_audio.c new file +8 -0
+
+struct hdmi_lpe_audio_ctx {
+	int irq;
+	void __iomem *mmio_start;
+	had_event_call_back had_event_callbacks;
+	struct snd_intel_had_interface *had_interface;
+	void *had_pvt_data;
+	int tmds_clock_speed;

sound/x86/intel_hdmi_lpe_audio.c line 61

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+	unsigned int had_config_offset;
+	int hdmi_audio_interrupt_mask;
+	struct work_struct hdmi_audio_wq;
+};
+
+static inline void hdmi_set_eld(void *eld)
+{
+	int size = (sizeof(hdmi_eld)) > HDMI_MAX_ELD_BYTES ?
+				HDMI_MAX_ELD_BYTES :
+				(sizeof(hdmi_eld));

How can the size differ...? If any, it should be checked by BUILD_BUG_ON() or such.

sound/x86/intel_hdmi_lpe_audio.c line 62

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.c new file +2 -0
+
+	memcpy((void *)&hdmi_eld, eld, size);

Also, when copying from the graphics side, isn't it safer to pass the given ELD size as well? Then we can zero-clear the rest bytes if it's short.

Quoted 7 lines
sound/x86/intel_hdmi_lpe_audio.c new file +7 -0
+}
+
+static inline int hdmi_get_eld(void *eld)
+{
+	memcpy(eld, (void *)&hdmi_eld, sizeof(hdmi_eld));
+
+	{

sound/x86/intel_hdmi_lpe_audio.c line 80

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+		int i;
+		uint8_t *eld_data = (uint8_t *)&hdmi_eld;
+
+		pr_debug("hdmi_get_eld:\n{{");
+
+		for (i = 0; i < sizeof(hdmi_eld); i++)
+			pr_debug("0x%x, ", eld_data[i]);
+
+		pr_debug("}}\n");
+	}

There is a hexdump debug print helper, too.

sound/x86/intel_hdmi_lpe_audio.c line 80

Quoted 1 line
sound/x86/intel_hdmi_lpe_audio.c new file +1 -0
+	return HAD_SUCCESS;

Let's use the normal return code, i.e. 0 or a negative error.

sound/x86/intel_hdmi_lpe_audio.c line 91

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+}
+
+
+static inline struct hdmi_lpe_audio_ctx *get_hdmi_context(void)
+{
+	struct hdmi_lpe_audio_ctx *ctx;
+
+	ctx = platform_get_drvdata(gpdev);
+	return ctx;
+}

Hrm... Why not storing the audio pdev in i915 pdata? Then the notify callback can extract it easily.

(snip)

sound/x86/intel_hdmi_lpe_audio.c line 477

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+static int hdmi_lpe_audio_probe(struct platform_device *pdev)
+{
+	struct hdmi_lpe_audio_ctx *ctx;
+	struct intel_hdmi_lpe_audio_pdata *pdata;
+	int irq;
+	struct resource *res_mmio;
+	void __iomem *mmio_start;
+	int ret = 0;
+	unsigned long flag_irq;
+	const struct pci_device_id cherryview_ids[] = {

Missing static.

Quoted 30 lines
sound/x86/intel_hdmi_lpe_audio.c new file +30 -0
+		{PCI_DEVICE(0x8086, 0x22b0)},
+		{PCI_DEVICE(0x8086, 0x22b1)},
+		{PCI_DEVICE(0x8086, 0x22b2)},
+		{PCI_DEVICE(0x8086, 0x22b3)},
+		{}
+	};
+
+	pr_debug("Enter %s\n", __func__);
+
+	/*TBD:remove globals*/
+	gpdev = pdev;
+	_hdmi_state = hdmi_connector_status_disconnected;
+
+	/* get resources */
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
+		pr_err("Could not get irq resource\n");
+		return -ENODEV;
+	}
+
+	res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res_mmio) {
+		pr_err("Could not get IO_MEM resources\n");
+		return -ENXIO;
+	}
+
+	pr_debug("%s: mmio_start = 0x%x, mmio_end = 0x%x\n", __func__,
+		(unsigned int)res_mmio->start, (unsigned int)res_mmio->end);
+
+	mmio_start = ioremap_nocache(res_mmio->start,

sound/x86/intel_hdmi_lpe_audio.c line 517

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+				(size_t)((res_mmio->end - res_mmio->start)
+						+ 1));
+	if (!mmio_start) {
+		pr_err("Could not get ioremap\n");
+		return -EACCES;
+	}
+
+	/* setup interrupt handler */
+	ret = request_irq(irq, display_pipe_interrupt_handler,
+			0, /* FIXME: is IRQF_SHARED needed ? */

It's a irqchip, so no sharing is considered, right? Then IRQF_SHARED is rather wrong.

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.h new file +0 -0

(snip)

sound/x86/intel_hdmi_lpe_audio.h line 35

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.h new file +2 -0
+#define HMDI_LPE_AUDIO_DRIVER_NAME		"intel-hdmi-lpe-audio"
+#define HAD_DRIVER_VERSION	"0.01.003"

The driver version string doesn't make sense in most cases for in-kernel codes.

sound/x86/intel_hdmi_lpe_audio.h line 43

Quoted 8 lines
sound/x86/intel_hdmi_lpe_audio.h new file +8 -0
+#define HAD_MAX_DEVICES		1
+#define HAD_MIN_CHANNEL		2
+#define HAD_MAX_CHANNEL		8
+#define HAD_NUM_OF_RING_BUFS	4
+
+/* HDMI Audio LPE Error Codes */
+#define HAD_SUCCESS		0
+#define HAD_FAIL		1

Avoid the own definition.

Quoted 36 lines
sound/x86/intel_hdmi_lpe_audio.h new file +36 -0
+/* Assume 192KHz, 8channel, 25msec period */
+#define HAD_MAX_BUFFER		(600*1024)
+#define HAD_MIN_BUFFER		(32*1024)
+#define HAD_MAX_PERIODS		4
+#define HAD_MIN_PERIODS		4
+#define HAD_MAX_PERIOD_BYTES	(HAD_MAX_BUFFER/HAD_MIN_PERIODS)
+#define HAD_MIN_PERIOD_BYTES	256
+#define HAD_FIFO_SIZE		0 /* fifo not being used */
+#define MAX_SPEAKERS		8
+/* TODO: Add own tlv when channel map is ported for user space */
+#define USE_ALSA_DEFAULT_TLV
+
+#define AUD_SAMPLE_RATE_32	32000
+#define AUD_SAMPLE_RATE_44_1	44100
+#define AUD_SAMPLE_RATE_48	48000
+#define AUD_SAMPLE_RATE_88_2	88200
+#define AUD_SAMPLE_RATE_96	96000
+#define AUD_SAMPLE_RATE_176_4	176400
+#define AUD_SAMPLE_RATE_192	192000
+
+#define HAD_MIN_RATE		AUD_SAMPLE_RATE_32
+#define HAD_MAX_RATE		AUD_SAMPLE_RATE_192
+
+#define DIS_SAMPLE_RATE_25_2	25200
+#define DIS_SAMPLE_RATE_27	27000
+#define DIS_SAMPLE_RATE_54	54000
+#define DIS_SAMPLE_RATE_74_25	74250
+#define DIS_SAMPLE_RATE_148_5	148500
+#define HAD_REG_WIDTH		0x08
+#define HAD_MAX_HW_BUFS		0x04
+#define HAD_MAX_DIP_WORDS		16
+#define INTEL_HAD		"IntelHdmiLpeAudio"
+
+/* _AUD_CONFIG register MASK */
+#define AUD_CONFIG_MASK_UNDERRUN	0xC0000000
+#define AUD_CONFIG_MASK_SRDBG		0x00000002

sound/x86/intel_hdmi_lpe_audio.h line 90

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.h new file +10 -0
+#define AUD_CONFIG_MASK_FUNCRST		0x00000001
+
+#define MAX_CNT			0xFF
+#define HAD_SUSPEND_DELAY	1000
+
+#define OTM_HDMI_ELD_SIZE 128
+
+union otm_hdmi_eld_t {
+	uint8_t eld_data[OTM_HDMI_ELD_SIZE];
+	#pragma pack(1)

Use __packed notion for the packed structs.

Quoted 105 lines
sound/x86/intel_hdmi_lpe_audio.h new file +105 -0
+	struct {
+		/* Byte[0] = ELD Version Number */
+		union {
+			uint8_t   byte0;
+			struct {
+				uint8_t reserved:3; /* Reserf */
+				uint8_t eld_ver:5; /* ELD Version Number */
+				/* 00000b - reserved
+				 * 00001b - first rev, obsoleted
+				 * 00010b - version 2, supporting CEA version
+				 *			861D or below
+				 * 00011b:11111b - reserved
+				 * for future
+				 */
+			};
+		};
+
+		/* Byte[1] = Vendor Version Field */
+		union {
+			uint8_t vendor_version;
+			struct {
+				uint8_t reserved1:3;
+				uint8_t veld_ver:5; /* Version number of the ELD
+						     * extension. This value is
+						     * provisioned and unique to
+						     * each vendor.
+						     */
+			};
+		};
+
+		/* Byte[2] = Baseline Length field */
+		uint8_t baseline_eld_length; /* Length of the Baseline structure
+					      *	divided by Four.
+					      */
+
+		/* Byte [3] = Reserved for future use */
+		uint8_t byte3;
+
+		/* Starting of the BaseLine EELD structure
+		 * Byte[4] = Monitor Name Length
+		 */
+		union {
+			uint8_t byte4;
+			struct {
+				uint8_t mnl:5;
+				uint8_t cea_edid_rev_id:3;
+			};
+		};
+
+		/* Byte[5] = Capabilities */
+		union {
+			uint8_t capabilities;
+			struct {
+				uint8_t hdcp:1; /* HDCP support */
+				uint8_t ai_support:1;   /* AI support */
+				uint8_t connection_type:2; /* Connection type
+							    * 00 - HDMI
+							    * 01 - DP
+							    * 10 -11  Reserved
+							    * for future
+							    * connection types
+							    */
+				uint8_t sadc:4; /* Indicates number of 3 bytes
+						 * Short Audio Descriptors.
+						 */
+			};
+		};
+
+		/* Byte[6] = Audio Synch Delay */
+		uint8_t audio_synch_delay; /* Amount of time reported by the
+					    * sink that the video trails audio
+					    * in milliseconds.
+					    */
+
+		/* Byte[7] = Speaker Allocation Block */
+		union {
+			uint8_t speaker_allocation_block;
+			struct {
+				uint8_t flr:1; /*Front Left and Right channels*/
+				uint8_t lfe:1; /*Low Frequency Effect channel*/
+				uint8_t fc:1;  /*Center transmission channel*/
+				uint8_t rlr:1; /*Rear Left and Right channels*/
+				uint8_t rc:1; /*Rear Center channel*/
+				uint8_t flrc:1; /*Front left and Right of Center
+						 *transmission channels
+						 */
+				uint8_t rlrc:1; /*Rear left and Right of Center
+						 *transmission channels
+						 */
+				uint8_t reserved3:1; /* Reserved */
+			};
+		};
+
+		/* Byte[8 - 15] - 8 Byte port identification value */
+		uint8_t port_id_value[8];
+
+		/* Byte[16 - 17] - 2 Byte Manufacturer ID */
+		uint8_t manufacturer_id[2];
+
+		/* Byte[18 - 19] - 2 Byte Product ID */
+		uint8_t product_id[2];
+
+		/* Byte [20-83] - 64 Bytes of BaseLine Data */
+		uint8_t mn_sand_sads[64]; /* This will include
+					   * - ASCII string of Monitor name

sound/x86/intel_hdmi_lpe_audio.h line 205

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.h new file +10 -0
+					   * - List of 3 byte SADs
+					   * - Zero padding
+					   */
+
+		/* Vendor ELD Block should continue here!
+		 * No Vendor ELD block defined as of now.
+		 */
+	};
+	#pragma pack()
+};

Well, we should have a single definition of ELD somewhere. We can keep this locally until we have some unified header, though.

In anyway, better to avoid uint8_t.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#18 lore raw

Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 30 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 6:16 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 9 lines · Jerome Anand

On Baytrail and Cherrytrail, HDaudio may be fused out or disabled by the BIOS. This driver enables an alternate path to the i915 display registers and DMA.

Although there is no hardware path between i915 display and LPE/SST audio clusters, this HDMI capability is referred to in the documentation as "HDMI LPE Audio" so we keep the name for consistency. There is no hardware path or control dependencies with the LPE/SST DSP

functionality.

Quoted 6 lines

The hdmi-lpe-audio driver will be probed when the i915 driver creates a child platform device.

Since this driver is neither SoC nor PCI, a new x86 folder is added

Quoted 9 lines
Quoted 3 lines

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

Why do we need a "shell" and indirect calls?
This is a small driver set, so it's not utterly unacceptable, but it still makes things a bit more complicated than necessary, so I'd like to understand the idea behind it.

This solution does not use component interface to talk between
Audio and i915 driver. The reason for that is the HDMI audio device is created by i915 driver with only one callback pointer passed as pdata. Unlike HDA, the HDMI audio driver does not get loaded if the i915 does not create child device.
Since there is only one callback needed we are not using the component interface to make things simpler.
This design was co-worked with i915 folks to makes interaction simpler.

Quoted 56 lines
Quoted 33 lines
---
 sound/Kconfig                    |   2 +
 sound/Makefile                   |   2 +-
 sound/x86/Kconfig                |  16 +
 sound/x86/Makefile               |   8 +
 sound/x86/intel_hdmi_lpe_audio.c | 622
+++++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_lpe_audio.h | 692
+++++++++++++++++++++++++++++++++++++++
 6 files changed, 1341 insertions(+), 1 deletion(-)  create mode

100644 sound/x86/Kconfig create mode 100644 sound/x86/Makefile create mode 100644 sound/x86/intel_hdmi_lpe_audio.c create mode 100644 sound/x86/intel_hdmi_lpe_audio.h

sound/Kconfig index 5a240e0..ee2e69a renamed from sound/Kconfig +0 -0

100644

sound/Kconfig +2 -0
@@ -108,6 +108,8 @@ source "sound/parisc/Kconfig"
 
 source "sound/soc/Kconfig"
 
+source "sound/x86/Kconfig"
+
 endif # SND
 
 menuconfig SOUND_PRIME
sound/Makefile index c41bdf5..6de45d2 renamed from sound/Makefile +0 -0

100644

sound/Makefile obj-$(CONFIG_SOUND) += soundcore.o · line 7

Quoted 3 lines
sound/Makefile +0 -0
@@ -5,7 +5,7 @@ obj-$(CONFIG_SOUND) += soundcore.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/

usb/ \

Quoted 19 lines
sound/Makefile +1 -2
-	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/
+	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/
 obj-$(CONFIG_SND_AOA) += aoa/
 
 # This one must be compilable even if sound is configured out diff
--git a/sound/x86/Kconfig b/sound/x86/Kconfig new file mode 100644

index 0000000..182adf3

sound/x86/Kconfig new file +9 -0
@@ -0,0 +1,16 @@
+menuconfig SND_X86
+	tristate "X86 sound devices"
+	---help---
+
+	  X86 sound devices that don't fall under SoC or PCI categories
+
+if SND_X86
+
+config HDMI_LPE_AUDIO
Quoted 9 lines

sound/x86/Kconfig line 14

Quoted 5 lines
sound/x86/Kconfig new file +5 -0
+	tristate "HDMI audio without HDaudio on Intel Atom platforms"
+	depends on DRM_I915
+        default n
+        help
+          Choose this option to support HDMI LPE Audio mode

Please fix the indentation. Also a bit more description would be more user- friendly.

OK

Quoted 15 lines

sound/x86/Makefile line 3

Quoted 11 lines
sound/x86/Kconfig new file +2 -0
+
+endif	# SND_X86
sound/x86/Makefile new file mode renamed from sound/x86/Makefile +0 -0

100644 index 0000000..78b2ae1

sound/x86/Makefile new file +3 -0
@@ -0,0 +1,8 @@
+DRIVER_NAME := hdmi_lpe_audio
+
+ccflags-y += -Idrivers/gpu/drm/i915

Is it just for intel_lpe_audio.h? Then rather put intel_lpe_audio.h to include/drm.

OK

Quoted 11 lines

sound/x86/Makefile line 8

Quoted 5 lines
sound/x86/Makefile new file +4 -0
+$(DRIVER_NAME)-objs += \
+	intel_hdmi_lpe_audio.o
+
+obj-$(CONFIG_HDMI_LPE_AUDIO) += $(DRIVER_NAME).o

Don't use substitution, it's rather confusing. Also, we give "snd-" prefix for the sound driver in general. If no big reason against it, keep this rule please.

OK

Quoted 33 lines
Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.c new file +0 -0

(snip)

sound/x86/intel_hdmi_lpe_audio.c line 9

Quoted 11 lines
sound/x86/intel_hdmi_lpe_audio.c new file +9 -0
@@ -0,0 +1,622 @@
+/*
+ *  intel_hdmi_lpe_audio.c - Intel HDMI LPE audio driver for Atom
+platforms
+ *
+ *  Copyright (C) 2016 Intel Corp
+ *  Authors:
+ *		Jerome Anand <[email protected]>
+ *		Aravind Siddappaji <[email protected]>
+ *

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~

sound/x86/intel_hdmi_lpe_audio.c line 21

Quoted 12 lines
sound/x86/intel_hdmi_lpe_audio.c new file +12 -0
+~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or
+modify
+ *  it under the terms of the GNU General Public License as published
+by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

GNU

sound/x86/intel_hdmi_lpe_audio.c

Quoted 4 lines
sound/x86/intel_hdmi_lpe_audio.c new file +3 -0
+ *  General Public License for more details.
+ *
+ *
Quoted 9 lines

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~

sound/x86/intel_hdmi_lpe_audio.c line 22

Quoted 4 lines
sound/x86/intel_hdmi_lpe_audio.c new file +4 -0
+~~~~~
+ */
+
+#define pr_fmt(fmt)	"hdmi_lpe_audio: " fmt

Better to use dev_*() variant.

OK

Quoted 16 lines
Quoted 16 lines
sound/x86/intel_hdmi_lpe_audio.c new file +15 -0
+#include <linux/platform_device.h>
+#include <linux/irqreturn.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <sound/pcm.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <sound/initval.h>
+#include <drm/intel_lpe_audio.h>
+#include "intel_hdmi_lpe_audio.h"
Quoted 9 lines

sound/x86/intel_hdmi_lpe_audio.c line 43

Quoted 5 lines
sound/x86/intel_hdmi_lpe_audio.c new file +5 -0
+
+/* globals*/
+struct platform_device *gpdev;
+int _hdmi_state;
+union otm_hdmi_eld_t hdmi_eld;

For the global variables, give some prefix, as we have no proper namespace in C.

OK

Quoted 4 lines

And, what's the reason to keep copies of the state here? Can't we peek the pdata at each time?

OK

Quoted 12 lines
Quoted 12 lines
sound/x86/intel_hdmi_lpe_audio.c new file +12 -0
+
+struct hdmi_lpe_audio_ctx {
+	int irq;
+	void __iomem *mmio_start;
+	had_event_call_back had_event_callbacks;
+	struct snd_intel_had_interface *had_interface;
+	void *had_pvt_data;
+	int tmds_clock_speed;
+	unsigned int had_config_offset;
+	int hdmi_audio_interrupt_mask;
+	struct work_struct hdmi_audio_wq;
+};
Quoted 9 lines

sound/x86/intel_hdmi_lpe_audio.c line 61

Quoted 5 lines
sound/x86/intel_hdmi_lpe_audio.c new file +5 -0
+
+static inline void hdmi_set_eld(void *eld) {
+	int size = (sizeof(hdmi_eld)) > HDMI_MAX_ELD_BYTES ?
+				HDMI_MAX_ELD_BYTES :
+				(sizeof(hdmi_eld));

How can the size differ...? If any, it should be checked by BUILD_BUG_ON() or such.

OK

Quoted 6 lines

sound/x86/intel_hdmi_lpe_audio.c line 67

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.c new file +2 -0
+
+	memcpy((void *)&hdmi_eld, eld, size);

Also, when copying from the graphics side, isn't it safer to pass the given ELD size as well? Then we can zero-clear the rest bytes if it's short.

OK

Quoted 10 lines
Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +10 -0
+}
+
+static inline int hdmi_get_eld(void *eld) {
+	memcpy(eld, (void *)&hdmi_eld, sizeof(hdmi_eld));
+
+	{
+		int i;
+		uint8_t *eld_data = (uint8_t *)&hdmi_eld;
+
+		pr_debug("hdmi_get_eld:\n{{");
Quoted 9 lines

sound/x86/intel_hdmi_lpe_audio.c line 80

Quoted 6 lines
sound/x86/intel_hdmi_lpe_audio.c new file +6 -0
+
+		for (i = 0; i < sizeof(hdmi_eld); i++)
+			pr_debug("0x%x, ", eld_data[i]);
+
+		pr_debug("}}\n");
+	}

There is a hexdump debug print helper, too.

OK

Quoted 5 lines

sound/x86/intel_hdmi_lpe_audio.c line 84

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.c new file +1 -0
+	return HAD_SUCCESS;

Let's use the normal return code, i.e. 0 or a negative error.

OK

Quoted 14 lines

sound/x86/intel_hdmi_lpe_audio.c line 91

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.c new file +9 -0
+}
+
+
+static inline struct hdmi_lpe_audio_ctx *get_hdmi_context(void) {
+	struct hdmi_lpe_audio_ctx *ctx;
+
+	ctx = platform_get_drvdata(gpdev);
+	return ctx;
+}

Hrm... Why not storing the audio pdev in i915 pdata? Then the notify callback can extract it easily.

The current audio driver interface implementation treats the input pdata as Read-only and I don't want to store any audio info in that.

Quoted 13 lines

(snip)

sound/x86/intel_hdmi_lpe_audio.c line 477

Quoted 9 lines
sound/x86/intel_hdmi_lpe_audio.c new file +9 -0
+static int hdmi_lpe_audio_probe(struct platform_device *pdev) {
+	struct hdmi_lpe_audio_ctx *ctx;
+	struct intel_hdmi_lpe_audio_pdata *pdata;
+	int irq;
+	struct resource *res_mmio;
+	void __iomem *mmio_start;
+	int ret = 0;
+	unsigned long flag_irq;
+	const struct pci_device_id cherryview_ids[] = {

Missing static.

OK

Quoted 36 lines
Quoted 36 lines
sound/x86/intel_hdmi_lpe_audio.c new file +28 -0
+		{PCI_DEVICE(0x8086, 0x22b0)},
+		{PCI_DEVICE(0x8086, 0x22b1)},
+		{PCI_DEVICE(0x8086, 0x22b2)},
+		{PCI_DEVICE(0x8086, 0x22b3)},
+		{}
+	};
+
+	pr_debug("Enter %s\n", __func__);
+
+	/*TBD:remove globals*/
+	gpdev = pdev;
+	_hdmi_state = hdmi_connector_status_disconnected;
+
+	/* get resources */
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
+		pr_err("Could not get irq resource\n");
+		return -ENODEV;
+	}
+
+	res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res_mmio) {
+		pr_err("Could not get IO_MEM resources\n");
+		return -ENXIO;
+	}
+
+	pr_debug("%s: mmio_start = 0x%x, mmio_end = 0x%x\n", __func__,
+		(unsigned int)res_mmio->start, (unsigned int)res_mmio-

end);

sound/x86/intel_hdmi_lpe_audio.c new file +7 -0
+
+	mmio_start = ioremap_nocache(res_mmio->start,
+				(size_t)((res_mmio->end - res_mmio->start)
+						+ 1));
+	if (!mmio_start) {
+		pr_err("Could not get ioremap\n");
+		return -EACCES;
Quoted 9 lines

sound/x86/intel_hdmi_lpe_audio.c line 517

Quoted 5 lines
sound/x86/intel_hdmi_lpe_audio.c new file +5 -0
+	}
+
+	/* setup interrupt handler */
+	ret = request_irq(irq, display_pipe_interrupt_handler,
+			0, /* FIXME: is IRQF_SHARED needed ? */

It's a irqchip, so no sharing is considered, right? Then IRQF_SHARED is rather wrong.

OK

Quoted 10 lines
Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.h new file +0 -0

(snip)

Quoted 1 line

+#define HMDI_LPE_AUDIO_DRIVER_NAME "intel-hdmi-lpe-

audio"

Quoted 1 line

+#define HAD_DRIVER_VERSION "0.01.003"

The driver version string doesn't make sense in most cases for in-kernel codes.

OK - will be removed

Quoted 12 lines

sound/x86/intel_hdmi_lpe_audio.h line 43

Quoted 8 lines
sound/x86/intel_hdmi_lpe_audio.h new file +8 -0
+#define HAD_MAX_DEVICES		1
+#define HAD_MIN_CHANNEL		2
+#define HAD_MAX_CHANNEL		8
+#define HAD_NUM_OF_RING_BUFS	4
+
+/* HDMI Audio LPE Error Codes */
+#define HAD_SUCCESS		0
+#define HAD_FAIL		1

Avoid the own definition.

OK

Quoted 41 lines

sound/x86/intel_hdmi_lpe_audio.h

Quoted 6 lines
sound/x86/intel_hdmi_lpe_audio.h new file +6 -0
+/* Assume 192KHz, 8channel, 25msec period */
+#define HAD_MAX_BUFFER		(600*1024)
+#define HAD_MIN_BUFFER		(32*1024)
+#define HAD_MAX_PERIODS		4
+#define HAD_MIN_PERIODS		4
+#define HAD_MAX_PERIOD_BYTES

(HAD_MAX_BUFFER/HAD_MIN_PERIODS)

Quoted 34 lines
sound/x86/intel_hdmi_lpe_audio.h new file +34 -0
+#define HAD_MIN_PERIOD_BYTES	256
+#define HAD_FIFO_SIZE		0 /* fifo not being used */
+#define MAX_SPEAKERS		8
+/* TODO: Add own tlv when channel map is ported for user space */
+#define USE_ALSA_DEFAULT_TLV
+
+#define AUD_SAMPLE_RATE_32	32000
+#define AUD_SAMPLE_RATE_44_1	44100
+#define AUD_SAMPLE_RATE_48	48000
+#define AUD_SAMPLE_RATE_88_2	88200
+#define AUD_SAMPLE_RATE_96	96000
+#define AUD_SAMPLE_RATE_176_4	176400
+#define AUD_SAMPLE_RATE_192	192000
+
+#define HAD_MIN_RATE		AUD_SAMPLE_RATE_32
+#define HAD_MAX_RATE		AUD_SAMPLE_RATE_192
+
+#define DIS_SAMPLE_RATE_25_2	25200
+#define DIS_SAMPLE_RATE_27	27000
+#define DIS_SAMPLE_RATE_54	54000
+#define DIS_SAMPLE_RATE_74_25	74250
+#define DIS_SAMPLE_RATE_148_5	148500
+#define HAD_REG_WIDTH		0x08
+#define HAD_MAX_HW_BUFS		0x04
+#define HAD_MAX_DIP_WORDS		16
+#define INTEL_HAD		"IntelHdmiLpeAudio"
+
+/* _AUD_CONFIG register MASK */
+#define AUD_CONFIG_MASK_UNDERRUN	0xC0000000
+#define AUD_CONFIG_MASK_SRDBG		0x00000002
+#define AUD_CONFIG_MASK_FUNCRST		0x00000001
+
+#define MAX_CNT			0xFF
+#define HAD_SUSPEND_DELAY	1000
Quoted 9 lines

sound/x86/intel_hdmi_lpe_audio.h line 90

Quoted 6 lines
sound/x86/intel_hdmi_lpe_audio.h new file +6 -0
+
+#define OTM_HDMI_ELD_SIZE 128
+
+union otm_hdmi_eld_t {
+	uint8_t eld_data[OTM_HDMI_ELD_SIZE];
+	#pragma pack(1)

Use __packed notion for the packed structs.

OK

Quoted 120 lines
Quoted 14 lines
sound/x86/intel_hdmi_lpe_audio.h new file +13 -0
+	struct {
+		/* Byte[0] = ELD Version Number */
+		union {
+			uint8_t   byte0;
+			struct {
+				uint8_t reserved:3; /* Reserf */
+				uint8_t eld_ver:5; /* ELD Version Number */
+				/* 00000b - reserved
+				 * 00001b - first rev, obsoleted
+				 * 00010b - version 2, supporting CEA version
+				 *			861D or below
+				 * 00011b:11111b - reserved
+				 * for future

sound/x86/intel_hdmi_lpe_audio.h

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.h new file +10 -0
+				 */
+			};
+		};
+
+		/* Byte[1] = Vendor Version Field */
+		union {
+			uint8_t vendor_version;
+			struct {
+				uint8_t reserved1:3;
+				uint8_t veld_ver:5; /* Version number of the

ELD

sound/x86/intel_hdmi_lpe_audio.h

Quoted 2 lines
sound/x86/intel_hdmi_lpe_audio.h new file +2 -0
+						     * extension. This value is
+						     * provisioned and unique

to

sound/x86/intel_hdmi_lpe_audio.h

Quoted 7 lines
sound/x86/intel_hdmi_lpe_audio.h new file +7 -0
+						     * each vendor.
+						     */
+			};
+		};
+
+		/* Byte[2] = Baseline Length field */
+		uint8_t baseline_eld_length; /* Length of the Baseline

structure

Quoted 14 lines
sound/x86/intel_hdmi_lpe_audio.h new file +14 -0
+					      *	divided by Four.
+					      */
+
+		/* Byte [3] = Reserved for future use */
+		uint8_t byte3;
+
+		/* Starting of the BaseLine EELD structure
+		 * Byte[4] = Monitor Name Length
+		 */
+		union {
+			uint8_t byte4;
+			struct {
+				uint8_t mnl:5;
+				uint8_t cea_edid_rev_id:3;

sound/x86/intel_hdmi_lpe_audio.h

Quoted 10 lines
sound/x86/intel_hdmi_lpe_audio.h new file +10 -0
+			};
+		};
+
+		/* Byte[5] = Capabilities */
+		union {
+			uint8_t capabilities;
+			struct {
+				uint8_t hdcp:1; /* HDCP support */
+				uint8_t ai_support:1;   /* AI support */
+				uint8_t connection_type:2; /* Connection

type

sound/x86/intel_hdmi_lpe_audio.h

Quoted 7 lines
sound/x86/intel_hdmi_lpe_audio.h new file +7 -0
+							    * 00 - HDMI
+							    * 01 - DP
+							    * 10 -11  Reserved
+							    * for future
+							    * connection types
+							    */
+				uint8_t sadc:4; /* Indicates number of 3

bytes

sound/x86/intel_hdmi_lpe_audio.h

Quoted 7 lines
sound/x86/intel_hdmi_lpe_audio.h new file +7 -0
+						 * Short Audio Descriptors.
+						 */
+			};
+		};
+
+		/* Byte[6] = Audio Synch Delay */
+		uint8_t audio_synch_delay; /* Amount of time reported by

the

sound/x86/intel_hdmi_lpe_audio.h

Quoted 9 lines
sound/x86/intel_hdmi_lpe_audio.h new file +9 -0
+					    * sink that the video trails audio
+					    * in milliseconds.
+					    */
+
+		/* Byte[7] = Speaker Allocation Block */
+		union {
+			uint8_t speaker_allocation_block;
+			struct {
+				uint8_t flr:1; /*Front Left and Right

channels*/

sound/x86/intel_hdmi_lpe_audio.h

Quoted 1 line
sound/x86/intel_hdmi_lpe_audio.h new file +1 -0
+				uint8_t lfe:1; /*Low Frequency Effect

channel*/

sound/x86/intel_hdmi_lpe_audio.h

Quoted 1 line
sound/x86/intel_hdmi_lpe_audio.h new file +1 -0
+				uint8_t fc:1;  /*Center transmission

channel*/

Quoted 29 lines
sound/x86/intel_hdmi_lpe_audio.h new file +29 -0
+				uint8_t rlr:1; /*Rear Left and Right channels*/
+				uint8_t rc:1; /*Rear Center channel*/
+				uint8_t flrc:1; /*Front left and Right of Center
+						 *transmission channels
+						 */
+				uint8_t rlrc:1; /*Rear left and Right of Center
+						 *transmission channels
+						 */
+				uint8_t reserved3:1; /* Reserved */
+			};
+		};
+
+		/* Byte[8 - 15] - 8 Byte port identification value */
+		uint8_t port_id_value[8];
+
+		/* Byte[16 - 17] - 2 Byte Manufacturer ID */
+		uint8_t manufacturer_id[2];
+
+		/* Byte[18 - 19] - 2 Byte Product ID */
+		uint8_t product_id[2];
+
+		/* Byte [20-83] - 64 Bytes of BaseLine Data */
+		uint8_t mn_sand_sads[64]; /* This will include
+					   * - ASCII string of Monitor name
+					   * - List of 3 byte SADs
+					   * - Zero padding
+					   */
+
+		/* Vendor ELD Block should continue here!
Quoted 9 lines

sound/x86/intel_hdmi_lpe_audio.h line 205

Quoted 5 lines
sound/x86/intel_hdmi_lpe_audio.h new file +5 -0
+		 * No Vendor ELD block defined as of now.
+		 */
+	};
+	#pragma pack()
+};

Well, we should have a single definition of ELD somewhere. We can keep this locally until we have some unified header, though.

OK

Quoted 2 lines

In anyway, better to avoid uint8_t.

OK I'll use unsigned char

Quoted 4 lines

thanks,

Takashi

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#19 lore raw

Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 41 lines · Jerome
Quoted 31 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 6:16 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 9 lines · Jerome Anand

On Baytrail and Cherrytrail, HDaudio may be fused out or disabled by the BIOS. This driver enables an alternate path to the i915 display registers and DMA.

Although there is no hardware path between i915 display and LPE/SST audio clusters, this HDMI capability is referred to in the documentation as "HDMI LPE Audio" so we keep the name for consistency. There is no hardware path or control dependencies with the LPE/SST DSP

functionality.

Quoted 6 lines

The hdmi-lpe-audio driver will be probed when the i915 driver creates a child platform device.

Since this driver is neither SoC nor PCI, a new x86 folder is added

Quoted 9 lines
Quoted 3 lines

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

Why do we need a "shell" and indirect calls?
This is a small driver set, so it's not utterly unacceptable, but it still makes things a bit more complicated than necessary, so I'd like to understand the idea behind it.

Quoted 7 lines

This solution does not use component interface to talk between
Audio and i915 driver. The reason for that is the HDMI audio device is created by i915 driver with only one callback pointer passed as pdata. Unlike HDA, the HDMI audio driver does not get loaded if the i915 does not create child device.
Since there is only one callback needed we are not using the component interface to make things simpler.
This design was co-worked with i915 folks to makes interaction simpler.

The interaction between i915 and audio is simple, yes, it just exposes a few things, mmio ptr, irq, etc. But still I don't understand why multiple layers of indirect accesses are needed *inside* lpe audio driver itself. For example, suspend/resume action is cascaded to yet another ops.

I would understand if this "shell" provides a few thin accessors to the raw i915 registers. But another layering over a single driver implementation makes little sense in regard of abstraction. (If there were multiple class inherits, it's a different story, of course.)

Quoted 11 lines
Quoted 10 lines

sound/x86/intel_hdmi_lpe_audio.c line 91

Quoted 6 lines
sound/x86/intel_hdmi_lpe_audio.c new file +6 -0
+static inline struct hdmi_lpe_audio_ctx *get_hdmi_context(void) {
+	struct hdmi_lpe_audio_ctx *ctx;
+
+	ctx = platform_get_drvdata(gpdev);
+	return ctx;
+}

Hrm... Why not storing the audio pdev in i915 pdata? Then the notify callback can extract it easily.

Quoted 2 lines

The current audio driver interface implementation treats the input pdata as Read-only and I don't want to store any audio info in that.

Well, it's not read-only, you already write it to register the notifier callback :)

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#20 lore raw

Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 10 lines · Takashi Iwai

The interaction between i915 and audio is simple, yes, it just exposes a few things, mmio ptr, irq, etc. But still I don't understand why multiple layers of indirect accesses are needed *inside* lpe audio driver itself. For example, suspend/resume action is cascaded to yet another ops.

I would understand if this "shell" provides a few thin accessors to the raw i915 registers. But another layering over a single driver implementation makes little sense in regard of abstraction. (If there were multiple class inherits, it's a different story, of course.)

We saw the same thing with the DSP code as well...

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#21 lore raw

Re: [alsa-devel] [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

In reply to Takashi Iwai
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Subject: Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Why do we need a "shell" and indirect calls?
This is a small driver set, so it's not utterly unacceptable, but it still makes things a bit more complicated than necessary, so I'd like to understand the idea behind it.

The 'shell' comes from an early prototype which didn't do much except create the device. The title of the commit should be changed if it threw you off.

Quoted 14 lines
Quoted 7 lines

This solution does not use component interface to talk between
Audio and i915 driver. The reason for that is the HDMI audio device is created by i915 driver with only one callback pointer passed as pdata. Unlike HDA, the HDMI audio driver does not get loaded if the i915 does not create child device.
Since there is only one callback needed we are not using the component interface to make things simpler.
This design was co-worked with i915 folks to makes interaction simpler.

The interaction between i915 and audio is simple, yes, it just exposes a few things, mmio ptr, irq, etc. But still I don't understand why multiple layers of indirect accesses are needed *inside* lpe audio driver itself. For example, suspend/resume action is cascaded to yet another ops.

Quoted 4 lines

I would understand if this "shell" provides a few thin accessors to the raw i915 registers. But another layering over a single driver implementation makes little sense in regard of abstraction. (If there were multiple class inherits, it's a different story, of course.)

No disagreement here Takashi.
I was planning to remove this abstraction in a second incremental pass that would only be on the audio side, for now keeping this layer would allow me to add the DisplayPort changes faster. If we simplify this now then I will have so many differences with the legacy code it'll be a nightmare. I have no emotional attachment to the legacy but it's just pragmatic to avoid changing everything at once.

As you also mentioned it, this second pass could also reuse all the ELD parsing that is still duplicated. These HDMI patches are not a single-shot contribution, you'll have updates coming your way.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#22 lore raw

Re: [alsa-devel] [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Quoted 40 lines · Pierre-Louis Bossart
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Subject: Re: [PATCH 3/7] ALSA: add shell for Intel HDMI LPE audio driver

Why do we need a "shell" and indirect calls?
This is a small driver set, so it's not utterly unacceptable, but it still makes things a bit more complicated than necessary, so I'd like to understand the idea behind it.

The 'shell' comes from an early prototype which didn't do much except create the device. The title of the commit should be changed if it threw you off.

Quoted 14 lines
Quoted 7 lines

This solution does not use component interface to talk between
Audio and i915 driver. The reason for that is the HDMI audio device is created by i915 driver with only one callback pointer passed as pdata. Unlike HDA, the HDMI audio driver does not get loaded if the i915 does not create child device.
Since there is only one callback needed we are not using the component interface to make things simpler.
This design was co-worked with i915 folks to makes interaction simpler.

The interaction between i915 and audio is simple, yes, it just exposes a few things, mmio ptr, irq, etc. But still I don't understand why multiple layers of indirect accesses are needed *inside* lpe audio driver itself. For example, suspend/resume action is cascaded to yet another ops.

Quoted 4 lines

I would understand if this "shell" provides a few thin accessors to the raw i915 registers. But another layering over a single driver implementation makes little sense in regard of abstraction. (If there were multiple class inherits, it's a different story, of course.)

No disagreement here Takashi.
I was planning to remove this abstraction in a second incremental pass that would only be on the audio side, for now keeping this layer would allow me to add the DisplayPort changes faster. If we simplify this now then I will have so many differences with the legacy code it'll be a nightmare. I have no emotional attachment to the legacy but it's just pragmatic to avoid changing everything at once.

Quoted 3 lines

As you also mentioned it, this second pass could also reuse all the ELD parsing that is still duplicated. These HDMI patches are not a single-shot contribution, you'll have updates coming your way.

OK, if the current structure helps for DP support, it's no problem to keep it. We can refactor the code later easily, too -- it's a single driver code, after all.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#23 lore raw

PATCH 4/7 ALSA: x86: hdmi: Add audio support for BYT and CHT

In reply to Jerome Anand

Hdmi audio driver based on the child platform device created by gfx driver is implemented.
This audio driver is derived from legacy intel hdmi audio driver.

The interfaces for interaction between gfx and audio are updated and the driver implementation updated to derive interrupts in its own address space based on irq chip framework

---
 sound/x86/Makefile               |    2 +
 sound/x86/intel_hdmi_audio.c     | 1907 ++++++++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_audio.h     |  201 ++++
 sound/x86/intel_hdmi_audio_if.c  |  551 +++++++++++
 sound/x86/intel_hdmi_lpe_audio.c |   16 +-
 5 files changed, 2671 insertions(+), 6 deletions(-)
 create mode 100644 sound/x86/intel_hdmi_audio.c
 create mode 100644 sound/x86/intel_hdmi_audio.h
 create mode 100644 sound/x86/intel_hdmi_audio_if.c
sound/x86/Makefile +2 -0
index 78b2ae1..bc074d0 100644
@@ -3,6 +3,8 @@ DRIVER_NAME := hdmi_lpe_audio
 ccflags-y += -Idrivers/gpu/drm/i915
 
 $(DRIVER_NAME)-objs += \
+	intel_hdmi_audio.o \
+	intel_hdmi_audio_if.o \
 	intel_hdmi_lpe_audio.o
 
 obj-$(CONFIG_HDMI_LPE_AUDIO) += $(DRIVER_NAME).o
sound/x86/intel_hdmi_audio.c new file +1907 -0

1,907 lines not on this page · raw message

sound/x86/intel_hdmi_audio.h new file +201 -0

201 lines not on this page · raw message

sound/x86/intel_hdmi_audio_if.c new file +551 -0

551 lines not on this page · raw message

sound/x86/intel_hdmi_lpe_audio.c +10 -6
index f31ab72..16194c6 100644
@@ -36,6 +36,7 @@
 #include <sound/initval.h>
 #include <drm/intel_lpe_audio.h>
 #include "intel_hdmi_lpe_audio.h"
+#include "intel_hdmi_audio.h"
 
 /* globals*/
 struct platform_device *gpdev;
@@ -461,9 +462,9 @@ static void notify_audio_lpe(void *audio_ptr)
 /**
  * hdmi_lpe_audio_probe - start bridge with i915
  *
- * This function is called when the i915 driver creates the hdmi-lpe-audio
- * platform device. Card creation is deferred until a hot plug event is
- * received
+ * This function is called when the i915 driver creates the
+ * hdmi-lpe-audio platform device. Card creation is deferred until a
+ * hot plug event is received
  */
 static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 {
@@ -505,8 +506,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 		(unsigned int)res_mmio->start, (unsigned int)res_mmio->end);
 
 	mmio_start = ioremap_nocache(res_mmio->start,
-				(size_t)((res_mmio->end - res_mmio->start)
-						+ 1));
+				(size_t)((res_mmio->end -
+					res_mmio->start) + 1));
 	if (!mmio_start) {
 		pr_err("Could not get ioremap\n");
 		return -EACCES;
@@ -556,11 +557,12 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, ctx);
 
+	ret = hdmi_audio_probe((void *)pdev);
+
 	pr_debug("hdmi lpe audio: setting pin eld notify callback\n");
 
 	spin_lock_irqsave(&pdata->lpe_audio_slock, flag_irq);
 	pdata->notify_audio_lpe = notify_audio_lpe;
-
 	if (pdata->notify_pending) {
 
 		pr_debug("%s: handle pending notification\n", __func__);
@@ -584,6 +586,8 @@ static int hdmi_lpe_audio_remove(struct platform_device *pdev)
 
 	pr_debug("Enter %s\n", __func__);
 
+	hdmi_audio_remove(pdev);
+
 	/* get context, release resources */
 	ctx = platform_get_drvdata(pdev);
 	iounmap(ctx->mmio_start);
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#24 lore raw

Re: [PATCH 4/7] ALSA: x86: hdmi: Add audio support for BYT and CHT

Quoted 80 lines · Jerome Anand

Hdmi audio driver based on the child platform device created by gfx driver is implemented.
This audio driver is derived from legacy intel hdmi audio driver.

The interfaces for interaction between gfx and audio are updated and the driver implementation updated to derive interrupts in its own address space based on irq chip framework

---
 sound/x86/Makefile               |    2 +
 sound/x86/intel_hdmi_audio.c     | 1907 ++++++++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_audio.h     |  201 ++++
 sound/x86/intel_hdmi_audio_if.c  |  551 +++++++++++
 sound/x86/intel_hdmi_lpe_audio.c |   16 +-
 5 files changed, 2671 insertions(+), 6 deletions(-)
 create mode 100644 sound/x86/intel_hdmi_audio.c
 create mode 100644 sound/x86/intel_hdmi_audio.h
 create mode 100644 sound/x86/intel_hdmi_audio_if.c
sound/x86/Makefile +2 -0
index 78b2ae1..bc074d0 100644
@@ -3,6 +3,8 @@ DRIVER_NAME := hdmi_lpe_audio
 ccflags-y += -Idrivers/gpu/drm/i915
 
 $(DRIVER_NAME)-objs += \
+	intel_hdmi_audio.o \
+	intel_hdmi_audio_if.o \
 	intel_hdmi_lpe_audio.o
 
 obj-$(CONFIG_HDMI_LPE_AUDIO) += $(DRIVER_NAME).o
sound/x86/intel_hdmi_audio.c new file +37 -0
new file mode 100644
index 0000000..461b7d7
@@ -0,0 +1,1907 @@
+/*
+ *   intel_hdmi_audio.c - Intel HDMI audio driver
+ *
+ *  Copyright (C) 2016 Intel Corp
+ *  Authors:	Sailaja Bandarupalli <[email protected]>
+ *		Ramesh Babu K V	<[email protected]>
+ *		Vaibhav Agarwal <[email protected]>
+ *		Jerome Anand <[email protected]>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * ALSA driver for Intel HDMI audio
+ */
+
+#define pr_fmt(fmt)	"had: " fmt
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
+#include <asm/cacheflush.h>
+#include <sound/pcm.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <sound/initval.h>

sound/x86/intel_hdmi_audio.c line 47

Quoted 10 lines
sound/x86/intel_hdmi_audio.c new file +10 -0
+#include "intel_hdmi_audio.h"
+
+static DEFINE_MUTEX(had_mutex);
+
+/*standard module options for ALSA. This module supports only one card*/
+static int hdmi_card_index = SNDRV_DEFAULT_IDX1;
+static char *hdmi_card_id = SNDRV_DEFAULT_STR1;
+static struct snd_intelhad *had_data;
+
+module_param(hdmi_card_index, int, 0444);

Use module_param_named(index, hdmi_card_index, int, 0444); Ditto for id.

Quoted 73 lines
sound/x86/intel_hdmi_audio.c new file +73 -0
+MODULE_PARM_DESC(hdmi_card_index,
+		"Index value for INTEL Intel HDMI Audio controller.");
+module_param(hdmi_card_id, charp, 0444);
+MODULE_PARM_DESC(hdmi_card_id,
+		"ID string for INTEL Intel HDMI Audio controller.");
+
+/*
+ * ELD SA bits in the CEA Speaker Allocation data block
+*/
+static int eld_speaker_allocation_bits[] = {
+	[0] = FL | FR,
+	[1] = LFE,
+	[2] = FC,
+	[3] = RL | RR,
+	[4] = RC,
+	[5] = FLC | FRC,
+	[6] = RLC | RRC,
+	/* the following are not defined in ELD yet */
+	[7] = 0,
+};
+
+/*
+ * This is an ordered list!
+ *
+ * The preceding ones have better chances to be selected by
+ * hdmi_channel_allocation().
+ */
+static struct cea_channel_speaker_allocation channel_allocations[] = {
+/*                        channel:   7     6    5    4    3     2    1    0  */
+{ .ca_index = 0x00,  .speakers = {   0,    0,   0,   0,   0,    0,  FR,  FL } },
+				/* 2.1 */
+{ .ca_index = 0x01,  .speakers = {   0,    0,   0,   0,   0,  LFE,  FR,  FL } },
+				/* Dolby Surround */
+{ .ca_index = 0x02,  .speakers = {   0,    0,   0,   0,  FC,    0,  FR,  FL } },
+				/* surround40 */
+{ .ca_index = 0x08,  .speakers = {   0,    0,  RR,  RL,   0,    0,  FR,  FL } },
+				/* surround41 */
+{ .ca_index = 0x09,  .speakers = {   0,    0,  RR,  RL,   0,  LFE,  FR,  FL } },
+				/* surround50 */
+{ .ca_index = 0x0a,  .speakers = {   0,    0,  RR,  RL,  FC,    0,  FR,  FL } },
+				/* surround51 */
+{ .ca_index = 0x0b,  .speakers = {   0,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },
+				/* 6.1 */
+{ .ca_index = 0x0f,  .speakers = {   0,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+				/* surround71 */
+{ .ca_index = 0x13,  .speakers = { RRC,  RLC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+
+{ .ca_index = 0x03,  .speakers = {   0,    0,   0,   0,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x04,  .speakers = {   0,    0,   0,  RC,   0,    0,  FR,  FL } },
+{ .ca_index = 0x05,  .speakers = {   0,    0,   0,  RC,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x06,  .speakers = {   0,    0,   0,  RC,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x07,  .speakers = {   0,    0,   0,  RC,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x0c,  .speakers = {   0,   RC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x0d,  .speakers = {   0,   RC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x0e,  .speakers = {   0,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x10,  .speakers = { RRC,  RLC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x11,  .speakers = { RRC,  RLC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x12,  .speakers = { RRC,  RLC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x14,  .speakers = { FRC,  FLC,   0,   0,   0,    0,  FR,  FL } },
+{ .ca_index = 0x15,  .speakers = { FRC,  FLC,   0,   0,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x16,  .speakers = { FRC,  FLC,   0,   0,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x17,  .speakers = { FRC,  FLC,   0,   0,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x18,  .speakers = { FRC,  FLC,   0,  RC,   0,    0,  FR,  FL } },
+{ .ca_index = 0x19,  .speakers = { FRC,  FLC,   0,  RC,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x1a,  .speakers = { FRC,  FLC,   0,  RC,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x1b,  .speakers = { FRC,  FLC,   0,  RC,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x1c,  .speakers = { FRC,  FLC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x1d,  .speakers = { FRC,  FLC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x1e,  .speakers = { FRC,  FLC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x1f,  .speakers = { FRC,  FLC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+};
+
+static struct channel_map_table map_tables[] = {

sound/x86/intel_hdmi_audio.c line 130

Quoted 10 lines
sound/x86/intel_hdmi_audio.c new file +10 -0
+	{ SNDRV_CHMAP_FL,       0x00,   FL },
+	{ SNDRV_CHMAP_FR,       0x01,   FR },
+	{ SNDRV_CHMAP_RL,       0x04,   RL },
+	{ SNDRV_CHMAP_RR,       0x05,   RR },
+	{ SNDRV_CHMAP_LFE,      0x02,   LFE },
+	{ SNDRV_CHMAP_FC,       0x03,   FC },
+	{ SNDRV_CHMAP_RLC,      0x06,   RLC },
+	{ SNDRV_CHMAP_RRC,      0x07,   RRC },
+	{} /* terminator */
+};

We really have the same stuff in multiple places...
A serious cleanup will be needed later, but it's OK for now to make the code self-contained.

sound/x86/intel_hdmi_audio.c line 140

Quoted 9 lines
sound/x86/intel_hdmi_audio.c new file +9 -0
+/* hardware capability structure */
+static const struct snd_pcm_hardware snd_intel_hadstream = {
+	.info =	(SNDRV_PCM_INFO_INTERLEAVED |
+		SNDRV_PCM_INFO_DOUBLE |
+		SNDRV_PCM_INFO_MMAP|
+		SNDRV_PCM_INFO_MMAP_VALID |
+		SNDRV_PCM_INFO_BATCH),
+	.formats = (SNDRV_PCM_FMTBIT_S24 |
+		SNDRV_PCM_FMTBIT_U24),

Are only these formats available? I see the code dealing with 16bit samples... Also, does it support unsigned format?

(snip)

Quoted 18 lines
sound/x86/intel_hdmi_audio.c new file +18 -0
+static int snd_intelhad_pcm_trigger(struct snd_pcm_substream *substream,
+					int cmd)
+{
+	int caps, retval = 0;
+	unsigned long flag_irq;
+	struct snd_intelhad *intelhaddata;
+	struct had_stream_pvt *stream;
+	struct had_pvt_data *had_stream;
+
+	pr_debug("snd_intelhad_pcm_trigger called\n");
+
+	intelhaddata = snd_pcm_substream_chip(substream);
+	stream = substream->runtime->private_data;
+	had_stream = intelhaddata->private_data;
+
+	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START:
+		pr_debug("Trigger Start\n");

sound/x86/intel_hdmi_audio.c line 1348

Quoted 10 lines
sound/x86/intel_hdmi_audio.c new file +10 -0
+
+		/* Disable local INTRs till register prgmng is done */
+		if (had_get_hwstate(intelhaddata)) {
+			pr_err("_START: HDMI cable plugged-out\n");
+			retval = -ENODEV;
+			break;
+		}
+		stream->stream_status = STREAM_RUNNING;
+
+		spin_lock_irqsave(&intelhaddata->had_spinlock, flag_irq);

The trigger callback is always atomic and already spin-irqlocked.

Quoted 7 lines
sound/x86/intel_hdmi_audio.c new file +7 -0
+static int snd_intelhad_pcm_prepare(struct snd_pcm_substream *substream)
+{
+	int retval;
+	u32 disp_samp_freq, n_param;
+	struct snd_intelhad *intelhaddata;
+	struct snd_pcm_runtime *runtime;
+	struct had_pvt_data *had_stream;

sound/x86/intel_hdmi_audio.c line 1420

Quoted 10 lines
sound/x86/intel_hdmi_audio.c new file +10 -0
+
+	pr_debug("snd_intelhad_pcm_prepare called\n");
+
+	intelhaddata = snd_pcm_substream_chip(substream);
+	runtime = substream->runtime;
+	had_stream = intelhaddata->private_data;
+
+	if (had_get_hwstate(intelhaddata)) {
+		pr_err("%s: HDMI cable plugged-out\n", __func__);
+		snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);

I wonder whether this works well with this driver. SNDRV_PCM_STATE_DISCONNECTED is for the hot-unplug. It's fine to use it, but then PulseAudio assumes that the whole card got unplugged, and removes the device entry, thus there is no way back even if you replug, unless you really reload the driver.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#25 lore raw

Re: [PATCH 4/7] ALSA: x86: hdmi: Add audio support for BYT and CHT

Quoted 110 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 6:26 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 4/7] ALSA: x86: hdmi: Add audio support for BYT and CHT

Quoted 9 lines · Jerome Anand

Hdmi audio driver based on the child platform device created by gfx driver is implemented.
This audio driver is derived from legacy intel hdmi audio driver.

The interfaces for interaction between gfx and audio are updated and the driver implementation updated to derive interrupts in its own address space based on irq chip framework

Quoted 6 lines

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

---
 sound/x86/Makefile               |    2 +
 sound/x86/intel_hdmi_audio.c     | 1907

++++++++++++++++++++++++++++++++++++++

Quoted 21 lines
 sound/x86/intel_hdmi_audio.h     |  201 ++++
 sound/x86/intel_hdmi_audio_if.c  |  551 +++++++++++
 sound/x86/intel_hdmi_lpe_audio.c |   16 +-
 5 files changed, 2671 insertions(+), 6 deletions(-)  create mode

100644 sound/x86/intel_hdmi_audio.c create mode 100644 sound/x86/intel_hdmi_audio.h create mode 100644 sound/x86/intel_hdmi_audio_if.c

sound/x86/Makefile index renamed from sound/x86/Makefile +0 -0

78b2ae1..bc074d0 100644

sound/x86/Makefile +2 -1
@@ -3,6 +3,8 @@ DRIVER_NAME := hdmi_lpe_audio  ccflags-y +=
-Idrivers/gpu/drm/i915
 
 $(DRIVER_NAME)-objs += \
+	intel_hdmi_audio.o \
+	intel_hdmi_audio_if.o \
 	intel_hdmi_lpe_audio.o
 
 obj-$(CONFIG_HDMI_LPE_AUDIO) += $(DRIVER_NAME).o diff --git
Quoted 1 line

a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c new

file

Quoted 5 lines

mode 100644 index 0000000..461b7d7

sound/x86/intel_hdmi_audio.c line 9

Quoted 9 lines
sound/x86/intel_hdmi_audio.c new file +9 -0
@@ -0,0 +1,1907 @@
+/*
+ *   intel_hdmi_audio.c - Intel HDMI audio driver
+ *
+ *  Copyright (C) 2016 Intel Corp
+ *  Authors:	Sailaja Bandarupalli <[email protected]>
+ *		Ramesh Babu K V	<[email protected]>
+ *		Vaibhav Agarwal <[email protected]>
+ *		Jerome Anand <[email protected]>
+ *

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~

sound/x86/intel_hdmi_audio.c line 21

Quoted 12 lines
sound/x86/intel_hdmi_audio.c new file +12 -0
+~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or
+modify
+ *  it under the terms of the GNU General Public License as published
+by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

GNU

sound/x86/intel_hdmi_audio.c line 71

Quoted 4 lines
sound/x86/intel_hdmi_audio.c new file +3 -0
+ *  General Public License for more details.
+ *
+ *

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~

Quoted 22 lines
sound/x86/intel_hdmi_audio.c new file +22 -0
+~~~~~
+ * ALSA driver for Intel HDMI audio
+ */
+
+#define pr_fmt(fmt)	"had: " fmt
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
+#include <asm/cacheflush.h>
+#include <sound/pcm.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <sound/initval.h>
+#include "intel_hdmi_audio.h"
+
+static DEFINE_MUTEX(had_mutex);
+
Quoted 9 lines

sound/x86/intel_hdmi_audio.c line 52

Quoted 6 lines
sound/x86/intel_hdmi_audio.c new file +6 -0
+/*standard module options for ALSA. This module supports only one
+card*/ static int hdmi_card_index = SNDRV_DEFAULT_IDX1; static char
+*hdmi_card_id = SNDRV_DEFAULT_STR1; static struct snd_intelhad
+*had_data;
+
+module_param(hdmi_card_index, int, 0444);

Use module_param_named(index, hdmi_card_index, int, 0444); Ditto for id.

OK

Quoted 3 lines

sound/x86/intel_hdmi_audio.c line 50

Quoted 3 lines
sound/x86/intel_hdmi_audio.c new file +3 -0
+MODULE_PARM_DESC(hdmi_card_index,
+		"Index value for INTEL Intel HDMI Audio controller.");
+module_param(hdmi_card_id, charp, 0444);

OK

Quoted 76 lines
Quoted 76 lines
sound/x86/intel_hdmi_audio.c new file +76 -0
+MODULE_PARM_DESC(hdmi_card_id,
+		"ID string for INTEL Intel HDMI Audio controller.");
+
+/*
+ * ELD SA bits in the CEA Speaker Allocation data block */ static int
+eld_speaker_allocation_bits[] = {
+	[0] = FL | FR,
+	[1] = LFE,
+	[2] = FC,
+	[3] = RL | RR,
+	[4] = RC,
+	[5] = FLC | FRC,
+	[6] = RLC | RRC,
+	/* the following are not defined in ELD yet */
+	[7] = 0,
+};
+
+/*
+ * This is an ordered list!
+ *
+ * The preceding ones have better chances to be selected by
+ * hdmi_channel_allocation().
+ */
+static struct cea_channel_speaker_allocation channel_allocations[] = {
+/*                        channel:   7     6    5    4    3     2    1    0  */
+{ .ca_index = 0x00,  .speakers = {   0,    0,   0,   0,   0,    0,  FR,  FL } },
+				/* 2.1 */
+{ .ca_index = 0x01,  .speakers = {   0,    0,   0,   0,   0,  LFE,  FR,  FL } },
+				/* Dolby Surround */
+{ .ca_index = 0x02,  .speakers = {   0,    0,   0,   0,  FC,    0,  FR,  FL } },
+				/* surround40 */
+{ .ca_index = 0x08,  .speakers = {   0,    0,  RR,  RL,   0,    0,  FR,  FL } },
+				/* surround41 */
+{ .ca_index = 0x09,  .speakers = {   0,    0,  RR,  RL,   0,  LFE,  FR,  FL } },
+				/* surround50 */
+{ .ca_index = 0x0a,  .speakers = {   0,    0,  RR,  RL,  FC,    0,  FR,  FL } },
+				/* surround51 */
+{ .ca_index = 0x0b,  .speakers = {   0,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },
+				/* 6.1 */
+{ .ca_index = 0x0f,  .speakers = {   0,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+				/* surround71 */
+{ .ca_index = 0x13,  .speakers = { RRC,  RLC,  RR,  RL,  FC,  LFE,
+FR,  FL } },
+
+{ .ca_index = 0x03,  .speakers = {   0,    0,   0,   0,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x04,  .speakers = {   0,    0,   0,  RC,   0,    0,  FR,  FL } },
+{ .ca_index = 0x05,  .speakers = {   0,    0,   0,  RC,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x06,  .speakers = {   0,    0,   0,  RC,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x07,  .speakers = {   0,    0,   0,  RC,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x0c,  .speakers = {   0,   RC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x0d,  .speakers = {   0,   RC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x0e,  .speakers = {   0,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x10,  .speakers = { RRC,  RLC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x11,  .speakers = { RRC,  RLC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x12,  .speakers = { RRC,  RLC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x14,  .speakers = { FRC,  FLC,   0,   0,   0,    0,  FR,  FL } },
+{ .ca_index = 0x15,  .speakers = { FRC,  FLC,   0,   0,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x16,  .speakers = { FRC,  FLC,   0,   0,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x17,  .speakers = { FRC,  FLC,   0,   0,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x18,  .speakers = { FRC,  FLC,   0,  RC,   0,    0,  FR,  FL } },
+{ .ca_index = 0x19,  .speakers = { FRC,  FLC,   0,  RC,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x1a,  .speakers = { FRC,  FLC,   0,  RC,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x1b,  .speakers = { FRC,  FLC,   0,  RC,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x1c,  .speakers = { FRC,  FLC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x1d,  .speakers = { FRC,  FLC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x1e,  .speakers = { FRC,  FLC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x1f,  .speakers = { FRC,  FLC,  RR,  RL,  FC,  LFE,
+FR,  FL } }, };
+
+static struct channel_map_table map_tables[] = {
+	{ SNDRV_CHMAP_FL,       0x00,   FL },
+	{ SNDRV_CHMAP_FR,       0x01,   FR },
+	{ SNDRV_CHMAP_RL,       0x04,   RL },
+	{ SNDRV_CHMAP_RR,       0x05,   RR },
+	{ SNDRV_CHMAP_LFE,      0x02,   LFE },
+	{ SNDRV_CHMAP_FC,       0x03,   FC },
Quoted 10 lines

sound/x86/intel_hdmi_audio.c line 130

Quoted 4 lines
sound/x86/intel_hdmi_audio.c new file +4 -0
+	{ SNDRV_CHMAP_RLC,      0x06,   RLC },
+	{ SNDRV_CHMAP_RRC,      0x07,   RRC },
+	{} /* terminator */
+};

We really have the same stuff in multiple places...
A serious cleanup will be needed later, but it's OK for now to make the code self-contained.

OK - I'll send a cleanup patch after these are accepted.

Quoted 11 lines

sound/x86/intel_hdmi_audio.c line 140

Quoted 9 lines
sound/x86/intel_hdmi_audio.c new file +9 -0
+/* hardware capability structure */
+static const struct snd_pcm_hardware snd_intel_hadstream = {
+	.info =	(SNDRV_PCM_INFO_INTERLEAVED |
+		SNDRV_PCM_INFO_DOUBLE |
+		SNDRV_PCM_INFO_MMAP|
+		SNDRV_PCM_INFO_MMAP_VALID |
+		SNDRV_PCM_INFO_BATCH),
+	.formats = (SNDRV_PCM_FMTBIT_S24 |
+		SNDRV_PCM_FMTBIT_U24),

Are only these formats available? I see the code dealing with 16bit samples...

We support only 24 bit samples. Changes related to 16 can be removed.

Quoted 2 lines

Also, does it support unsigned format?

Yes its supported

Quoted 24 lines

(snip)

Quoted 1 line

+static int snd_intelhad_pcm_trigger(struct snd_pcm_substream

*substream,

Quoted 21 lines
sound/x86/intel_hdmi_audio.c new file +21 -0
+					int cmd)
+{
+	int caps, retval = 0;
+	unsigned long flag_irq;
+	struct snd_intelhad *intelhaddata;
+	struct had_stream_pvt *stream;
+	struct had_pvt_data *had_stream;
+
+	pr_debug("snd_intelhad_pcm_trigger called\n");
+
+	intelhaddata = snd_pcm_substream_chip(substream);
+	stream = substream->runtime->private_data;
+	had_stream = intelhaddata->private_data;
+
+	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START:
+		pr_debug("Trigger Start\n");
+
+		/* Disable local INTRs till register prgmng is done */
+		if (had_get_hwstate(intelhaddata)) {
+			pr_err("_START: HDMI cable plugged-out\n");
Quoted 9 lines

sound/x86/intel_hdmi_audio.c line 1348

Quoted 6 lines
sound/x86/intel_hdmi_audio.c new file +6 -0
+			retval = -ENODEV;
+			break;
+		}
+		stream->stream_status = STREAM_RUNNING;
+
+		spin_lock_irqsave(&intelhaddata->had_spinlock, flag_irq);

The trigger callback is always atomic and already spin-irqlocked.

OK

Quoted 19 lines
Quoted 7 lines
sound/x86/intel_hdmi_audio.c new file +7 -0
+static int snd_intelhad_pcm_prepare(struct snd_pcm_substream
+*substream) {
+	int retval;
+	u32 disp_samp_freq, n_param;
+	struct snd_intelhad *intelhaddata;
+	struct snd_pcm_runtime *runtime;
+	struct had_pvt_data *had_stream;

sound/x86/intel_hdmi_audio.c

Quoted 10 lines
sound/x86/intel_hdmi_audio.c new file +10 -0
+
+	pr_debug("snd_intelhad_pcm_prepare called\n");
+
+	intelhaddata = snd_pcm_substream_chip(substream);
+	runtime = substream->runtime;
+	had_stream = intelhaddata->private_data;
+
+	if (had_get_hwstate(intelhaddata)) {
+		pr_err("%s: HDMI cable plugged-out\n", __func__);
+		snd_pcm_stop(substream,

SNDRV_PCM_STATE_DISCONNECTED);

Quoted 6 lines

I wonder whether this works well with this driver. SNDRV_PCM_STATE_DISCONNECTED is for the hot-unplug. It's fine to use it, but then PulseAudio assumes that the whole card got unplugged, and removes the device entry, thus there is no way back even if you replug, unless you really reload the driver.

OK - snd_pcm_stop() must not be done. Else, the device needs to be rebooted for PB

Quoted 4 lines

thanks,

Takashi

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#26 lore raw

PATCH 5/7 ALSA: x86: hdmi: Improve position reporting

In reply to Jerome Anand

Use a hw register to calculate sub-period position reports. This makes PulseAudio happier.

---
 sound/x86/intel_hdmi_audio.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
sound/x86/intel_hdmi_audio.c +11 -1
index 461b7d7..d9ce750 100644
@@ -1492,6 +1492,8 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 {
 	struct snd_intelhad *intelhaddata;
 	u32 bytes_rendered = 0;
+	u32 t;
+	int buf_id;
 
 	/* pr_debug("snd_intelhad_pcm_pointer called\n"); */
 
@@ -1502,6 +1504,14 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 		return SNDRV_PCM_POS_XRUN;
 	}
 
+	buf_id = intelhaddata->curr_buf % 4;
+	had_read_register(AUD_BUF_A_LENGTH + (buf_id * HAD_REG_WIDTH), &t);
+	if (t == 0) {
+		pr_debug("discovered buffer done for buf %d\n", buf_id);
+		/* had_process_buffer_done(intelhaddata); */
+	}
+	t = intelhaddata->buf_info[buf_id].buf_size - t;
+
 	if (intelhaddata->stream_info.buffer_rendered)
 		div_u64_rem(intelhaddata->stream_info.buffer_rendered,
 			intelhaddata->stream_info.ring_buf_size,
@@ -1509,7 +1519,7 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 
 	intelhaddata->stream_info.buffer_ptr = bytes_to_frames(
 						substream->runtime,
-						bytes_rendered);
+						bytes_rendered + t);
 	return intelhaddata->stream_info.buffer_ptr;
 }
 
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#27 lore raw

Re: [PATCH 5/7] ALSA: x86: hdmi: Improve position reporting

Quoted 7 lines · Jerome Anand

Use a hw register to calculate sub-period position reports. This makes PulseAudio happier.

There is no big merit to keep this a separate patch. Please fold into the main patch.
You can put some comment in the code for explanation.

thanks,

Takashi

Quoted 45 lines
---
 sound/x86/intel_hdmi_audio.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
sound/x86/intel_hdmi_audio.c +12 -2
index 461b7d7..d9ce750 100644
--- a/sound/x86/intel_hdmi_audio.c
 
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1492,6 +1492,8 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 {
 	struct snd_intelhad *intelhaddata;
 	u32 bytes_rendered = 0;
+	u32 t;
+	int buf_id;
 
 	/* pr_debug("snd_intelhad_pcm_pointer called\n"); */
 
@@ -1502,6 +1504,14 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 		return SNDRV_PCM_POS_XRUN;
 	}
 
+	buf_id = intelhaddata->curr_buf % 4;
+	had_read_register(AUD_BUF_A_LENGTH + (buf_id * HAD_REG_WIDTH), &t);
+	if (t == 0) {
+		pr_debug("discovered buffer done for buf %d\n", buf_id);
+		/* had_process_buffer_done(intelhaddata); */
+	}
+	t = intelhaddata->buf_info[buf_id].buf_size - t;
+
 	if (intelhaddata->stream_info.buffer_rendered)
 		div_u64_rem(intelhaddata->stream_info.buffer_rendered,
 			intelhaddata->stream_info.ring_buf_size,
@@ -1509,7 +1519,7 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 
 	intelhaddata->stream_info.buffer_ptr = bytes_to_frames(
 						substream->runtime,
-						bytes_rendered);
+						bytes_rendered + t);
 	return intelhaddata->stream_info.buffer_ptr;
 }
 
Signature · 1 line
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#28 lore raw

Re: [PATCH 5/7] ALSA: x86: hdmi: Improve position reporting

Quoted 6 lines · Takashi Iwai
Quoted 4 lines · Jerome Anand

Use a hw register to calculate sub-period position reports. This makes PulseAudio happier.

Quoted 7 lines
Quoted 3 lines

There is no big merit to keep this a separate patch. Please fold into the main patch.
You can put some comment in the code for explanation.

The reason we kept this patch and the next separate is purely procedural: they were contributed by Canonical in their Baytrail Compute Stick kernel, and we didn't want to squash this blindly, especially since David has gone silent. I don't mind folding this code into the Intel patches but I wasn't sure this was appropriate or even allowed.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#29 lore raw

Re: [PATCH 5/7] ALSA: x86: hdmi: Improve position reporting

Quoted 16 lines · Pierre-Louis Bossart
Quoted 6 lines · Takashi Iwai
Quoted 4 lines · Jerome Anand

Use a hw register to calculate sub-period position reports. This makes PulseAudio happier.

Quoted 7 lines
Quoted 3 lines

There is no big merit to keep this a separate patch. Please fold into the main patch.
You can put some comment in the code for explanation.

Quoted 6 lines

The reason we kept this patch and the next separate is purely
procedural: they were contributed by Canonical in their Baytrail Compute Stick kernel, and we didn't want to squash this blindly, especially since David has gone silent.
I don't mind folding this code into the Intel patches but I wasn't sure this was appropriate or even allowed.

Merging the code must be OK, that's the point of the original patch having David's sign-off. (If the code merge isn't allowed, how can we work on the kernel tree at all? ;)
It'd be better, though, to mention about the merged code and his sign-off portion in the commit log.

OTOH, I don't mind too much to split this out, either, if you find it more comfortable. But still it's better to put some comments in the code itself, not only in the changelog.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#30 lore raw

Re: [alsa-devel] [PATCH 5/7] ALSA: x86: hdmi: Improve position reporting

Quoted 25 lines · Takashi Iwai
Quoted 16 lines · Pierre-Louis Bossart
Quoted 6 lines · Takashi Iwai
Quoted 4 lines · Jerome Anand

Use a hw register to calculate sub-period position reports. This makes PulseAudio happier.

Quoted 7 lines
Quoted 3 lines

There is no big merit to keep this a separate patch. Please fold into the main patch.
You can put some comment in the code for explanation.

Quoted 6 lines

The reason we kept this patch and the next separate is purely
procedural: they were contributed by Canonical in their Baytrail Compute Stick kernel, and we didn't want to squash this blindly, especially since David has gone silent.
I don't mind folding this code into the Intel patches but I wasn't sure this was appropriate or even allowed.

Quoted 5 lines

Merging the code must be OK, that's the point of the original patch having David's sign-off. (If the code merge isn't allowed, how can we work on the kernel tree at all? ;)
It'd be better, though, to mention about the merged code and his sign-off portion in the commit log.

ok, that's fine.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#31 lore raw

PATCH 6/7 ALSA: x86: hdmi: Fixup some monitor

In reply to Jerome Anand

This change was given to Canonical apparently to fix an issue with on some monitor brand. It's not clear what this patch does but it doesn't seem to have side effects.

---
 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/x86/intel_hdmi_audio.c +2 -2
index d9ce750..9249521 100644
@@ -337,6 +337,7 @@ static void snd_intelhad_reset_audio_v2(u8 reset)
 static int had_prog_status_reg(struct snd_pcm_substream *substream,
 			struct snd_intelhad *intelhaddata)
 {
+	union aud_cfg cfg_val = {.cfg_regval = 0};
 	union aud_ch_status_0 ch_stat0 = {.status_0_regval = 0};
 	union aud_ch_status_1 ch_stat1 = {.status_1_regval = 0};
 	int format;
@@ -347,6 +348,7 @@ static int had_prog_status_reg(struct snd_pcm_substream *substream,
 						IEC958_AES0_NONAUDIO)>>1;
 	ch_stat0.status_0_regx.clk_acc = (intelhaddata->aes_bits &
 						IEC958_AES3_CON_CLOCK)>>4;
+	cfg_val.cfg_regx.val_bit = ch_stat0.status_0_regx.lpcm_id;
 
 	switch (substream->runtime->rate) {
 	case AUD_SAMPLE_RATE_32:
@@ -426,7 +428,6 @@ int snd_intelhad_prog_audio_ctrl_v2(struct snd_pcm_substream *substream,
 	else
 		cfg_val.cfg_regx_v2.layout = LAYOUT1;
 
-	cfg_val.cfg_regx_v2.val_bit = 1;
 	had_write_register(AUD_CONFIG, cfg_val.cfg_regval);
 	return 0;
 }
@@ -482,7 +483,6 @@ int snd_intelhad_prog_audio_ctrl_v1(struct snd_pcm_substream *substream,
 
 	}
 
-	cfg_val.cfg_regx.val_bit = 1;
 	had_write_register(AUD_CONFIG, cfg_val.cfg_regval);
 	return 0;
 }
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#32 lore raw

Re: [PATCH 6/7] ALSA: x86: hdmi: Fixup some monitor

Quoted 8 lines · Jerome Anand

This change was given to Canonical apparently to fix an issue with on some monitor brand. It's not clear what this patch does but it doesn't seem to have side effects.

Again, please fold into the main patch and give the comments in the code instead.

thanks,

Takashi

Quoted 43 lines
---
 sound/x86/intel_hdmi_audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/x86/intel_hdmi_audio.c +2 -2
index d9ce750..9249521 100644
@@ -337,6 +337,7 @@ static void snd_intelhad_reset_audio_v2(u8 reset)
 static int had_prog_status_reg(struct snd_pcm_substream *substream,
 			struct snd_intelhad *intelhaddata)
 {
+	union aud_cfg cfg_val = {.cfg_regval = 0};
 	union aud_ch_status_0 ch_stat0 = {.status_0_regval = 0};
 	union aud_ch_status_1 ch_stat1 = {.status_1_regval = 0};
 	int format;
@@ -347,6 +348,7 @@ static int had_prog_status_reg(struct snd_pcm_substream *substream,
 						IEC958_AES0_NONAUDIO)>>1;
 	ch_stat0.status_0_regx.clk_acc = (intelhaddata->aes_bits &
 						IEC958_AES3_CON_CLOCK)>>4;
+	cfg_val.cfg_regx.val_bit = ch_stat0.status_0_regx.lpcm_id;
 
 	switch (substream->runtime->rate) {
 	case AUD_SAMPLE_RATE_32:
@@ -426,7 +428,6 @@ int snd_intelhad_prog_audio_ctrl_v2(struct snd_pcm_substream *substream,
 	else
 		cfg_val.cfg_regx_v2.layout = LAYOUT1;
 
-	cfg_val.cfg_regx_v2.val_bit = 1;
 	had_write_register(AUD_CONFIG, cfg_val.cfg_regval);
 	return 0;
 }
@@ -482,7 +483,6 @@ int snd_intelhad_prog_audio_ctrl_v1(struct snd_pcm_substream *substream,
 
 	}
 
-	cfg_val.cfg_regx.val_bit = 1;
 	had_write_register(AUD_CONFIG, cfg_val.cfg_regval);
 	return 0;
 }
Signature · 1 line
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#33 lore raw

PATCH 7/7 ALSA: x86: hdmi: continue playback even when display resolution changes

In reply to Jerome Anand

When the display resolution changes, the drm disables the display pipes due to which audio rendering stops. At this time, we need to ensure the existing audio pointers and buffers are cleared out so that the playback can restarted once the display pipe is enabled with a different N/CTS values

---
 sound/x86/intel_hdmi_audio.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
sound/x86/intel_hdmi_audio.c +18 -3
index 9249521..d6fd638 100644
@@ -43,6 +43,7 @@ static DEFINE_MUTEX(had_mutex);
 static int hdmi_card_index = SNDRV_DEFAULT_IDX1;
 static char *hdmi_card_id = SNDRV_DEFAULT_STR1;
 static struct snd_intelhad *had_data;
+static int underrun_count;
 
 module_param(hdmi_card_index, int, 0444);
 MODULE_PARM_DESC(hdmi_card_index,
@@ -1114,6 +1115,7 @@ static int snd_intelhad_open(struct snd_pcm_substream *substream)
 	intelhaddata = snd_pcm_substream_chip(substream);
 	had_stream = intelhaddata->private_data;
 	runtime = substream->runtime;
+	underrun_count = 0;
 
 	pm_runtime_get(intelhaddata->dev);
 
@@ -1506,10 +1508,23 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 
 	buf_id = intelhaddata->curr_buf % 4;
 	had_read_register(AUD_BUF_A_LENGTH + (buf_id * HAD_REG_WIDTH), &t);
-	if (t == 0) {
-		pr_debug("discovered buffer done for buf %d\n", buf_id);
-		/* had_process_buffer_done(intelhaddata); */
+
+	if ((t == 0) || (t == ((u32)-1L))) {
+		underrun_count++;
+		pr_debug("discovered buffer done for buf %d, count = %d\n",
+			buf_id, underrun_count);
+
+		if (underrun_count > (HAD_MIN_PERIODS/2)) {
+			pr_debug("assume audio_codec_reset, underrun = %d - do xrun\n",
+				underrun_count);
+			underrun_count = 0;
+			return SNDRV_PCM_POS_XRUN;
+		}
+	} else {
+		/* Reset Counter */
+		underrun_count = 0;
 	}
+
 	t = intelhaddata->buf_info[buf_id].buf_size - t;
 
 	if (intelhaddata->stream_info.buffer_rendered)
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#34 lore raw

Re: [PATCH 7/7] ALSA: x86: hdmi: continue playback even when display resolution changes

Quoted 50 lines · Jerome Anand

When the display resolution changes, the drm disables the display pipes due to which audio rendering stops. At this time, we need to ensure the existing audio pointers and buffers are cleared out so that the playback can restarted once the display pipe is enabled with a different N/CTS values

---
 sound/x86/intel_hdmi_audio.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
sound/x86/intel_hdmi_audio.c +12 -3
index 9249521..d6fd638 100644
@@ -43,6 +43,7 @@ static DEFINE_MUTEX(had_mutex);
 static int hdmi_card_index = SNDRV_DEFAULT_IDX1;
 static char *hdmi_card_id = SNDRV_DEFAULT_STR1;
 static struct snd_intelhad *had_data;
+static int underrun_count;
 
 module_param(hdmi_card_index, int, 0444);
 MODULE_PARM_DESC(hdmi_card_index,
@@ -1114,6 +1115,7 @@ static int snd_intelhad_open(struct snd_pcm_substream *substream)
 	intelhaddata = snd_pcm_substream_chip(substream);
 	had_stream = intelhaddata->private_data;
 	runtime = substream->runtime;
+	underrun_count = 0;
 
 	pm_runtime_get(intelhaddata->dev);
 
@@ -1506,10 +1508,23 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 
 	buf_id = intelhaddata->curr_buf % 4;
 	had_read_register(AUD_BUF_A_LENGTH + (buf_id * HAD_REG_WIDTH), &t);
-	if (t == 0) {
-		pr_debug("discovered buffer done for buf %d\n", buf_id);
-		/* had_process_buffer_done(intelhaddata); */
+
+	if ((t == 0) || (t == ((u32)-1L))) {
+		underrun_count++;
+		pr_debug("discovered buffer done for buf %d, count = %d\n",
+			buf_id, underrun_count);
+
+		if (underrun_count > (HAD_MIN_PERIODS/2)) {
+			pr_debug("assume audio_codec_reset, underrun = %d - do xrun\n",
+				underrun_count);
+			underrun_count = 0;

sound/x86/intel_hdmi_audio.c static snd_pcm_uframes_t snd_intelhad_pcm_pointer( · line 1530

Quoted 10 lines
sound/x86/intel_hdmi_audio.c +6 -0
+			return SNDRV_PCM_POS_XRUN;
+		}
+	} else {
+		/* Reset Counter */
+		underrun_count = 0;
 	}
+
 	t = intelhaddata->buf_info[buf_id].buf_size - t;
 
 	if (intelhaddata->stream_info.buffer_rendered)

This change itself is OK, but this made me wonder about the driver
implementation: the current MAX_PB=1 is the hardware limitation or the soft limitation? That is, can't we play back two streams when we connect two HDMI monitors?

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#35 lore raw

Re: [PATCH 7/7] ALSA: x86: hdmi: continue playback even when display resolution changes

Quoted 79 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, December 14, 2016 6:31 PM
To: Anand, Jerome <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; pierre- [email protected]; Ughreja, Rakesh A <[email protected]>
Subject: Re: [PATCH 7/7] ALSA: x86: hdmi: continue playback even when display resolution changes

Quoted 23 lines · Jerome Anand

When the display resolution changes, the drm disables the display pipes due to which audio rendering stops. At this time, we need to ensure the existing audio pointers and buffers are cleared out so that the playback can restarted once the display pipe is enabled with a different N/CTS values

Signed-off-by: Pierre-Louis Bossart
<[email protected]>

---
 sound/x86/intel_hdmi_audio.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/sound/x86/intel_hdmi_audio.c index 9249521..d6fd638 100644

sound/x86/intel_hdmi_audio.c +0 -0
@@ -43,6 +43,7 @@ static DEFINE_MUTEX(had_mutex);  static int

hdmi_card_index = SNDRV_DEFAULT_IDX1; static char *hdmi_card_id = SNDRV_DEFAULT_STR1; static struct snd_intelhad *had_data; +static int underrun_count;

Quoted 2 lines

module_param(hdmi_card_index, int, 0444);
MODULE_PARM_DESC(hdmi_card_index, @@ -1114,6 +1115,7 @@ static

int

sound/x86/intel_hdmi_audio.c

Quoted 13 lines

snd_intelhad_open(struct snd_pcm_substream *substream)

sound/x86/intel_hdmi_audio.c +1 -0
 	intelhaddata = snd_pcm_substream_chip(substream);
 	had_stream = intelhaddata->private_data;
 	runtime = substream->runtime;
+	underrun_count = 0;
 
 	pm_runtime_get(intelhaddata->dev);
@@ -1506,10 +1508,23 @@ static snd_pcm_uframes_t

snd_intelhad_pcm_pointer(

sound/x86/intel_hdmi_audio.c +0 -0
 	buf_id = intelhaddata->curr_buf % 4;
 	had_read_register(AUD_BUF_A_LENGTH + (buf_id *

HAD_REG_WIDTH), &t);

sound/x86/intel_hdmi_audio.c static snd_pcm_uframes_t snd_intelhad_pcm_pointer(

Quoted 7 lines
sound/x86/intel_hdmi_audio.c +4 -3
-	if (t == 0) {
-		pr_debug("discovered buffer done for buf %d\n", buf_id);
-		/* had_process_buffer_done(intelhaddata); */
+
+	if ((t == 0) || (t == ((u32)-1L))) {
+		underrun_count++;
+		pr_debug("discovered buffer done for buf %d, count =

%d\n",

sound/x86/intel_hdmi_audio.c static snd_pcm_uframes_t snd_intelhad_pcm_pointer(

Quoted 4 lines
sound/x86/intel_hdmi_audio.c +4 -0
+			buf_id, underrun_count);
+
+		if (underrun_count > (HAD_MIN_PERIODS/2)) {
+			pr_debug("assume audio_codec_reset, underrun =

%d - do xrun\n",

Quoted 11 lines
sound/x86/intel_hdmi_audio.c +8 -0
+				underrun_count);
+			underrun_count = 0;
+			return SNDRV_PCM_POS_XRUN;
+		}
+	} else {
+		/* Reset Counter */
+		underrun_count = 0;
 	}
+
 	t = intelhaddata->buf_info[buf_id].buf_size - t;
Quoted 7 lines
Quoted 1 line

if (intelhaddata->stream_info.buffer_rendered)

This change itself is OK, but this made me wonder about the driver
implementation: the current MAX_PB=1 is the hardware limitation or the soft limitation? That is, can't we play back two streams when we connect two HDMI monitors?

Two streams was never validated from hardware per se. So setting the limitation in software.

Quoted 4 lines

thanks,

Takashi

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#36 lore raw

Re: [alsa-devel] [PATCH 7/7] ALSA: x86: hdmi: continue playback even when display resolution changes

Quoted 8 lines
Quoted 6 lines

This change itself is OK, but this made me wonder about the driver
implementation: the current MAX_PB=1 is the hardware limitation or the soft limitation? That is, can't we play back two streams when we connect two HDMI monitors?

Two streams was never validated from hardware per se. So setting the limitation in software.

To be clearer, the IP itself does support 2 streams going to two different pipes in parallel but we never had a validation platform for Atom gizmos with two connectors and no use case for tablets/phone. Never say never as usual, now we see CHT mini-PC devices with 2 connectors, either both DP or DP+HDMI so we'll have to see how things go when both are enabled. It's on the TODO list.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#37 lore raw

✓ Fi.CI.BAT: success for Add support for Legacy HDMI audio drivers (rev2)

In reply to Jerome Anand
== Series Details ==

== Series Details ==

Series: Add support for Legacy HDMI audio drivers (rev2)
URL : https://patchwork.freedesktop.org/series/16254/
State : success

== Summary ==

Series 16254v2 Add support for Legacy HDMI audio drivers
https://patchwork.freedesktop.org/api/1.0/series/16254/revisions/2/mbox/

fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 

f6a248e2507f98d7eb1f4fec8cfcbf685a33d289 drm-tip: 2016y-12m-10d-21h-47m-23s UTC integration manifest a1b992e ALSA: x86: hdmi: continue playback even when display resolution changes 3a251d5 ALSA: x86: hdmi: Fixup some monitor
b9c616d ALSA: x86: hdmi: Improve position reporting
86c429a ALSA: x86: hdmi: Add audio support for BYT and CHT
075d240 ALSA: add shell for Intel HDMI LPE audio driver
0cff256 drm/i915: Add support for audio driver notifications
aef226b drm/i915: setup bridge for HDMI LPE audio driver

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3265/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#38 lore raw
In reply to Jerome Anand
Quoted 6 lines · Jerome Anand

Legacy (CherryTrail/ Baytrail) HDMI audio drivers added

Legacy hdmi audio-Gfx interaction/ interfacing is updated to use irq chip framework

Quoted 9 lines

Jerome Anand (7):
drm/i915: setup bridge for HDMI LPE audio driver drm/i915: Add support for audio driver notifications
ALSA: add shell for Intel HDMI LPE audio driver
ALSA: x86: hdmi: Add audio support for BYT and CHT
ALSA: x86: hdmi: Improve position reporting
ALSA: x86: hdmi: Fixup some monitor
ALSA: x86: hdmi: continue playback even when display resolution
changes

I guess this patchset should go better through sound git tree, so I'd need ACKs for i915 changes in anyway.

Can i951 guys review these please?

Setting up the platform device and irqchip looks simple enough, so I'm OK if i915 people think it being acceptable -- although it's a bit unfortunate that we would have two distinct interfaces between video and audio.

There are a few minor issues in some codes, and I'll comment in each patch.

thanks,

Takashi

Quoted 22 lines
 Documentation/gpu/i915.rst             |    9 +
 drivers/gpu/drm/i915/Makefile          |    3 +
 drivers/gpu/drm/i915/i915_drv.c        |    8 +-
 drivers/gpu/drm/i915/i915_drv.h        |   18 +
 drivers/gpu/drm/i915/i915_irq.c        |   27 +
 drivers/gpu/drm/i915/i915_reg.h        |    3 +
 drivers/gpu/drm/i915/intel_audio.c     |    8 +
 drivers/gpu/drm/i915/intel_hdmi.c      |    1 +
 drivers/gpu/drm/i915/intel_lpe_audio.c |  409 +++++++
 include/drm/intel_lpe_audio.h          |   46 +
 sound/Kconfig                          |    2 +
 sound/Makefile                         |    2 +-
 sound/x86/Kconfig                      |   16 +
 sound/x86/Makefile                     |   10 +
 sound/x86/intel_hdmi_audio.c           | 1932 ++++++++++++++++++++++++++++++++
 sound/x86/intel_hdmi_audio.h           |  201 ++++
 sound/x86/intel_hdmi_audio_if.c        |  551 +++++++++
 sound/x86/intel_hdmi_lpe_audio.c       |  626 +++++++++++
 sound/x86/intel_hdmi_lpe_audio.h       |  692 ++++++++++++
 19 files changed, 4561 insertions(+), 3 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c
Quoted 14 lines
 create mode 100644 include/drm/intel_lpe_audio.h
 create mode 100644 sound/x86/Kconfig
 create mode 100644 sound/x86/Makefile
 create mode 100644 sound/x86/intel_hdmi_audio.c
 create mode 100644 sound/x86/intel_hdmi_audio.h
 create mode 100644 sound/x86/intel_hdmi_audio_if.c
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.c
 create mode 100644 sound/x86/intel_hdmi_lpe_audio.h
Signature · 3 lines
2.9.3

base-commit: f6a248e2507f98d7eb1f4fec8cfcbf685a33d289

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx