D17772.id49812.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17772.id49812.diff
View Options

	Index: sys/dev/sound/pci/hda/hdaa.h
	===================================================================
	--- sys/dev/sound/pci/hda/hdaa.h
	+++ sys/dev/sound/pci/hda/hdaa.h
	@@ -214,6 +214,7 @@
	struct hdaa_chan *chans;
	struct callout poll_jack;
	int poll_ival;
	+ uint32_t init_clear;
	};

	#define HDAA_CHN_RUNNING 0x00000001
	Index: sys/dev/sound/pci/hda/hdaa.c
	===================================================================
	--- sys/dev/sound/pci/hda/hdaa.c
	+++ sys/dev/sound/pci/hda/hdaa.c
	@@ -5034,11 +5034,13 @@
	pincap = w->wclass.pin.cap;

	/* Disable everything. */
	- w->wclass.pin.ctrl &= ~(
	- HDA_CMD_SET_PIN_WIDGET_CTRL_HPHN_ENABLE \|
	- HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE \|
	- HDA_CMD_SET_PIN_WIDGET_CTRL_IN_ENABLE \|
	- HDA_CMD_SET_PIN_WIDGET_CTRL_VREF_ENABLE_MASK);
	+ if (devinfo->init_clear) {
	+ w->wclass.pin.ctrl &= ~(
	+ HDA_CMD_SET_PIN_WIDGET_CTRL_HPHN_ENABLE \|
	+ HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE \|
	+ HDA_CMD_SET_PIN_WIDGET_CTRL_IN_ENABLE \|
	+ HDA_CMD_SET_PIN_WIDGET_CTRL_VREF_ENABLE_MASK);
	+ }

	if (w->enable == 0) {
	/* Pin is unused so left it disabled. */
	@@ -6671,6 +6673,10 @@
	SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
	"reconfig", CTLTYPE_INT \| CTLFLAG_RW,
	dev, 0, hdaa_sysctl_reconfig, "I", "Reprocess configuration");
	+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
	+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
	+ "init_clear", CTLFLAG_RW,
	+ &devinfo->init_clear, 1,"Clear initial pin widget configuration");
	bus_generic_attach(dev);
	return (0);
	}