hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Iwai 2012-06-09 08:46:42 +02:00
parent 8393ec4a13
commit c91c3faea5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/vga/vga_switcheroo.c
View File

@ -304,8 +304,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
vga_switchon(new_client); vga_switchon(new_client);
vga_set_default_device(new_client->pdev); vga_set_default_device(new_client->pdev);
set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
return 0; return 0;
} }
@ -321,6 +319,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
active->active = false; active->active = false;
set_audio_state(active->id, VGA_SWITCHEROO_OFF);
if (new_client->fb_info) { if (new_client->fb_info) {
struct fb_event event; struct fb_event event;
event.info = new_client->fb_info; 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) if (new_client->ops->reprobe)
new_client->ops->reprobe(new_client->pdev); new_client->ops->reprobe(new_client->pdev);
set_audio_state(active->id, VGA_SWITCHEROO_OFF);
if (active->pwr_state == VGA_SWITCHEROO_ON) if (active->pwr_state == VGA_SWITCHEROO_ON)
vga_switchoff(active); vga_switchoff(active);
set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
new_client->active = true; new_client->active = true;
return 0; return 0;
} }
@ -384,8 +384,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
/* pwr off the device not in use */ /* pwr off the device not in use */
if (strncmp(usercmd, "OFF", 3) == 0) { if (strncmp(usercmd, "OFF", 3) == 0) {
list_for_each_entry(client, &vgasr_priv.clients, list) { list_for_each_entry(client, &vgasr_priv.clients, list) {
if (client->active) if (client->active || client_is_audio(client))
continue; continue;
set_audio_state(client->id, VGA_SWITCHEROO_OFF);
if (client->pwr_state == VGA_SWITCHEROO_ON) if (client->pwr_state == VGA_SWITCHEROO_ON)
vga_switchoff(client); 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 */ /* pwr on the device not in use */
if (strncmp(usercmd, "ON", 2) == 0) { if (strncmp(usercmd, "ON", 2) == 0) {
list_for_each_entry(client, &vgasr_priv.clients, list) { list_for_each_entry(client, &vgasr_priv.clients, list) {
if (client->active) if (client->active || client_is_audio(client))
continue; continue;
if (client->pwr_state == VGA_SWITCHEROO_OFF) if (client->pwr_state == VGA_SWITCHEROO_OFF)
vga_switchon(client); vga_switchon(client);
set_audio_state(client->id, VGA_SWITCHEROO_ON);
} }
goto out; goto out;
} }