* [PATCH 1/4 V5] i915/drm: Add private api for power well usage
2013-05-22 17:04 [PATCH 0/4 V5] Power-well API implementation for Haswell Wang Xingchao
@ 2013-05-22 17:04 ` Wang Xingchao
2013-05-23 15:14 ` Takashi Iwai
2013-05-22 17:04 ` [PATCH 2/4 V5] ALSA: hda - Add power-welll support for haswell HDA Wang Xingchao
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Wang Xingchao @ 2013-05-22 17:04 UTC (permalink / raw)
To: daniel, tiwai
Cc: alsa-devel, jocelyn.li, intel-gfx, Wang Xingchao, xingchao.wang,
liam.r.girdwood, david.henningsson
Haswell Display audio depends on power well in graphic side, it should
request power well before use it and release power well after use.
I915 will not shutdown power well if it detects audio is using.
This patch protects display audio crash for Intel Haswell C3 stepping board.
Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
---
drivers/gpu/drm/i915/i915_dma.c | 6 +++
drivers/gpu/drm/i915/i915_drv.h | 12 ++++++
drivers/gpu/drm/i915/intel_drv.h | 4 ++
drivers/gpu/drm/i915/intel_pm.c | 92 +++++++++++++++++++++++++++++++++++++---
include/drm/i915_powerwell.h | 36 ++++++++++++++++
5 files changed, 143 insertions(+), 7 deletions(-)
create mode 100644 include/drm/i915_powerwell.h
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index a1648eb..2b9010a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1652,6 +1652,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
/* Start out suspended */
dev_priv->mm.suspended = 1;
+ if (IS_HASWELL(dev))
+ i915_init_power_well(dev);
+
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
ret = i915_load_modeset_init(dev);
if (ret < 0) {
@@ -1708,6 +1711,9 @@ int i915_driver_unload(struct drm_device *dev)
intel_gpu_ips_teardown();
+ if (IS_HASWELL(dev))
+ i915_remove_power_well(dev);
+
i915_teardown_sysfs(dev);
if (dev_priv->mm.inactive_shrinker.shrink)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3ac71db..a0f1a6d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -702,6 +702,15 @@ struct intel_ilk_power_mgmt {
struct drm_i915_gem_object *renderctx;
};
+/* Power well structure for haswell */
+struct i915_power_well {
+ struct drm_device *device;
+ spinlock_t lock;
+ /* power well enable/disable usage count */
+ int count;
+ int i915_request;
+};
+
struct i915_dri1_state {
unsigned allow_batchbuffer : 1;
u32 __iomem *gfx_hws_cpu_addr;
@@ -1048,6 +1057,9 @@ typedef struct drm_i915_private {
* mchdev_lock in intel_pm.c */
struct intel_ilk_power_mgmt ips;
+ /* Haswell power well */
+ struct i915_power_well *hsw_pwr;
+
enum no_fbc_reason no_fbc_reason;
struct drm_mm_node *compressed_fb;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index dfcf546..efcccab 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -759,6 +759,10 @@ extern void intel_update_fbc(struct drm_device *dev);
extern void intel_gpu_ips_init(struct drm_i915_private *dev_priv);
extern void intel_gpu_ips_teardown(void);
+/* Power well */
+extern int i915_init_power_well(struct drm_device *dev);
+extern void i915_remove_power_well(struct drm_device *dev);
+
extern bool intel_using_power_well(struct drm_device *dev);
extern void intel_init_power_well(struct drm_device *dev);
extern void intel_set_power_well(struct drm_device *dev, bool enable);
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0f4b46e..246249a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4344,18 +4344,12 @@ bool intel_using_power_well(struct drm_device *dev)
return true;
}
-void intel_set_power_well(struct drm_device *dev, bool enable)
+static void __intel_set_power_well(struct drm_device *dev, bool enable)
{
struct drm_i915_private *dev_priv = dev->dev_private;
bool is_enabled, enable_requested;
uint32_t tmp;
- if (!HAS_POWER_WELL(dev))
- return;
-
- if (!i915_disable_power_well && !enable)
- return;
-
tmp = I915_READ(HSW_PWR_WELL_DRIVER);
is_enabled = tmp & HSW_PWR_WELL_STATE;
enable_requested = tmp & HSW_PWR_WELL_ENABLE;
@@ -4378,6 +4372,90 @@ void intel_set_power_well(struct drm_device *dev, bool enable)
}
}
+static struct i915_power_well *hsw_pwr;
+
+/* Display audio driver power well request */
+void i915_request_power_well(void)
+{
+ if (hsw_pwr == NULL)
+ return;
+
+ spin_lock_irq(&hsw_pwr->lock);
+ if (!hsw_pwr->count++ &&
+ !hsw_pwr->i915_request)
+ __intel_set_power_well(hsw_pwr->device, true);
+ spin_unlock_irq(&hsw_pwr->lock);
+}
+EXPORT_SYMBOL_GPL(i915_request_power_well);
+
+/* Display audio driver power well release */
+void i915_release_power_well(void)
+{
+ if (hsw_pwr == NULL)
+ return;
+
+ spin_lock_irq(&hsw_pwr->lock);
+ WARN_ON(!hsw_pwr->count);
+ if (!--hsw_pwr->count &&
+ !hsw_pwr->i915_request)
+ __intel_set_power_well(hsw_pwr->device, false);
+ spin_unlock_irq(&hsw_pwr->lock);
+}
+EXPORT_SYMBOL_GPL(i915_release_power_well);
+
+int i915_init_power_well(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+
+ hsw_pwr = kzalloc(sizeof *hsw_pwr, GFP_KERNEL);
+ if (hsw_pwr == NULL)
+ return -ENOMEM;
+
+ dev_priv->hsw_pwr = hsw_pwr;
+
+ hsw_pwr->device = dev;
+ spin_lock_init(&hsw_pwr->lock);
+ hsw_pwr->count = 0;
+
+ return 0;
+}
+
+void i915_remove_power_well(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+
+ kfree(dev_priv->hsw_pwr);
+ dev_priv->hsw_pwr = NULL;
+ hsw_pwr = NULL;
+}
+
+void intel_set_power_well(struct drm_device *dev, bool enable)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct i915_power_well *power_well = dev_priv->hsw_pwr;
+
+ if (!HAS_POWER_WELL(dev))
+ return;
+
+ if (!i915_disable_power_well && !enable)
+ return;
+
+ if (!power_well)
+ return;
+
+ spin_lock_irq(&power_well->lock);
+ power_well->i915_request = enable;
+
+ /* only reject "disable" power well request */
+ if (power_well->count && !enable) {
+ spin_unlock_irq(&power_well->lock);
+ return;
+ }
+
+ __intel_set_power_well(dev, enable);
+ spin_unlock_irq(&power_well->lock);
+}
+
/*
* Starting with Haswell, we have a "Power Down Well" that can be turned off
* when not needed anymore. We have 4 registers that can request the power well
diff --git a/include/drm/i915_powerwell.h b/include/drm/i915_powerwell.h
new file mode 100644
index 0000000..cfdc884
--- /dev/null
+++ b/include/drm/i915_powerwell.h
@@ -0,0 +1,36 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Intel Inc.
+ * All Rights Reserved.
+ *
+ * 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, sub license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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 _I915_POWERWELL_H_
+#define _I915_POWERWELL_H_
+
+/* For use by hda_i915 driver */
+extern void i915_request_power_well(void);
+extern void i915_release_power_well(void);
+
+#endif /* _I915_POWERWELL_H_ */
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 1/4 V5] i915/drm: Add private api for power well usage
2013-05-22 17:04 ` [PATCH 1/4 V5] i915/drm: Add private api for power well usage Wang Xingchao
@ 2013-05-23 15:14 ` Takashi Iwai
0 siblings, 0 replies; 13+ messages in thread
From: Takashi Iwai @ 2013-05-23 15:14 UTC (permalink / raw)
To: Wang Xingchao
Cc: alsa-devel, jocelyn.li, intel-gfx, liam.r.girdwood,
david.henningsson
At Thu, 23 May 2013 01:04:13 +0800,
Wang Xingchao wrote:
>
> Haswell Display audio depends on power well in graphic side, it should
> request power well before use it and release power well after use.
> I915 will not shutdown power well if it detects audio is using.
> This patch protects display audio crash for Intel Haswell C3 stepping board.
>
> Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
Just minor points:
> +/* Display audio driver power well request */
> +void i915_request_power_well(void)
> +{
> + if (hsw_pwr == NULL)
> + return;
> +
> + spin_lock_irq(&hsw_pwr->lock);
If both functions are supposed to be called only in non-sleepable
state, there is no merit to use _irq version of spinlock.
OTOH, if this function can be called from non-sleepable context,
spin_lock_irq() is wrong.
That is, the lock here should be either spin_lock() (supposing all
places are not from interrupt context) or spin_lock_irqsave()
(allowing from interrupt context).
> + if (!hsw_pwr->count++ &&
> + !hsw_pwr->i915_request)
> + __intel_set_power_well(hsw_pwr->device, true);
> + spin_unlock_irq(&hsw_pwr->lock);
> +}
> +EXPORT_SYMBOL_GPL(i915_request_power_well);
> +
> +/* Display audio driver power well release */
> +void i915_release_power_well(void)
> +{
> + if (hsw_pwr == NULL)
> + return;
> +
> + spin_lock_irq(&hsw_pwr->lock);
> + WARN_ON(!hsw_pwr->count);
> + if (!--hsw_pwr->count &&
> + !hsw_pwr->i915_request)
> + __intel_set_power_well(hsw_pwr->device, false);
> + spin_unlock_irq(&hsw_pwr->lock);
> +}
> +EXPORT_SYMBOL_GPL(i915_release_power_well);
> +
> +int i915_init_power_well(struct drm_device *dev)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
Since this is a global variable that must be initialized only once,
safer to have
WARN_ON(hsw_pwr);
> + hsw_pwr = kzalloc(sizeof *hsw_pwr, GFP_KERNEL);
> + if (hsw_pwr == NULL)
> + return -ENOMEM;
> +
> + dev_priv->hsw_pwr = hsw_pwr;
> +
> + hsw_pwr->device = dev;
> + spin_lock_init(&hsw_pwr->lock);
> + hsw_pwr->count = 0;
> +
> + return 0;
> +}
> +
> +void i915_remove_power_well(struct drm_device *dev)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
... and
WARN_ON(hsw_ptr != dev_priv->hsw_pwr);
> + kfree(dev_priv->hsw_pwr);
> + dev_priv->hsw_pwr = NULL;
> + hsw_pwr = NULL;
> +}
Takashi
> +
> +void intel_set_power_well(struct drm_device *dev, bool enable)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + struct i915_power_well *power_well = dev_priv->hsw_pwr;
> +
> + if (!HAS_POWER_WELL(dev))
> + return;
> +
> + if (!i915_disable_power_well && !enable)
> + return;
> +
> + if (!power_well)
> + return;
> +
> + spin_lock_irq(&power_well->lock);
> + power_well->i915_request = enable;
> +
> + /* only reject "disable" power well request */
> + if (power_well->count && !enable) {
> + spin_unlock_irq(&power_well->lock);
> + return;
> + }
> +
> + __intel_set_power_well(dev, enable);
> + spin_unlock_irq(&power_well->lock);
> +}
> +
> /*
> * Starting with Haswell, we have a "Power Down Well" that can be turned off
> * when not needed anymore. We have 4 registers that can request the power well
> diff --git a/include/drm/i915_powerwell.h b/include/drm/i915_powerwell.h
> new file mode 100644
> index 0000000..cfdc884
> --- /dev/null
> +++ b/include/drm/i915_powerwell.h
> @@ -0,0 +1,36 @@
> +/**************************************************************************
> + *
> + * Copyright 2013 Intel Inc.
> + * All Rights Reserved.
> + *
> + * 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, sub license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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 _I915_POWERWELL_H_
> +#define _I915_POWERWELL_H_
> +
> +/* For use by hda_i915 driver */
> +extern void i915_request_power_well(void);
> +extern void i915_release_power_well(void);
> +
> +#endif /* _I915_POWERWELL_H_ */
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/4 V5] ALSA: hda - Add power-welll support for haswell HDA
2013-05-22 17:04 [PATCH 0/4 V5] Power-well API implementation for Haswell Wang Xingchao
2013-05-22 17:04 ` [PATCH 1/4 V5] i915/drm: Add private api for power well usage Wang Xingchao
@ 2013-05-22 17:04 ` Wang Xingchao
2013-05-22 17:04 ` [PATCH 3/4] ALSA: hda - Fix runtime PM check Wang Xingchao
2013-05-22 17:04 ` [PATCH 4/4] ALSA: hda - Continue probe in work context to avoid request_module deadlock Wang Xingchao
3 siblings, 0 replies; 13+ messages in thread
From: Wang Xingchao @ 2013-05-22 17:04 UTC (permalink / raw)
To: daniel, tiwai
Cc: alsa-devel, jocelyn.li, intel-gfx, Wang Xingchao, liam.r.girdwood,
david.henningsson
For Intel Haswell chip, HDA controller and codec have
power well dependency from GPU side. This patch added support
to request/release power well in audio driver. Power save
feature should be enabled to get runtime power saving.
Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
---
sound/pci/hda/Kconfig | 10 +++++++
sound/pci/hda/Makefile | 3 ++
sound/pci/hda/hda_i915.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++
sound/pci/hda/hda_i915.h | 35 ++++++++++++++++++++++
sound/pci/hda/hda_intel.c | 51 +++++++++++++++++++++++++++-----
5 files changed, 167 insertions(+), 7 deletions(-)
create mode 100644 sound/pci/hda/hda_i915.c
create mode 100644 sound/pci/hda/hda_i915.h
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 80a7d44..c5a872c 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -152,6 +152,16 @@ config SND_HDA_CODEC_HDMI
snd-hda-codec-hdmi.
This module is automatically loaded at probing.
+config SND_HDA_I915
+ bool "Build Display HD-audio controller/codec power well support for i915 cards"
+ depends on DRM_I915
+ help
+ Say Y here to include full HDMI and DisplayPort HD-audio controller/codec
+ power-well support for Intel Haswell graphics cards based on the i915 driver.
+
+ Note that this option must be enabled for Intel Haswell C+ stepping machines, otherwise
+ the GPU audio controller/codecs will not be initialized or damaged when exit from S3 mode.
+
config SND_HDA_CODEC_CIRRUS
bool "Build Cirrus Logic codec support"
default y
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 24a2514..4b0a4bc 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -6,6 +6,9 @@ snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o
snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
+# for haswell power well
+snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o
+
# for trace-points
CFLAGS_hda_codec.o := -I$(src)
CFLAGS_hda_intel.o := -I$(src)
diff --git a/sound/pci/hda/hda_i915.c b/sound/pci/hda/hda_i915.c
new file mode 100644
index 0000000..76c13d5
--- /dev/null
+++ b/sound/pci/hda/hda_i915.c
@@ -0,0 +1,75 @@
+/*
+ * hda_i915.c - routines for Haswell HDA controller power well support
+ *
+ * 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; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <sound/core.h>
+#include <drm/i915_powerwell.h>
+#include "hda_i915.h"
+
+static void (*get_power)(void);
+static void (*put_power)(void);
+
+void hda_display_power(bool enable)
+{
+ if (!get_power || !put_power)
+ return;
+
+ snd_printdd("HDA display power %s \n",
+ enable ? "Enable" : "Disable");
+ if (enable)
+ get_power();
+ else
+ put_power();
+}
+
+int hda_i915_init(void)
+{
+ int err = 0;
+
+ get_power = symbol_request(i915_request_power_well);
+ if (!get_power) {
+ snd_printk(KERN_WARNING "hda-i915: get_power symbol get fail\n");
+ return -ENODEV;
+ }
+
+ put_power = symbol_request(i915_release_power_well);
+ if (!put_power) {
+ symbol_put(i915_request_power_well);
+ get_power = NULL;
+ return -ENODEV;
+ }
+
+ snd_printd("HDA driver get symbol successfully from i915 module\n");
+
+ return err;
+}
+
+int hda_i915_exit(void)
+{
+ if (get_power) {
+ symbol_put(i915_request_power_well);
+ get_power = NULL;
+ }
+ if (put_power) {
+ symbol_put(i915_release_power_well);
+ put_power = NULL;
+ }
+
+ return 0;
+}
diff --git a/sound/pci/hda/hda_i915.h b/sound/pci/hda/hda_i915.h
new file mode 100644
index 0000000..5a63da2
--- /dev/null
+++ b/sound/pci/hda/hda_i915.h
@@ -0,0 +1,35 @@
+/*
+ * 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; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __SOUND_HDA_I915_H
+#define __SOUND_HDA_I915_H
+
+#ifdef CONFIG_SND_HDA_I915
+void hda_display_power(bool enable);
+int hda_i915_init(void);
+int hda_i915_exit(void);
+#else
+static inline void hda_display_power(bool enable) {}
+static inline int hda_i915_init(void)
+{
+ return -ENODEV;
+}
+static inline int hda_i915_exit(void)
+{
+ return 0;
+}
+#endif
+
+#endif
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 418bfc0..54c7c22 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -62,6 +62,7 @@
#include <linux/vga_switcheroo.h>
#include <linux/firmware.h>
#include "hda_codec.h"
+#include "hda_i915.h"
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -594,6 +595,7 @@ enum {
#define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23) /* BDLE in 4k boundary */
#define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25) /* Take LPIB as delay */
#define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */
+#define AZX_DCAPS_I915_POWERWELL (1 << 27) /* HSW i915 power well support */
/* quirks for Intel PCH */
#define AZX_DCAPS_INTEL_PCH_NOPM \
@@ -2869,6 +2871,8 @@ static int azx_suspend(struct device *dev)
pci_disable_device(pci);
pci_save_state(pci);
pci_set_power_state(pci, PCI_D3hot);
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+ hda_display_power(false);
return 0;
}
@@ -2881,6 +2885,8 @@ static int azx_resume(struct device *dev)
if (chip->disabled)
return 0;
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+ hda_display_power(true);
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
if (pci_enable_device(pci) < 0) {
@@ -2913,6 +2919,8 @@ static int azx_runtime_suspend(struct device *dev)
azx_stop_chip(chip);
azx_clear_irq_pending(chip);
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+ hda_display_power(false);
return 0;
}
@@ -2921,6 +2929,8 @@ static int azx_runtime_resume(struct device *dev)
struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip = card->private_data;
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+ hda_display_power(true);
azx_init_pci(chip);
azx_init_chip(chip, 1);
return 0;
@@ -3144,6 +3154,10 @@ static int azx_free(struct azx *chip)
if (chip->fw)
release_firmware(chip->fw);
#endif
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
+ hda_display_power(false);
+ hda_i915_exit();
+ }
kfree(chip);
return 0;
@@ -3445,6 +3459,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
}
*rchip = chip;
+
return 0;
}
@@ -3700,11 +3715,25 @@ static int azx_probe(struct pci_dev *pci,
chip->disabled = true;
}
+ /* Request power well for Haswell HDA controller and codec */
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
+#ifdef CONFIG_SND_HDA_I915
+ err = hda_i915_init();
+ if (err < 0) {
+ snd_printk(KERN_ERR SFX "Error request power-well from i915\n");
+ return err;
+ }
+ hda_display_power(true);
+#else
+ snd_printk(KERN_ERR SFX "Haswell must build in CONFIG_SND_HDA_I915\n");
+#endif
+ }
+
probe_now = !chip->disabled;
if (probe_now) {
err = azx_first_init(chip);
if (err < 0)
- goto out_free;
+ goto out_free_power;
}
#ifdef CONFIG_SND_HDA_PATCH_LOADER
@@ -3715,7 +3744,7 @@ static int azx_probe(struct pci_dev *pci,
&pci->dev, GFP_KERNEL, card,
azx_firmware_cb);
if (err < 0)
- goto out_free;
+ goto out_free_power;
probe_now = false; /* continued in azx_firmware_cb() */
}
#endif /* CONFIG_SND_HDA_PATCH_LOADER */
@@ -3723,7 +3752,7 @@ static int azx_probe(struct pci_dev *pci,
if (probe_now) {
err = azx_probe_continue(chip);
if (err < 0)
- goto out_free;
+ goto out_free_power;
}
if (pci_dev_run_wake(pci))
@@ -3732,7 +3761,11 @@ static int azx_probe(struct pci_dev *pci,
dev++;
complete_all(&chip->probe_wait);
return 0;
-
+out_free_power:
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
+ hda_display_power(false);
+ hda_i915_exit();
+ }
out_free:
snd_card_free(card);
pci_set_drvdata(pci, NULL);
@@ -3799,6 +3832,7 @@ out_free:
static void azx_remove(struct pci_dev *pci)
{
struct snd_card *card = pci_get_drvdata(pci);
+ struct azx *chip = card->private_data;
if (pci_dev_run_wake(pci))
pm_runtime_get_noresume(&pci->dev);
@@ -3835,11 +3869,14 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
/* Haswell */
{ PCI_DEVICE(0x8086, 0x0a0c),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },
+ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
+ AZX_DCAPS_I915_POWERWELL },
{ PCI_DEVICE(0x8086, 0x0c0c),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },
+ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
+ AZX_DCAPS_I915_POWERWELL },
{ PCI_DEVICE(0x8086, 0x0d0c),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },
+ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
+ AZX_DCAPS_I915_POWERWELL },
/* 5 Series/3400 */
{ PCI_DEVICE(0x8086, 0x3b56),
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-22 17:04 [PATCH 0/4 V5] Power-well API implementation for Haswell Wang Xingchao
2013-05-22 17:04 ` [PATCH 1/4 V5] i915/drm: Add private api for power well usage Wang Xingchao
2013-05-22 17:04 ` [PATCH 2/4 V5] ALSA: hda - Add power-welll support for haswell HDA Wang Xingchao
@ 2013-05-22 17:04 ` Wang Xingchao
2013-05-23 6:02 ` Takashi Iwai
2013-05-23 12:34 ` David Henningsson
2013-05-22 17:04 ` [PATCH 4/4] ALSA: hda - Continue probe in work context to avoid request_module deadlock Wang Xingchao
3 siblings, 2 replies; 13+ messages in thread
From: Wang Xingchao @ 2013-05-22 17:04 UTC (permalink / raw)
To: daniel, tiwai
Cc: alsa-devel, jocelyn.li, intel-gfx, Wang Xingchao, xingchao.wang,
liam.r.girdwood, david.henningsson
The device can support runtime PM no matter whether
it support signal wakeup or not. For some chips like Haswell
which doesnot support PME by default, this patch let haswell
Display HD-A controller enter runtime suspend, and bring more
power saving whith power-well feature enabled.
Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
---
sound/pci/hda/hda_intel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 54c7c22..f20a88c 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
goto out_free_power;
}
- if (pci_dev_run_wake(pci))
+ if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
pm_runtime_put_noidle(&pci->dev);
dev++;
@@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
struct snd_card *card = pci_get_drvdata(pci);
struct azx *chip = card->private_data;
- if (pci_dev_run_wake(pci))
+ if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
pm_runtime_get_noresume(&pci->dev);
if (card)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-22 17:04 ` [PATCH 3/4] ALSA: hda - Fix runtime PM check Wang Xingchao
@ 2013-05-23 6:02 ` Takashi Iwai
2013-05-23 7:53 ` Wang, Xingchao
2013-05-23 12:34 ` David Henningsson
1 sibling, 1 reply; 13+ messages in thread
From: Takashi Iwai @ 2013-05-23 6:02 UTC (permalink / raw)
To: Wang Xingchao
Cc: alsa-devel, jocelyn.li, intel-gfx, liam.r.girdwood,
david.henningsson
At Thu, 23 May 2013 01:04:15 +0800,
Wang Xingchao wrote:
>
> The device can support runtime PM no matter whether
> it support signal wakeup or not. For some chips like Haswell
> which doesnot support PME by default, this patch let haswell
> Display HD-A controller enter runtime suspend, and bring more
> power saving whith power-well feature enabled.
> Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
This change has nothing to do with the power well fix, thus no reason
to put in the series.
Takashi
> ---
> sound/pci/hda/hda_intel.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 54c7c22..f20a88c 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
> goto out_free_power;
> }
>
> - if (pci_dev_run_wake(pci))
> + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> pm_runtime_put_noidle(&pci->dev);
>
> dev++;
> @@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
> struct snd_card *card = pci_get_drvdata(pci);
> struct azx *chip = card->private_data;
>
> - if (pci_dev_run_wake(pci))
> + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> pm_runtime_get_noresume(&pci->dev);
>
> if (card)
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-23 6:02 ` Takashi Iwai
@ 2013-05-23 7:53 ` Wang, Xingchao
2013-05-23 8:09 ` Takashi Iwai
0 siblings, 1 reply; 13+ messages in thread
From: Wang, Xingchao @ 2013-05-23 7:53 UTC (permalink / raw)
To: Takashi Iwai
Cc: alsa-devel@alsa-project.org, Li, Jocelyn,
intel-gfx@lists.freedesktop.org, Wang Xingchao, Girdwood, Liam R,
david.henningsson@canonical.com
Hi Takashi,
> -----Original Message-----
> From: Takashi Iwai [mailto:tiwai@suse.de]
> Sent: Thursday, May 23, 2013 2:03 PM
> To: Wang Xingchao
> Cc: daniel@ffwll.ch; alsa-devel@alsa-project.org;
> intel-gfx@lists.freedesktop.org; david.henningsson@canonical.com; Girdwood,
> Liam R; Li, Jocelyn; Wang, Xingchao
> Subject: Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
>
> At Thu, 23 May 2013 01:04:15 +0800,
> Wang Xingchao wrote:
> >
> > The device can support runtime PM no matter whether it support signal
> > wakeup or not. For some chips like Haswell which doesnot support PME
> > by default, this patch let haswell Display HD-A controller enter
> > runtime suspend, and bring more power saving whith power-well feature
> > enabled.
> > Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
>
> This change has nothing to do with the power well fix, thus no reason to put in
> the series.
But power-well feature depends on HD-A controller's power-save enabling, without this patch,
Power-well would not be shutdown automatically, thus cause more power. So I thought it should
be part of the patchset. Anyway it's a more general fix not only for Haswell, so better to leave it alone.
I will split it from the patchset in next version.
Thanks
--xingchao
>
>
> Takashi
>
> > ---
> > sound/pci/hda/hda_intel.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > index 54c7c22..f20a88c 100644
> > --- a/sound/pci/hda/hda_intel.c
> > +++ b/sound/pci/hda/hda_intel.c
> > @@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
> > goto out_free_power;
> > }
> >
> > - if (pci_dev_run_wake(pci))
> > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > pm_runtime_put_noidle(&pci->dev);
> >
> > dev++;
> > @@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
> > struct snd_card *card = pci_get_drvdata(pci);
> > struct azx *chip = card->private_data;
> >
> > - if (pci_dev_run_wake(pci))
> > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > pm_runtime_get_noresume(&pci->dev);
> >
> > if (card)
> > --
> > 1.8.1.2
> >
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-23 7:53 ` Wang, Xingchao
@ 2013-05-23 8:09 ` Takashi Iwai
2013-05-23 10:20 ` Wang, Xingchao
0 siblings, 1 reply; 13+ messages in thread
From: Takashi Iwai @ 2013-05-23 8:09 UTC (permalink / raw)
To: Wang, Xingchao
Cc: alsa-devel@alsa-project.org, Li, Jocelyn,
intel-gfx@lists.freedesktop.org, Wang Xingchao, Girdwood, Liam R,
david.henningsson@canonical.com
At Thu, 23 May 2013 07:53:00 +0000,
Wang, Xingchao wrote:
>
> Hi Takashi,
>
> > -----Original Message-----
> > From: Takashi Iwai [mailto:tiwai@suse.de]
> > Sent: Thursday, May 23, 2013 2:03 PM
> > To: Wang Xingchao
> > Cc: daniel@ffwll.ch; alsa-devel@alsa-project.org;
> > intel-gfx@lists.freedesktop.org; david.henningsson@canonical.com; Girdwood,
> > Liam R; Li, Jocelyn; Wang, Xingchao
> > Subject: Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
> >
> > At Thu, 23 May 2013 01:04:15 +0800,
> > Wang Xingchao wrote:
> > >
> > > The device can support runtime PM no matter whether it support signal
> > > wakeup or not. For some chips like Haswell which doesnot support PME
> > > by default, this patch let haswell Display HD-A controller enter
> > > runtime suspend, and bring more power saving whith power-well feature
> > > enabled.
> > > Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
> >
> > This change has nothing to do with the power well fix, thus no reason to put in
> > the series.
>
> But power-well feature depends on HD-A controller's power-save enabling, without this patch,
> Power-well would not be shutdown automatically, thus cause more
> power.
Then the fix order is wrong. Fix this first, then the rest.
Takashi
> So I thought it should
> be part of the patchset. Anyway it's a more general fix not only for Haswell, so better to leave it alone.
> I will split it from the patchset in next version.
>
> Thanks
> --xingchao
> >
> >
> > Takashi
> >
> > > ---
> > > sound/pci/hda/hda_intel.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > > index 54c7c22..f20a88c 100644
> > > --- a/sound/pci/hda/hda_intel.c
> > > +++ b/sound/pci/hda/hda_intel.c
> > > @@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
> > > goto out_free_power;
> > > }
> > >
> > > - if (pci_dev_run_wake(pci))
> > > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > > pm_runtime_put_noidle(&pci->dev);
> > >
> > > dev++;
> > > @@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
> > > struct snd_card *card = pci_get_drvdata(pci);
> > > struct azx *chip = card->private_data;
> > >
> > > - if (pci_dev_run_wake(pci))
> > > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > > pm_runtime_get_noresume(&pci->dev);
> > >
> > > if (card)
> > > --
> > > 1.8.1.2
> > >
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-23 8:09 ` Takashi Iwai
@ 2013-05-23 10:20 ` Wang, Xingchao
0 siblings, 0 replies; 13+ messages in thread
From: Wang, Xingchao @ 2013-05-23 10:20 UTC (permalink / raw)
To: Takashi Iwai
Cc: alsa-devel@alsa-project.org, Li, Jocelyn,
intel-gfx@lists.freedesktop.org, Wang Xingchao, Girdwood, Liam R,
david.henningsson@canonical.com
> -----Original Message-----
> From: Takashi Iwai [mailto:tiwai@suse.de]
> Sent: Thursday, May 23, 2013 4:10 PM
> To: Wang, Xingchao
> Cc: daniel@ffwll.ch; alsa-devel@alsa-project.org;
> intel-gfx@lists.freedesktop.org; david.henningsson@canonical.com; Girdwood,
> Liam R; Li, Jocelyn; Wang Xingchao
> Subject: Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
>
> At Thu, 23 May 2013 07:53:00 +0000,
> Wang, Xingchao wrote:
> >
> > Hi Takashi,
> >
> > > -----Original Message-----
> > > From: Takashi Iwai [mailto:tiwai@suse.de]
> > > Sent: Thursday, May 23, 2013 2:03 PM
> > > To: Wang Xingchao
> > > Cc: daniel@ffwll.ch; alsa-devel@alsa-project.org;
> > > intel-gfx@lists.freedesktop.org; david.henningsson@canonical.com;
> > > Girdwood, Liam R; Li, Jocelyn; Wang, Xingchao
> > > Subject: Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
> > >
> > > At Thu, 23 May 2013 01:04:15 +0800,
> > > Wang Xingchao wrote:
> > > >
> > > > The device can support runtime PM no matter whether it support
> > > > signal wakeup or not. For some chips like Haswell which doesnot
> > > > support PME by default, this patch let haswell Display HD-A
> > > > controller enter runtime suspend, and bring more power saving
> > > > whith power-well feature enabled.
> > > > Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
> > >
> > > This change has nothing to do with the power well fix, thus no
> > > reason to put in the series.
> >
> > But power-well feature depends on HD-A controller's power-save
> > enabling, without this patch, Power-well would not be shutdown
> > automatically, thus cause more power.
>
> Then the fix order is wrong. Fix this first, then the rest.
>
Okay, I see.
thanks
--xingchao
>
> Takashi
>
> > So I thought it should
> > be part of the patchset. Anyway it's a more general fix not only for Haswell,
> so better to leave it alone.
> > I will split it from the patchset in next version.
> >
> > Thanks
> > --xingchao
> > >
> > >
> > > Takashi
> > >
> > > > ---
> > > > sound/pci/hda/hda_intel.c | 4 ++--
> > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > > > index 54c7c22..f20a88c 100644
> > > > --- a/sound/pci/hda/hda_intel.c
> > > > +++ b/sound/pci/hda/hda_intel.c
> > > > @@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
> > > > goto out_free_power;
> > > > }
> > > >
> > > > - if (pci_dev_run_wake(pci))
> > > > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > > > pm_runtime_put_noidle(&pci->dev);
> > > >
> > > > dev++;
> > > > @@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
> > > > struct snd_card *card = pci_get_drvdata(pci);
> > > > struct azx *chip = card->private_data;
> > > >
> > > > - if (pci_dev_run_wake(pci))
> > > > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > > > pm_runtime_get_noresume(&pci->dev);
> > > >
> > > > if (card)
> > > > --
> > > > 1.8.1.2
> > > >
> >
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-22 17:04 ` [PATCH 3/4] ALSA: hda - Fix runtime PM check Wang Xingchao
2013-05-23 6:02 ` Takashi Iwai
@ 2013-05-23 12:34 ` David Henningsson
2013-05-23 12:39 ` [alsa-devel] " Takashi Iwai
1 sibling, 1 reply; 13+ messages in thread
From: David Henningsson @ 2013-05-23 12:34 UTC (permalink / raw)
To: Wang Xingchao
Cc: alsa-devel, liam.r.girdwood, tiwai, intel-gfx, xingchao.wang,
jocelyn.li, daniel
On 05/22/2013 07:04 PM, Wang Xingchao wrote:
> The device can support runtime PM no matter whether
> it support signal wakeup or not. For some chips like Haswell
> which doesnot support PME by default, this patch let haswell
> Display HD-A controller enter runtime suspend, and bring more
> power saving whith power-well feature enabled.
> Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
> ---
> sound/pci/hda/hda_intel.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 54c7c22..f20a88c 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
> goto out_free_power;
> }
>
> - if (pci_dev_run_wake(pci))
> + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
I'm not sure, but shouldn't this be
if (pci_dev_run_wake(pci) || (chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
...in order not to regress power performance of devices which have
pci_dev_run_wake(pci) but not runtime PM?
> pm_runtime_put_noidle(&pci->dev);
>
> dev++;
> @@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
> struct snd_card *card = pci_get_drvdata(pci);
> struct azx *chip = card->private_data;
>
> - if (pci_dev_run_wake(pci))
> + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> pm_runtime_get_noresume(&pci->dev);
>
> if (card)
>
--
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [alsa-devel] [PATCH 3/4] ALSA: hda - Fix runtime PM check
2013-05-23 12:34 ` David Henningsson
@ 2013-05-23 12:39 ` Takashi Iwai
0 siblings, 0 replies; 13+ messages in thread
From: Takashi Iwai @ 2013-05-23 12:39 UTC (permalink / raw)
To: David Henningsson
Cc: alsa-devel, jocelyn.li, intel-gfx, Wang Xingchao, liam.r.girdwood
At Thu, 23 May 2013 14:34:09 +0200,
David Henningsson wrote:
>
> On 05/22/2013 07:04 PM, Wang Xingchao wrote:
> > The device can support runtime PM no matter whether
> > it support signal wakeup or not. For some chips like Haswell
> > which doesnot support PME by default, this patch let haswell
> > Display HD-A controller enter runtime suspend, and bring more
> > power saving whith power-well feature enabled.
> > Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
> > ---
> > sound/pci/hda/hda_intel.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > index 54c7c22..f20a88c 100644
> > --- a/sound/pci/hda/hda_intel.c
> > +++ b/sound/pci/hda/hda_intel.c
> > @@ -3755,7 +3755,7 @@ static int azx_probe(struct pci_dev *pci,
> > goto out_free_power;
> > }
> >
> > - if (pci_dev_run_wake(pci))
> > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
>
> I'm not sure, but shouldn't this be
>
> if (pci_dev_run_wake(pci) || (chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
>
> ...in order not to regress power performance of devices which have
> pci_dev_run_wake(pci) but not runtime PM?
If driver_caps isn't set, azx_runtime_idle() returns -EBUSY,
i.e. essentially the runtime PM is disabled in that case.
Takashi
> > pm_runtime_put_noidle(&pci->dev);
> >
> > dev++;
> > @@ -3834,7 +3834,7 @@ static void azx_remove(struct pci_dev *pci)
> > struct snd_card *card = pci_get_drvdata(pci);
> > struct azx *chip = card->private_data;
> >
> > - if (pci_dev_run_wake(pci))
> > + if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
> > pm_runtime_get_noresume(&pci->dev);
> >
> > if (card)
> >
>
>
>
> --
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/4] ALSA: hda - Continue probe in work context to avoid request_module deadlock
2013-05-22 17:04 [PATCH 0/4 V5] Power-well API implementation for Haswell Wang Xingchao
` (2 preceding siblings ...)
2013-05-22 17:04 ` [PATCH 3/4] ALSA: hda - Fix runtime PM check Wang Xingchao
@ 2013-05-22 17:04 ` Wang Xingchao
2013-05-23 6:47 ` Takashi Iwai
3 siblings, 1 reply; 13+ messages in thread
From: Wang Xingchao @ 2013-05-22 17:04 UTC (permalink / raw)
To: daniel, tiwai
Cc: alsa-devel, jocelyn.li, intel-gfx, Wang Xingchao, xingchao.wang,
liam.r.girdwood, david.henningsson
There's deadlock when request_module(i915) in azx_probe.
It looks like:
device_lock(audio pci device) -> azx_probe -> module_request
(or symbol_request) -> modprobe (userspace) -> i915 init ->
drm_pci_init -> pci_register_driver -> bus_add_driver -> driver_attach ->
which in turn tries all locks on pci bus, and when it tries the one on the
audio device, it will deadlock.
This patch introduce a work to store remaining probe stuff, and let
request_module run in safe work context.
Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
---
sound/pci/hda/hda_intel.c | 105 +++++++++++++++++++++++++++-------------------
1 file changed, 62 insertions(+), 43 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f20a88c..1bc7c3b 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -76,6 +76,7 @@ static int probe_only[SNDRV_CARDS];
static int jackpoll_ms[SNDRV_CARDS];
static bool single_cmd;
static int enable_msi = -1;
+static int dev;
#ifdef CONFIG_SND_HDA_PATCH_LOADER
static char *patch[SNDRV_CARDS];
#endif
@@ -542,6 +543,8 @@ struct azx {
/* for pending irqs */
struct work_struct irq_pending_work;
+ struct delayed_work probe_work;
+
/* reboot notifier (for mysterious hangup problem at power-down) */
struct notifier_block reboot_notifier;
@@ -3670,58 +3673,22 @@ static void azx_firmware_cb(const struct firmware *fw, void *context)
}
#endif
-static int azx_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
+static void azx_probe_work(struct work_struct *work)
{
- static int dev;
- struct snd_card *card;
- struct azx *chip;
+ struct azx *chip =
+ container_of(work, struct azx, probe_work.work);
+ struct snd_card *card = chip->card;
+ struct pci_dev *pci = chip->pci;
bool probe_now;
int err;
- if (dev >= SNDRV_CARDS)
- return -ENODEV;
- if (!enable[dev]) {
- dev++;
- return -ENOENT;
- }
-
- err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
- if (err < 0) {
- snd_printk(KERN_ERR "hda-intel: Error creating card!\n");
- return err;
- }
-
- snd_card_set_dev(card, &pci->dev);
-
- err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
- if (err < 0)
- goto out_free;
- card->private_data = chip;
-
- pci_set_drvdata(pci, card);
-
- err = register_vga_switcheroo(chip);
- if (err < 0) {
- snd_printk(KERN_ERR SFX
- "%s: Error registering VGA-switcheroo client\n", pci_name(pci));
- goto out_free;
- }
-
- if (check_hdmi_disabled(pci)) {
- snd_printk(KERN_INFO SFX "%s: VGA controller is disabled\n",
- pci_name(pci));
- snd_printk(KERN_INFO SFX "%s: Delaying initialization\n", pci_name(pci));
- chip->disabled = true;
- }
-
/* Request power well for Haswell HDA controller and codec */
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
#ifdef CONFIG_SND_HDA_I915
err = hda_i915_init();
if (err < 0) {
snd_printk(KERN_ERR SFX "Error request power-well from i915\n");
- return err;
+ goto out_free;
}
hda_display_power(true);
#else
@@ -3760,7 +3727,7 @@ static int azx_probe(struct pci_dev *pci,
dev++;
complete_all(&chip->probe_wait);
- return 0;
+ return;
out_free_power:
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
hda_display_power(false);
@@ -3769,6 +3736,58 @@ out_free_power:
out_free:
snd_card_free(card);
pci_set_drvdata(pci, NULL);
+}
+
+static int azx_probe(struct pci_dev *pci,
+ const struct pci_device_id *pci_id)
+{
+ struct snd_card *card;
+ struct azx *chip;
+ int err;
+
+ if (dev >= SNDRV_CARDS)
+ return -ENODEV;
+ if (!enable[dev]) {
+ dev++;
+ return -ENOENT;
+ }
+
+ err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+ if (err < 0) {
+ snd_printk(KERN_ERR "hda-intel: Error creating card!\n");
+ return err;
+ }
+
+ snd_card_set_dev(card, &pci->dev);
+
+ err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
+ if (err < 0)
+ goto out_free;
+ card->private_data = chip;
+
+ pci_set_drvdata(pci, card);
+
+ err = register_vga_switcheroo(chip);
+ if (err < 0) {
+ snd_printk(KERN_ERR SFX
+ "%s: Error registering VGA-switcheroo client\n", pci_name(pci));
+ goto out_free;
+ }
+
+ if (check_hdmi_disabled(pci)) {
+ snd_printk(KERN_INFO SFX "%s: VGA controller is disabled\n",
+ pci_name(pci));
+ snd_printk(KERN_INFO SFX "%s: Delaying initialization\n", pci_name(pci));
+ chip->disabled = true;
+ }
+
+ /* continue probing in work context as may trigger request module */
+ INIT_DELAYED_WORK(&chip->probe_work, azx_probe_work);
+ schedule_delayed_work(&chip->probe_work, 0);
+ return 0;
+out_free:
+ snd_card_free(card);
+ pci_set_drvdata(pci, NULL);
return err;
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 4/4] ALSA: hda - Continue probe in work context to avoid request_module deadlock
2013-05-22 17:04 ` [PATCH 4/4] ALSA: hda - Continue probe in work context to avoid request_module deadlock Wang Xingchao
@ 2013-05-23 6:47 ` Takashi Iwai
0 siblings, 0 replies; 13+ messages in thread
From: Takashi Iwai @ 2013-05-23 6:47 UTC (permalink / raw)
To: Wang Xingchao
Cc: alsa-devel, jocelyn.li, intel-gfx, liam.r.girdwood,
david.henningsson
At Thu, 23 May 2013 01:04:16 +0800,
Wang Xingchao wrote:
>
> There's deadlock when request_module(i915) in azx_probe.
> It looks like:
> device_lock(audio pci device) -> azx_probe -> module_request
> (or symbol_request) -> modprobe (userspace) -> i915 init ->
> drm_pci_init -> pci_register_driver -> bus_add_driver -> driver_attach ->
> which in turn tries all locks on pci bus, and when it tries the one on the
> audio device, it will deadlock.
>
> This patch introduce a work to store remaining probe stuff, and let
> request_module run in safe work context.
The bug is introduced by your patch, so better to fold into it.
Moreover...
>
> Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
> ---
> sound/pci/hda/hda_intel.c | 105 +++++++++++++++++++++++++++-------------------
> 1 file changed, 62 insertions(+), 43 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index f20a88c..1bc7c3b 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -76,6 +76,7 @@ static int probe_only[SNDRV_CARDS];
> static int jackpoll_ms[SNDRV_CARDS];
> static bool single_cmd;
> static int enable_msi = -1;
> +static int dev;
Don't do this.
> #ifdef CONFIG_SND_HDA_PATCH_LOADER
> static char *patch[SNDRV_CARDS];
> #endif
> @@ -542,6 +543,8 @@ struct azx {
> /* for pending irqs */
> struct work_struct irq_pending_work;
>
> + struct delayed_work probe_work;
> +
> /* reboot notifier (for mysterious hangup problem at power-down) */
> struct notifier_block reboot_notifier;
>
> @@ -3670,58 +3673,22 @@ static void azx_firmware_cb(const struct firmware *fw, void *context)
> }
> #endif
>
> -static int azx_probe(struct pci_dev *pci,
> - const struct pci_device_id *pci_id)
> +static void azx_probe_work(struct work_struct *work)
> {
> - static int dev;
> - struct snd_card *card;
> - struct azx *chip;
> + struct azx *chip =
> + container_of(work, struct azx, probe_work.work);
> + struct snd_card *card = chip->card;
> + struct pci_dev *pci = chip->pci;
> bool probe_now;
> int err;
>
> - if (dev >= SNDRV_CARDS)
> - return -ENODEV;
> - if (!enable[dev]) {
> - dev++;
> - return -ENOENT;
> - }
> -
> - err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
> - if (err < 0) {
> - snd_printk(KERN_ERR "hda-intel: Error creating card!\n");
> - return err;
> - }
> -
> - snd_card_set_dev(card, &pci->dev);
> -
> - err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
> - if (err < 0)
> - goto out_free;
> - card->private_data = chip;
> -
> - pci_set_drvdata(pci, card);
> -
> - err = register_vga_switcheroo(chip);
> - if (err < 0) {
> - snd_printk(KERN_ERR SFX
> - "%s: Error registering VGA-switcheroo client\n", pci_name(pci));
> - goto out_free;
> - }
> -
> - if (check_hdmi_disabled(pci)) {
> - snd_printk(KERN_INFO SFX "%s: VGA controller is disabled\n",
> - pci_name(pci));
> - snd_printk(KERN_INFO SFX "%s: Delaying initialization\n", pci_name(pci));
> - chip->disabled = true;
> - }
> -
> /* Request power well for Haswell HDA controller and codec */
> if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
> #ifdef CONFIG_SND_HDA_I915
> err = hda_i915_init();
> if (err < 0) {
> snd_printk(KERN_ERR SFX "Error request power-well from i915\n");
> - return err;
> + goto out_free;
> }
> hda_display_power(true);
> #else
> @@ -3760,7 +3727,7 @@ static int azx_probe(struct pci_dev *pci,
>
> dev++;
> complete_all(&chip->probe_wait);
> - return 0;
> + return;
> out_free_power:
> if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
> hda_display_power(false);
> @@ -3769,6 +3736,58 @@ out_free_power:
> out_free:
> snd_card_free(card);
> pci_set_drvdata(pci, NULL);
> +}
> +
> +static int azx_probe(struct pci_dev *pci,
> + const struct pci_device_id *pci_id)
> +{
> + struct snd_card *card;
> + struct azx *chip;
> + int err;
> +
> + if (dev >= SNDRV_CARDS)
> + return -ENODEV;
> + if (!enable[dev]) {
> + dev++;
> + return -ENOENT;
> + }
> +
> + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
> + if (err < 0) {
> + snd_printk(KERN_ERR "hda-intel: Error creating card!\n");
> + return err;
> + }
> +
> + snd_card_set_dev(card, &pci->dev);
> +
> + err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
> + if (err < 0)
> + goto out_free;
> + card->private_data = chip;
> +
> + pci_set_drvdata(pci, card);
> +
> + err = register_vga_switcheroo(chip);
> + if (err < 0) {
> + snd_printk(KERN_ERR SFX
> + "%s: Error registering VGA-switcheroo client\n", pci_name(pci));
> + goto out_free;
> + }
> +
> + if (check_hdmi_disabled(pci)) {
> + snd_printk(KERN_INFO SFX "%s: VGA controller is disabled\n",
> + pci_name(pci));
> + snd_printk(KERN_INFO SFX "%s: Delaying initialization\n", pci_name(pci));
> + chip->disabled = true;
> + }
> +
> + /* continue probing in work context as may trigger request module */
> + INIT_DELAYED_WORK(&chip->probe_work, azx_probe_work);
The initialization must be done earlier, in azx_create().
> + schedule_delayed_work(&chip->probe_work, 0);
You shouldn't do async probe unless needed.
That is, this is required only for Haswell.
Also, if you delay the call of hda_i915_init(), you need to have a
flag to indicate whether this initialization has been done, and call
the counterpart in azx_free() only if the flag is set. Otherwise, you
might call hda_i915_exit() & co even before calling hda_i915_init().
Another point to fix is to make sure to cancel the leftover work in
destructor.
Last not but least, I guess the call of pm_runtime_put_noidle() in
azx_probe() might be problematic. In theory it allows the runtime
suspend before hda_i915_init() is done.
Maybe we should move pm_runtime_put_noidle() into
azx_probe_continue(). And put the counterpart to azx_free()
conditionally called with chip->running, or so.
But, this doesn't exclude the explicit suspend/resume -- you are
calling hda_display_power() and this might be also before the actual
initialization. Again, this must be conditional, too.
Takashi
> + return 0;
> +out_free:
> + snd_card_free(card);
> + pci_set_drvdata(pci, NULL);
> return err;
> }
^ permalink raw reply [flat|nested] 13+ messages in thread