[PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Takashi Iwai]

Hi,

this is a series of patches to fix the regressions of HD-audio HDMI
on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.

The first patch adds a new helper function to vga-switcheroo and the
second just uses that instead of an open code.

Dave, if the first patch is OK, I'm going to apply it though sound tree.
Let me know if any problem is found.

Joerg, could you check whether this doesn't break your setup, too?


thanks,

Takashi

[PATCH 1/2] vga_switcheroo: Add a helper function to get the client state

[Takashi Iwai]

Add vga_switcheroo_get_client_state() to get the current state of the
client.  This is necessary to determine the proper initial state of
audio clients in HD-audio driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/gpu/vga/vga_switcheroo.c |   13 +++++++++++++
 include/linux/vga_switcheroo.h   |    9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 38f9534..eb4f64f 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -190,6 +190,19 @@ find_active_client(struct list_head *head)
 	return NULL;
 }
 
+int vga_switcheroo_get_client_state(struct pci_dev *pdev)
+{
+	struct vga_switcheroo_client *client;
+
+	client = find_client_from_pci(&vgasr_priv.clients, pdev);
+	if (!client)
+		return VGA_SWITCHEROO_NOT_FOUND;
+	if (!vgasr_priv.active)
+		return VGA_SWITCHEROO_INIT;
+	return client->pwr_state;
+}
+EXPORT_SYMBOL(vga_switcheroo_get_client_state);
+
 void vga_switcheroo_unregister_client(struct pci_dev *pdev)
 {
 	struct vga_switcheroo_client *client;
diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index b455c7c..661fb7a 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -12,6 +12,9 @@
 enum vga_switcheroo_state {
 	VGA_SWITCHEROO_OFF,
 	VGA_SWITCHEROO_ON,
+	/* below are referred only from vga_switcheroo_get_client_state() */
+	VGA_SWITCHEROO_INIT,
+	VGA_SWITCHEROO_NOT_FOUND,
 };
 
 enum vga_switcheroo_client_id {
@@ -50,6 +53,8 @@ void vga_switcheroo_unregister_handler(void);
 
 int vga_switcheroo_process_delayed_switch(void);
 
+int vga_switcheroo_get_client_state(struct pci_dev *dev);
+
 #else
 
 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
@@ -62,5 +67,9 @@ static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
 	int id, bool active) { return 0; }
 static inline void vga_switcheroo_unregister_handler(void) {}
 static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
+static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) {
+	return VGA_SWITCHEROO_CLIENT_ON;
+}
+
 
 #endif
-- 
1.7.10.4

[PATCH 2/2] ALSA: hda - Fix uninitialized HDMI controllers with VGA-switcheroo

[Takashi Iwai]

When VGA-switcheroo is built in but unused on systems with multiple
graphics cards, the initializations of non-default graphics cards are
skipped and never enabled (because the switcheroo is activated only
when the controller supports).  The current behavior is for avoiding
the system lockup by accessing the disabled GPU, but due to the recent
change in VGA-switcheroo, it determines the state simply by checking
with the default VGA device.  This is the culprit.

Now with the new vga_switcheroo_get_client_state(), we can know the
initial state of the bound GPU, thus can determine the initial audio
client state more correctly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/hda_intel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2b6392b..5f0375f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2670,7 +2670,7 @@ static bool __devinit check_hdmi_disabled(struct pci_dev *pci)
 	struct pci_dev *p = get_bound_vga(pci);
 
 	if (p) {
-		if (vga_default_device() && p != vga_default_device())
+		if (vga_switcheroo_get_client_state(p) == VGA_SWITCHEROO_OFF)
 			vga_inactive = true;
 		pci_dev_put(p);
 	}
-- 
1.7.10.4

Re: [PATCH 1/2] vga_switcheroo: Add a helper function to get the client state

[Dave Airlie]

On Thu, Jun 7, 2012 at 11:15 AM, Takashi Iwai <tiwai@suse.de> wrote:
> Add vga_switcheroo_get_client_state() to get the current state of the
> client.  This is necessary to determine the proper initial state of
> audio clients in HD-audio driver.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Acked-by: Dave Airlie <airlied@redhat.com>

Feel free to merge it via sound tree.

Dave.

Re: [PATCH 1/2] vga_switcheroo: Add a helper function to get the client state

[Takashi Iwai]

At Fri, 8 Jun 2012 09:42:58 +0100,
Dave Airlie wrote:
> 
> On Thu, Jun 7, 2012 at 11:15 AM, Takashi Iwai <tiwai@suse.de> wrote:
> > Add vga_switcheroo_get_client_state() to get the current state of the
> > client.  This is necessary to determine the proper initial state of
> > audio clients in HD-audio driver.
> >
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> 
> Acked-by: Dave Airlie <airlied@redhat.com>
> 
> Feel free to merge it via sound tree.

Thanks!


Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Jörg-Volker Peetz]

Takashi Iwai wrote, on 06/07/12 12:15:
> Hi,
> 
> this is a series of patches to fix the regressions of HD-audio HDMI
> on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.
> 
> The first patch adds a new helper function to vga-switcheroo and the
> second just uses that instead of an open code.
> 
> Dave, if the first patch is OK, I'm going to apply it though sound tree.
> Let me know if any problem is found.
> 
> Joerg, could you check whether this doesn't break your setup, too?
> 
> 
> thanks,
> 
> Takashi

Hello Takashi,

I applied both your patches on 3.5-rc1. With this kernel I made three tests.
1) After booting I switched off the discrete GPU via vga_switcheroo.
   Then ca. 210 times the message

     hda-intel: spurious response 0x0:0x0, last cmd=0x170503

   appears on the console and in the logs.
   Starting X and using the built-in USB web-cam work, as well as sound with
   mplayer2 works.

2) After booting I switched to the discrete GPU via

     echo -n DDIS > /sys/kernel/debugfs/vgaswitcheroo/switch

   Then I started X via startx. The desktop screen appears but the system
   freezes. No reaction on keyboard or touchpad input. The computer is not
   reachable via ethernet wire.

3) After booting the machine freezes (hard-lock) when trying to switch to
   dynamic power mangement on the integrated GPU via

     echo -n dynpm > /sys/class/drm/card0/device/power_method

  at least two trace calls are done. On the console only the last two lines of
  one call trace and the last one are visible (machine is frozen). It says
  (typed by hand, therefore, not complete):

...
---[ end trace a926a4156be75305 ]---
BUG: unable to handle kernel paging request at fffffffffffffff8
IP: [<ffffffff81045097>] kthread_data+0x7/0x10
PGD 1585067 PUD 1586067 PMD 0
Oops: 0000 [#2] SMP
CPU 1

...

Call Trace:
[< ... >] ? wq_worker_sleeping+0x8/0x80
   ...    ? __schedule+0x363/0x520
   ...    ? do_exit+0x552/0x850
   ...    ? oops_end+0x67/0x90
   ...    ? no_context+0x24e/0x279
   ...    ? do_page_fault+0x2bb/0x460

...
---[ end trace a926a4156be75305 ]---
Fixing recursive fault but reboot is needed!

-- 
Best regards,
Jörg-Volker.

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Takashi Iwai]

At Fri, 08 Jun 2012 13:26:57 +0200,
Jörg-Volker Peetz wrote:
> 
> Takashi Iwai wrote, on 06/07/12 12:15:
> > Hi,
> > 
> > this is a series of patches to fix the regressions of HD-audio HDMI
> > on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.
> > 
> > The first patch adds a new helper function to vga-switcheroo and the
> > second just uses that instead of an open code.
> > 
> > Dave, if the first patch is OK, I'm going to apply it though sound tree.
> > Let me know if any problem is found.
> > 
> > Joerg, could you check whether this doesn't break your setup, too?
> > 
> > 
> > thanks,
> > 
> > Takashi
> 
> Hello Takashi,
> 
> I applied both your patches on 3.5-rc1. With this kernel I made three tests.
> 1) After booting I switched off the discrete GPU via vga_switcheroo.
>    Then ca. 210 times the message
> 
>      hda-intel: spurious response 0x0:0x0, last cmd=0x170503
> 
>    appears on the console and in the logs.
>    Starting X and using the built-in USB web-cam work, as well as sound with
>    mplayer2 works.
> 
> 2) After booting I switched to the discrete GPU via
> 
>      echo -n DDIS > /sys/kernel/debugfs/vgaswitcheroo/switch
> 
>    Then I started X via startx. The desktop screen appears but the system
>    freezes. No reaction on keyboard or touchpad input. The computer is not
>    reachable via ethernet wire.

Hm, these issues aren't seen on 3.5-rc1 before my patches?
If so, we need to fix now.

> 
> 3) After booting the machine freezes (hard-lock) when trying to switch to
>    dynamic power mangement on the integrated GPU via
> 
>      echo -n dynpm > /sys/class/drm/card0/device/power_method
> 
>   at least two trace calls are done. On the console only the last two lines of
>   one call trace and the last one are visible (machine is frozen). It says
>   (typed by hand, therefore, not complete):

This is an irrelevant issue with my patches.


thanks,

Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Jörg-Volker Peetz]

Hello Takashi,

Takashi Iwai wrote, on 06/08/12 15:03:
> At Fri, 08 Jun 2012 13:26:57 +0200,
> Jörg-Volker Peetz wrote:
>>
>> Takashi Iwai wrote, on 06/07/12 12:15:
>>> Hi,
>>>
>>> this is a series of patches to fix the regressions of HD-audio HDMI
>>> on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.
>>>
>>> The first patch adds a new helper function to vga-switcheroo and the
>>> second just uses that instead of an open code.
>>>
>>> Dave, if the first patch is OK, I'm going to apply it though sound tree.
>>> Let me know if any problem is found.
>>>
>>> Joerg, could you check whether this doesn't break your setup, too?
>>>
>>>
>>> thanks,
>>>
>>> Takashi
>>
>> Hello Takashi,
>>
>> I applied both your patches on 3.5-rc1. With this kernel I made three tests.
>> 1) After booting I switched off the discrete GPU via vga_switcheroo.
>>    Then ca. 210 times the message
>>
>>      hda-intel: spurious response 0x0:0x0, last cmd=0x170503
>>
>>    appears on the console and in the logs.
>>    Starting X and using the built-in USB web-cam work, as well as sound with
>>    mplayer2 works.
>>
>> 2) After booting I switched to the discrete GPU via
>>
>>      echo -n DDIS > /sys/kernel/debugfs/vgaswitcheroo/switch
>>
>>    Then I started X via startx. The desktop screen appears but the system
>>    freezes. No reaction on keyboard or touchpad input. The computer is not
>>    reachable via ethernet wire.
> 
> Hm, these issues aren't seen on 3.5-rc1 before my patches?
> If so, we need to fix now.
> 
No, these issues aren't seen on 3.5-rc1 without your patches. I'm able to start
X with the discrete GPU in use, direct rendering and the built-in USB camera work.
Probably unrelated: in both cases I'm unable to lower the screen brightness from
highest value. Without your patches it appears a warning:

  ACPI Warning: _BQC returned an invalid level (20120320/video-472)


>>
>> 3) After booting the machine freezes (hard-lock) when trying to switch to
>>    dynamic power mangement on the integrated GPU via
>>
>>      echo -n dynpm > /sys/class/drm/card0/device/power_method
>>
>>   at least two trace calls are done. On the console only the last two lines of
>>   one call trace and the last one are visible (machine is frozen). It says
>>   (typed by hand, therefore, not complete):
> 
> This is an irrelevant issue with my patches.
> 
> 
> thanks,
> 
> Takashi

-- 
Best regards,
Jörg-Volker.

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Takashi Iwai]

At Fri, 08 Jun 2012 17:45:17 +0200,
Jörg-Volker Peetz wrote:
> 
> Hello Takashi,
> 
> Takashi Iwai wrote, on 06/08/12 15:03:
> > At Fri, 08 Jun 2012 13:26:57 +0200,
> > Jörg-Volker Peetz wrote:
> >>
> >> Takashi Iwai wrote, on 06/07/12 12:15:
> >>> Hi,
> >>>
> >>> this is a series of patches to fix the regressions of HD-audio HDMI
> >>> on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.
> >>>
> >>> The first patch adds a new helper function to vga-switcheroo and the
> >>> second just uses that instead of an open code.
> >>>
> >>> Dave, if the first patch is OK, I'm going to apply it though sound tree.
> >>> Let me know if any problem is found.
> >>>
> >>> Joerg, could you check whether this doesn't break your setup, too?
> >>>
> >>>
> >>> thanks,
> >>>
> >>> Takashi
> >>
> >> Hello Takashi,
> >>
> >> I applied both your patches on 3.5-rc1. With this kernel I made three tests.
> >> 1) After booting I switched off the discrete GPU via vga_switcheroo.
> >>    Then ca. 210 times the message
> >>
> >>      hda-intel: spurious response 0x0:0x0, last cmd=0x170503
> >>
> >>    appears on the console and in the logs.
> >>    Starting X and using the built-in USB web-cam work, as well as sound with
> >>    mplayer2 works.
> >>
> >> 2) After booting I switched to the discrete GPU via
> >>
> >>      echo -n DDIS > /sys/kernel/debugfs/vgaswitcheroo/switch
> >>
> >>    Then I started X via startx. The desktop screen appears but the system
> >>    freezes. No reaction on keyboard or touchpad input. The computer is not
> >>    reachable via ethernet wire.
> > 
> > Hm, these issues aren't seen on 3.5-rc1 before my patches?
> > If so, we need to fix now.
> > 
> No, these issues aren't seen on 3.5-rc1 without your patches. I'm able to start
> X with the discrete GPU in use, direct rendering and the built-in USB camera work.

OK, it means that the switching from the audio-ON to audio-OFF doesn't
work.  Could you try the patch below in additon?

> Probably unrelated: in both cases I'm unable to lower the screen brightness from
> highest value. Without your patches it appears a warning:
> 
>   ACPI Warning: _BQC returned an invalid level (20120320/video-472)

Hmm, I see no relation between this and the HDMI audio part.
It's of course possible that some non-working state gives
side-effects...


thanks,

Takashi

---
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index eb4f64f..5b3c7d1 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -304,8 +304,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
 		vga_switchon(new_client);
 
 	vga_set_default_device(new_client->pdev);
-	set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
-
 	return 0;
 }
 
@@ -321,6 +319,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 
 	active->active = false;
 
+	set_audio_state(active->id, VGA_SWITCHEROO_OFF);
+
 	if (new_client->fb_info) {
 		struct fb_event event;
 		event.info = new_client->fb_info;
@@ -334,11 +334,11 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 	if (new_client->ops->reprobe)
 		new_client->ops->reprobe(new_client->pdev);
 
-	set_audio_state(active->id, VGA_SWITCHEROO_OFF);
-
 	if (active->pwr_state == VGA_SWITCHEROO_ON)
 		vga_switchoff(active);
 
+	set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
+
 	new_client->active = true;
 	return 0;
 }
@@ -384,8 +384,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 	/* pwr off the device not in use */
 	if (strncmp(usercmd, "OFF", 3) == 0) {
 		list_for_each_entry(client, &vgasr_priv.clients, list) {
-			if (client->active)
+			if (client->active || client_is_audio(client))
 				continue;
+			set_audio_state(client->id, VGA_SWITCHEROO_OFF);
 			if (client->pwr_state == VGA_SWITCHEROO_ON)
 				vga_switchoff(client);
 		}
@@ -394,10 +395,11 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 	/* pwr on the device not in use */
 	if (strncmp(usercmd, "ON", 2) == 0) {
 		list_for_each_entry(client, &vgasr_priv.clients, list) {
-			if (client->active)
+			if (client->active || client_is_audio(client))
 				continue;
 			if (client->pwr_state == VGA_SWITCHEROO_OFF)
 				vga_switchon(client);
+			set_audio_state(client->id, VGA_SWITCHEROO_ON);
 		}
 		goto out;
 	}
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Jörg-Volker Peetz]

Takashi Iwai wrote, on 06/08/12 17:52:
> At Fri, 08 Jun 2012 17:45:17 +0200,
> Jörg-Volker Peetz wrote:
>>
>> Hello Takashi,
>>
>> Takashi Iwai wrote, on 06/08/12 15:03:
>>> At Fri, 08 Jun 2012 13:26:57 +0200,
>>> Jörg-Volker Peetz wrote:
>>>>
>>>> Takashi Iwai wrote, on 06/07/12 12:15:
>>>>> Hi,
>>>>>
>>>>> this is a series of patches to fix the regressions of HD-audio HDMI
>>>>> on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.
>>>>>
>>>>> The first patch adds a new helper function to vga-switcheroo and the
>>>>> second just uses that instead of an open code.
>>>>>
>>>>> Dave, if the first patch is OK, I'm going to apply it though sound tree.
>>>>> Let me know if any problem is found.
>>>>>
>>>>> Joerg, could you check whether this doesn't break your setup, too?
>>>>>
>>>>>
>>>>> thanks,
>>>>>
>>>>> Takashi
>>>>
>>>> Hello Takashi,
>>>>
>>>> I applied both your patches on 3.5-rc1. With this kernel I made three tests.
>>>> 1) After booting I switched off the discrete GPU via vga_switcheroo.
>>>>    Then ca. 210 times the message
>>>>
>>>>      hda-intel: spurious response 0x0:0x0, last cmd=0x170503
>>>>
>>>>    appears on the console and in the logs.
>>>>    Starting X and using the built-in USB web-cam work, as well as sound with
>>>>    mplayer2 works.
>>>>
>>>> 2) After booting I switched to the discrete GPU via
>>>>
>>>>      echo -n DDIS > /sys/kernel/debugfs/vgaswitcheroo/switch
>>>>
>>>>    Then I started X via startx. The desktop screen appears but the system
>>>>    freezes. No reaction on keyboard or touchpad input. The computer is not
>>>>    reachable via ethernet wire.
>>>
>>> Hm, these issues aren't seen on 3.5-rc1 before my patches?
>>> If so, we need to fix now.
>>>
>> No, these issues aren't seen on 3.5-rc1 without your patches. I'm able to start
>> X with the discrete GPU in use, direct rendering and the built-in USB camera work.
> 
> OK, it means that the switching from the audio-ON to audio-OFF doesn't
> work.  Could you try the patch below in additon?
> 

Applying all your three patches on 3.5-rc1 makes the discrete GPU work on my
system: after mounting debugfs and switching to "DDIS", I can start X and direct
rendering, sound and built-in USB camera work.

By the way, writing "DDIS" to /sys/kernel/debugfs/vgaswitcheroo switches off the
integrated GPU. That's the reason for loosing the control over the screen
brightness. Switching on also the integrated GPU (writing "ON" to
/sys/kernel/debugfs/vgaswitcheroo) enables the brightness control of the screen.
Of course for the energy consumption this is awkward.
I write all this as information about the state of vga_switcheroo for David.

Many thanks to you and David for all your work.

>> Probably unrelated: in both cases I'm unable to lower the screen brightness from
>> highest value. Without your patches it appears a warning:
>>
>>   ACPI Warning: _BQC returned an invalid level (20120320/video-472)
> 
> Hmm, I see no relation between this and the HDMI audio part.
> It's of course possible that some non-working state gives
> side-effects...
> 
> 
> thanks,
> 
> Takashi
> 
<snip>
-- 
Best regards,
Jörg-Volker.

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Takashi Iwai]

At Fri, 08 Jun 2012 22:17:29 +0200,
Jörg-Volker Peetz wrote:
> 
> Takashi Iwai wrote, on 06/08/12 17:52:
> > At Fri, 08 Jun 2012 17:45:17 +0200,
> > Jörg-Volker Peetz wrote:
> >>
> >> Hello Takashi,
> >>
> >> Takashi Iwai wrote, on 06/08/12 15:03:
> >>> At Fri, 08 Jun 2012 13:26:57 +0200,
> >>> Jörg-Volker Peetz wrote:
> >>>>
> >>>> Takashi Iwai wrote, on 06/07/12 12:15:
> >>>>> Hi,
> >>>>>
> >>>>> this is a series of patches to fix the regressions of HD-audio HDMI
> >>>>> on D-GPUs in 3.5-rc1 due to the support of VGA-switcheroo audio clients.
> >>>>>
> >>>>> The first patch adds a new helper function to vga-switcheroo and the
> >>>>> second just uses that instead of an open code.
> >>>>>
> >>>>> Dave, if the first patch is OK, I'm going to apply it though sound tree.
> >>>>> Let me know if any problem is found.
> >>>>>
> >>>>> Joerg, could you check whether this doesn't break your setup, too?
> >>>>>
> >>>>>
> >>>>> thanks,
> >>>>>
> >>>>> Takashi
> >>>>
> >>>> Hello Takashi,
> >>>>
> >>>> I applied both your patches on 3.5-rc1. With this kernel I made three tests.
> >>>> 1) After booting I switched off the discrete GPU via vga_switcheroo.
> >>>>    Then ca. 210 times the message
> >>>>
> >>>>      hda-intel: spurious response 0x0:0x0, last cmd=0x170503
> >>>>
> >>>>    appears on the console and in the logs.
> >>>>    Starting X and using the built-in USB web-cam work, as well as sound with
> >>>>    mplayer2 works.
> >>>>
> >>>> 2) After booting I switched to the discrete GPU via
> >>>>
> >>>>      echo -n DDIS > /sys/kernel/debugfs/vgaswitcheroo/switch
> >>>>
> >>>>    Then I started X via startx. The desktop screen appears but the system
> >>>>    freezes. No reaction on keyboard or touchpad input. The computer is not
> >>>>    reachable via ethernet wire.
> >>>
> >>> Hm, these issues aren't seen on 3.5-rc1 before my patches?
> >>> If so, we need to fix now.
> >>>
> >> No, these issues aren't seen on 3.5-rc1 without your patches. I'm able to start
> >> X with the discrete GPU in use, direct rendering and the built-in USB camera work.
> > 
> > OK, it means that the switching from the audio-ON to audio-OFF doesn't
> > work.  Could you try the patch below in additon?
> > 
> 
> Applying all your three patches on 3.5-rc1 makes the discrete GPU work on my
> system: after mounting debugfs and switching to "DDIS", I can start X and direct
> rendering, sound and built-in USB camera work.

Good to hear.
Dave, is it OK to apply the patch below through sound tree?


thanks,

Takashi

---
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] vga_switcheroo: Enable/disable audio clients at the right time

The audio clients have to be disabled before disabling the VGA and
switching.  Similarly, enabling the audio client should be done at
last.  Otherwise the audio-side operation stalls, eventually leading
to Oops or lockups.

Tested-by: Jörg-Volker Peetz <jvpeetz@web.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/gpu/vga/vga_switcheroo.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 38f9534..e24ad99 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -291,8 +291,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
 		vga_switchon(new_client);
 
 	vga_set_default_device(new_client->pdev);
-	set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
-
 	return 0;
 }
 
@@ -308,6 +306,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 
 	active->active = false;
 
+	set_audio_state(active->id, VGA_SWITCHEROO_OFF);
+
 	if (new_client->fb_info) {
 		struct fb_event event;
 		event.info = new_client->fb_info;
@@ -321,11 +321,11 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 	if (new_client->ops->reprobe)
 		new_client->ops->reprobe(new_client->pdev);
 
-	set_audio_state(active->id, VGA_SWITCHEROO_OFF);
-
 	if (active->pwr_state == VGA_SWITCHEROO_ON)
 		vga_switchoff(active);
 
+	set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
+
 	new_client->active = true;
 	return 0;
 }
@@ -371,8 +371,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 	/* pwr off the device not in use */
 	if (strncmp(usercmd, "OFF", 3) == 0) {
 		list_for_each_entry(client, &vgasr_priv.clients, list) {
-			if (client->active)
+			if (client->active || client_is_audio(client))
 				continue;
+			set_audio_state(client->id, VGA_SWITCHEROO_OFF);
 			if (client->pwr_state == VGA_SWITCHEROO_ON)
 				vga_switchoff(client);
 		}
@@ -381,10 +382,11 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 	/* pwr on the device not in use */
 	if (strncmp(usercmd, "ON", 2) == 0) {
 		list_for_each_entry(client, &vgasr_priv.clients, list) {
-			if (client->active)
+			if (client->active || client_is_audio(client))
 				continue;
 			if (client->pwr_state == VGA_SWITCHEROO_OFF)
 				vga_switchon(client);
+			set_audio_state(client->id, VGA_SWITCHEROO_ON);
 		}
 		goto out;
 	}
-- 
1.7.10.4

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [alsa-devel] [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Dave Airlie]

> Good to hear.
> Dave, is it OK to apply the patch below through sound tree?

ack below,
>
>
> thanks,
>
> Takashi
>
> ---
> From: Takashi Iwai <tiwai@suse.de>
> Subject: [PATCH] vga_switcheroo: Enable/disable audio clients at the right time
>
> The audio clients have to be disabled before disabling the VGA and
> switching.  Similarly, enabling the audio client should be done at
> last.  Otherwise the audio-side operation stalls, eventually leading
> to Oops or lockups.
>
> Tested-by: Jörg-Volker Peetz <jvpeetz@web.de>

Acked-by: Dave Airlie <airlied@redhat.com>

> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  drivers/gpu/vga/vga_switcheroo.c |   14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
> index 38f9534..e24ad99 100644
> --- a/drivers/gpu/vga/vga_switcheroo.c
> +++ b/drivers/gpu/vga/vga_switcheroo.c
> @@ -291,8 +291,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
>                vga_switchon(new_client);
>
>        vga_set_default_device(new_client->pdev);
> -       set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
> -
>        return 0;
>  }
>
> @@ -308,6 +306,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
>
>        active->active = false;
>
> +       set_audio_state(active->id, VGA_SWITCHEROO_OFF);
> +
>        if (new_client->fb_info) {
>                struct fb_event event;
>                event.info = new_client->fb_info;
> @@ -321,11 +321,11 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
>        if (new_client->ops->reprobe)
>                new_client->ops->reprobe(new_client->pdev);
>
> -       set_audio_state(active->id, VGA_SWITCHEROO_OFF);
> -
>        if (active->pwr_state == VGA_SWITCHEROO_ON)
>                vga_switchoff(active);
>
> +       set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
> +
>        new_client->active = true;
>        return 0;
>  }
> @@ -371,8 +371,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
>        /* pwr off the device not in use */
>        if (strncmp(usercmd, "OFF", 3) == 0) {
>                list_for_each_entry(client, &vgasr_priv.clients, list) {
> -                       if (client->active)
> +                       if (client->active || client_is_audio(client))
>                                continue;
> +                       set_audio_state(client->id, VGA_SWITCHEROO_OFF);
>                        if (client->pwr_state == VGA_SWITCHEROO_ON)
>                                vga_switchoff(client);
>                }
> @@ -381,10 +382,11 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
>        /* pwr on the device not in use */
>        if (strncmp(usercmd, "ON", 2) == 0) {
>                list_for_each_entry(client, &vgasr_priv.clients, list) {
> -                       if (client->active)
> +                       if (client->active || client_is_audio(client))
>                                continue;
>                        if (client->pwr_state == VGA_SWITCHEROO_OFF)
>                                vga_switchon(client);
> +                       set_audio_state(client->id, VGA_SWITCHEROO_ON);
>                }
>                goto out;
>        }
> --
> 1.7.10.4
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 0/2] HD-audio HDMI regression fixes with VGA-switcheroo

[Takashi Iwai]

At Sat, 9 Jun 2012 08:57:20 +0100,
Dave Airlie wrote:
> 
> > Good to hear.
> > Dave, is it OK to apply the patch below through sound tree?
> 
> ack below,
> >
> >
> > thanks,
> >
> > Takashi
> >
> > ---
> > From: Takashi Iwai <tiwai@suse.de>
> > Subject: [PATCH] vga_switcheroo: Enable/disable audio clients at the right time
> >
> > The audio clients have to be disabled before disabling the VGA and
> > switching.  Similarly, enabling the audio client should be done at
> > last.  Otherwise the audio-side operation stalls, eventually leading
> > to Oops or lockups.
> >
> > Tested-by: Jörg-Volker Peetz <jvpeetz@web.de>
> 
> Acked-by: Dave Airlie <airlied@redhat.com>

Thanks!


Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel