Attachment 122433 Details for Bug 94566 – Add audio component stub

[patch] Add audio component stub

0001-drm-i915-hda-Add-audio-component-stub.patch (text/plain), 5.62 KB, created by Imre Deak on 2016-03-19 22:25:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2016-03-19 22:25:15 UTC

Size: 5.62 KB

patch

obsolete

>From b6f9ea789c07ebf9b77899d67d5a591b2116bcce Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Sat, 19 Mar 2016 20:49:34 +0200
>Subject: [PATCH 1/2] drm/i915/hda: Add audio component stub
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.c    |   34 +++++++++++++-------
> drivers/gpu/drm/i915/intel_audio.c |   61 ++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_drv.h   |    2 +
> include/drm/i915_component.h       |    5 +++
> 4 files changed, 90 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 3648b73..76708ec 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -950,6 +950,19 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> 	struct intel_device_info *intel_info =
> 		(struct intel_device_info *) ent->driver_data;
> 
>+	if (!(driver.driver_features & DRIVER_MODESET)) {
>+		/*
>+		 * Notify the HDA driver so that it doesn't block waiting for
>+		 * i915 to become ready.
>+		 */
>+		i915_audio_component_stub_init(&pdev->dev);
>+
>+		/* Silently fail loading to not upset userspace. */
>+		DRM_DEBUG_DRIVER("KMS and UMS disabled.\n");
>+
>+		return 0;
>+	}
>+
> 	if (IS_PRELIMINARY_HW(intel_info) && !i915.preliminary_hw_support) {
> 		DRM_INFO("This hardware requires preliminary hardware support.\n"
> 			 "See CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT, and/or modparam preliminary_hw_support\n");
>@@ -979,8 +992,14 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> static void
> i915_pci_remove(struct pci_dev *pdev)
> {
>-	struct drm_device *dev = pci_get_drvdata(pdev);
>+	struct drm_device *dev;
> 
>+	if (!(driver.driver_features & DRIVER_MODESET)) {
>+		i915_audio_component_stub_cleanup(&pdev->dev);
>+		return;
>+	}
>+
>+	dev = pci_get_drvdata(pdev);
> 	drm_put_dev(dev);
> }
> 
>@@ -1747,24 +1766,15 @@ static int __init i915_init(void)
> 		driver.driver_features &= ~DRIVER_MODESET;
> #endif
> 
>-	if (!(driver.driver_features & DRIVER_MODESET)) {
>-		/* Silently fail loading to not upset userspace. */
>-		DRM_DEBUG_DRIVER("KMS and UMS disabled.\n");
>-		return 0;
>-	}
>-
> 	if (i915.nuclear_pageflip)
> 		driver.driver_features |= DRIVER_ATOMIC;
> 
>-	return drm_pci_init(&driver, &i915_pci_driver);
>+	return pci_register_driver(&i915_pci_driver);
> }
> 
> static void __exit i915_exit(void)
> {
>-	if (!(driver.driver_features & DRIVER_MODESET))
>-		return; /* Never loaded a driver. */
>-
>-	drm_pci_exit(&driver, &i915_pci_driver);
>+	pci_unregister_driver(&i915_pci_driver);
> }
> 
> module_init(i915_init);
>diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
>index fdc8b2a..8d95fac 100644
>--- a/drivers/gpu/drm/i915/intel_audio.c
>+++ b/drivers/gpu/drm/i915/intel_audio.c
>@@ -833,3 +833,64 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv)
> 	component_del(dev_priv->dev->dev, &i915_audio_component_bind_ops);
> 	dev_priv->audio_component_registered = false;
> }
>+
>+static const struct i915_audio_component_ops i915_audio_component_stub_ops = {
>+	.owner		= THIS_MODULE,
>+	.disabled	= true,
>+};
>+
>+static int i915_audio_component_stub_bind(struct device *i915_stub_dev,
>+					  struct device *hda_dev, void *data)
>+{
>+	struct i915_audio_component *acomp = data;
>+
>+	if (WARN_ON(acomp->ops || acomp->dev))
>+		return -EEXIST;
>+
>+	acomp->ops = &i915_audio_component_stub_ops;
>+	acomp->dev = i915_stub_dev;
>+
>+	return 0;
>+}
>+
>+static void i915_audio_component_stub_unbind(struct device *i915_stub_dev,
>+					     struct device *hda_dev, void *data)
>+{
>+	struct i915_audio_component *acomp = data;
>+
>+	acomp->ops = NULL;
>+	acomp->dev = NULL;
>+}
>+
>+static const struct component_ops i915_audio_component_stub_bind_ops = {
>+	.bind	= i915_audio_component_stub_bind,
>+	.unbind	= i915_audio_component_stub_unbind,
>+};
>+
>+static const struct file_operations component_stub_dev_ops = {
>+	.owner = THIS_MODULE,
>+};
>+
>+static bool i915_audio_component_stub_registered;
>+
>+void i915_audio_component_stub_init(struct device *dev)
>+{
>+	int ret;
>+
>+	ret = component_add(dev, &i915_audio_component_stub_bind_ops);
>+	if (ret < 0) {
>+		DRM_ERROR("failed to add audio stub component (%d)\n", ret);
>+		return;
>+	}
>+
>+	i915_audio_component_stub_registered = true;
>+}
>+
>+void i915_audio_component_stub_cleanup(struct device *dev)
>+{
>+	if (!i915_audio_component_stub_registered)
>+		return;
>+
>+	component_del(dev, &i915_audio_component_stub_bind_ops);
>+	i915_audio_component_stub_registered = false;
>+}
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 5136eef..e152d6e 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -1096,6 +1096,8 @@ void intel_audio_codec_enable(struct intel_encoder *encoder);
> void intel_audio_codec_disable(struct intel_encoder *encoder);
> void i915_audio_component_init(struct drm_i915_private *dev_priv);
> void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);
>+void i915_audio_component_stub_init(struct device *dev);
>+void i915_audio_component_stub_cleanup(struct device *dev);
> 
> /* intel_display.c */
> extern const struct drm_plane_funcs intel_plane_funcs;
>diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
>index b46fa0e..33da85a 100644
>--- a/include/drm/i915_component.h
>+++ b/include/drm/i915_component.h
>@@ -39,6 +39,11 @@ struct i915_audio_component_ops {
> 	 */
> 	struct module *owner;
> 	/**
>+	 * @disabled: i915 driver loaded with modeset=0, the services provided
>+	 * via the audio component interface are not available.
>+	 */
>+	bool disabled;
>+	/**
> 	 * @get_power: get the POWER_DOMAIN_AUDIO power well
> 	 *
> 	 * Request the power well to be turned on.
>-- 
>1.7.0.2
>

Actions: View | Splinter Review

Attachments on bug 94566: 122421 | 122422 | 122433 | 122434 | 122945

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.