Skip to content

Commit

Permalink
vga_switcheroo: Add the support for audio clients
Browse files Browse the repository at this point in the history 
Add the support for audio clients to VGA-switcheroo for handling the
HDMI audio controller together with VGA switching.  The id of the
audio controller should be given explicitly at registration time
unlike the video controller.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43155

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed May 13, 2012
1 parent 26ec685 commit 3e9e63d
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 14 deletions.
70 changes: 56 additions & 14 deletions drivers/gpu/vga/vga_switcheroo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ struct vgasr_priv {
struct vga_switcheroo_handler *handler;
};

#define ID_BIT_AUDIO 0x100
#define client_is_audio(c) ((c)->id & ID_BIT_AUDIO)
#define client_is_vga(c) ((c)->id == -1 || !client_is_audio(c))
#define client_id(c) ((c)->id & ~ID_BIT_AUDIO)

static int vga_switcheroo_debugfs_init(struct vgasr_priv *priv);
static void vga_switcheroo_debugfs_fini(struct vgasr_priv *priv);

Expand Down Expand Up @@ -96,6 +101,8 @@ static void vga_switcheroo_enable(void)
vgasr_priv.handler->init();

list_for_each_entry(client, &vgasr_priv.clients, list) {
if (client->id != -1)
continue;
ret = vgasr_priv.handler->get_client_id(client->pdev);
if (ret < 0)
return;
Expand All @@ -106,8 +113,9 @@ static void vga_switcheroo_enable(void)
vgasr_priv.active = true;
}

int vga_switcheroo_register_client(struct pci_dev *pdev,
const struct vga_switcheroo_client_ops *ops)
static int register_client(struct pci_dev *pdev,
const struct vga_switcheroo_client_ops *ops,
int id, bool active)
{
struct vga_switcheroo_client *client;

Expand All @@ -118,24 +126,40 @@ int vga_switcheroo_register_client(struct pci_dev *pdev,
client->pwr_state = VGA_SWITCHEROO_ON;
client->pdev = pdev;
client->ops = ops;
client->id = -1;
if (pdev == vga_default_device())
client->active = true;
client->id = id;
client->active = active;

mutex_lock(&vgasr_mutex);
list_add_tail(&client->list, &vgasr_priv.clients);
vgasr_priv.registered_clients++;
if (client_is_vga(client))
vgasr_priv.registered_clients++;

/* if we get two clients + handler */
if (vgasr_priv.registered_clients == 2 && vgasr_priv.handler) {
if (!vgasr_priv.active &&
vgasr_priv.registered_clients == 2 && vgasr_priv.handler) {
printk(KERN_INFO "vga_switcheroo: enabled\n");
vga_switcheroo_enable();
}
mutex_unlock(&vgasr_mutex);
return 0;
}

int vga_switcheroo_register_client(struct pci_dev *pdev,
const struct vga_switcheroo_client_ops *ops)
{
return register_client(pdev, ops, -1,
pdev == vga_default_device());
}
EXPORT_SYMBOL(vga_switcheroo_register_client);

int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
const struct vga_switcheroo_client_ops *ops,
int id, bool active)
{
return register_client(pdev, ops, id | ID_BIT_AUDIO, active);
}
EXPORT_SYMBOL(vga_switcheroo_register_audio_client);

static struct vga_switcheroo_client *
find_client_from_pci(struct list_head *head, struct pci_dev *pdev)
{
Expand All @@ -161,7 +185,7 @@ find_active_client(struct list_head *head)
{
struct vga_switcheroo_client *client;
list_for_each_entry(client, head, list)
if (client->active == true)
if (client->active && client_is_vga(client))
return client;
return NULL;
}
Expand All @@ -173,13 +197,16 @@ void vga_switcheroo_unregister_client(struct pci_dev *pdev)
mutex_lock(&vgasr_mutex);
client = find_client_from_pci(&vgasr_priv.clients, pdev);
if (client) {
if (client_is_vga(client))
vgasr_priv.registered_clients--;
list_del(&client->list);
kfree(client);
vgasr_priv.registered_clients--;
}
printk(KERN_INFO "vga_switcheroo: disabled\n");
vga_switcheroo_debugfs_fini(&vgasr_priv);
vgasr_priv.active = false;
if (vgasr_priv.active && vgasr_priv.registered_clients < 2) {
printk(KERN_INFO "vga_switcheroo: disabled\n");
vga_switcheroo_debugfs_fini(&vgasr_priv);
vgasr_priv.active = false;
}
mutex_unlock(&vgasr_mutex);
}
EXPORT_SYMBOL(vga_switcheroo_unregister_client);
Expand All @@ -203,8 +230,9 @@ static int vga_switcheroo_show(struct seq_file *m, void *v)
int i = 0;
mutex_lock(&vgasr_mutex);
list_for_each_entry(client, &vgasr_priv.clients, list) {
seq_printf(m, "%d:%s:%c:%s:%s\n", i,
client->id == VGA_SWITCHEROO_DIS ? "DIS" : "IGD",
seq_printf(m, "%d:%s%s:%c:%s:%s\n", i,
client_id(client) == VGA_SWITCHEROO_DIS ? "DIS" : "IGD",
client_is_vga(client) ? "" : "-Audio",
client->active ? '+' : ' ',
client->pwr_state ? "Pwr" : "Off",
pci_name(client->pdev));
Expand Down Expand Up @@ -239,6 +267,17 @@ static int vga_switchoff(struct vga_switcheroo_client *client)
return 0;
}

static void set_audio_state(int id, int state)
{
struct vga_switcheroo_client *client;

client = find_client_from_id(&vgasr_priv.clients, id | ID_BIT_AUDIO);
if (client && client->pwr_state != state) {
client->ops->set_gpu_state(client->pdev, state);
client->pwr_state = state;
}
}

/* stage one happens before delay */
static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
{
Expand All @@ -252,6 +291,7 @@ 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;
}
Expand Down Expand Up @@ -281,6 +321,8 @@ 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);

Expand Down
6 changes: 6 additions & 0 deletions include/linux/vga_switcheroo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ struct vga_switcheroo_client_ops {
void vga_switcheroo_unregister_client(struct pci_dev *dev);
int vga_switcheroo_register_client(struct pci_dev *dev,
const struct vga_switcheroo_client_ops *ops);
int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
const struct vga_switcheroo_client_ops *ops,
int id, bool active);

void vga_switcheroo_client_fb_set(struct pci_dev *dev,
struct fb_info *info);
Expand All @@ -54,6 +57,9 @@ static inline int vga_switcheroo_register_client(struct pci_dev *dev,
const struct vga_switcheroo_client_ops *ops) { return 0; }
static inline void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info) {}
static inline int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) { return 0; }
static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
const struct vga_switcheroo_client_ops *ops,
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; }

Expand Down

0 comments on commit 3e9e63d

Please sign in to comment.