kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vga_switcheroo: make power switch handler optional

Browse source 
At least on the nvidia mux the power switch seems to be executed
by the ACPI PS0/PS3 methods so need to do it explicitly.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2010-12-06 12:31:50 +10:00
parent 6c2df40ec0
commit 5cfb3c3a10
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/vga/vga_switcheroo.c
View file

@ -191,9 +191,8 @@ static int vga_switcheroo_debugfs_open(struct inode *inode, struct file *file)
static int vga_switchon(struct vga_switcheroo_client *client) static int vga_switchon(struct vga_switcheroo_client *client)
{ {
int ret; if (vgasr_priv.handler->power_state)
vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_ON);
ret = vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_ON);
/* call the driver callback to turn on device */ /* call the driver callback to turn on device */
client->set_gpu_state(client->pdev, VGA_SWITCHEROO_ON); client->set_gpu_state(client->pdev, VGA_SWITCHEROO_ON);
client->pwr_state = VGA_SWITCHEROO_ON; client->pwr_state = VGA_SWITCHEROO_ON;
@ -204,7 +203,8 @@ static int vga_switchoff(struct vga_switcheroo_client *client)
{ {
/* call the driver callback to turn off device */ /* call the driver callback to turn off device */
client->set_gpu_state(client->pdev, VGA_SWITCHEROO_OFF); client->set_gpu_state(client->pdev, VGA_SWITCHEROO_OFF);
vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_OFF); if (vgasr_priv.handler->power_state)
vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_OFF);
client->pwr_state = VGA_SWITCHEROO_OFF; client->pwr_state = VGA_SWITCHEROO_OFF;
return 0; return 0;
} }