path: root/drivers/gpu/vga/vga_switcheroo.c
diff options
authorLukas Wunner <>2015-08-27 16:43:43 +0200
committerDaniel Vetter <>2015-09-24 20:14:25 +0200
commit21b45676b7c4b79334d8fe3c5a112af0517b66e9 (patch)
tree941b391099a6e4d980d3834ef967cc23b4e643c4 /drivers/gpu/vga/vga_switcheroo.c
parent73f7570bc6c853ca1fad24f9d31815b20e405354 (diff)
vga_switcheroo: Set active attribute to false for audio clients
The active attribute in struct vga_switcheroo_client denotes whether the outputs are currently switched to this client. The attribute is only meaningful for vga clients. It is never used for audio clients. The function vga_switcheroo_register_audio_client() misuses this attribute to store whether the audio device is fully initialized. Most likely there was a misunderstanding about the meaning of "active" when this was added. Comment from Takashi's review: "Not really. The full initialization of audio was meant that the audio is active indeed. Admittedly, though, the active flag for each audio client doesn't play any role because the audio always follows the gfx state changes, and the value passed there doesn't reflect the actual state due to the later change. So, I agree with the removal of the flag itself -- or let the audio active flag following the corresponding gfx flag. The latter will make the proc output more consistent while the former is certainly more reduction of code." Set the active attribute to false for audio clients. Remove the active parameter from vga_switcheroo_register_audio_client() and its sole caller, hda_intel.c:register_vga_switcheroo(). vga_switcheroo_register_audio_client() was introduced by 3e9e63dbd374 ("vga_switcheroo: Add the support for audio clients"). Its use in hda_intel.c was introduced by a82d51ed24bb ("ALSA: hda - Support VGA-switcheroo"). v1.1: The changes above imply that in find_active_client() the call to client_is_vga() is now superfluous. Drop it. Cc: Takashi Iwai <> Signed-off-by: Lukas Wunner <> [danvet: Add Takashi's clarification to the commit message.] Reviewed-by: Takashi Iwai <> Signed-off-by: Daniel Vetter <>
Diffstat (limited to 'drivers/gpu/vga/vga_switcheroo.c')
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 67a57090175d..86c03b53e7bf 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -288,7 +288,6 @@ EXPORT_SYMBOL(vga_switcheroo_register_client);
* @pdev: client pci device
* @ops: client callbacks
* @id: client identifier, see enum vga_switcheroo_client_id
- * @active: whether the audio device is fully initialized
* Register audio client (audio device on a GPU). The power state of the
* client is assumed to be ON.
@@ -297,9 +296,9 @@ 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)
+ int id)
- return register_client(pdev, ops, id | ID_BIT_AUDIO, active, false);
+ return register_client(pdev, ops, id | ID_BIT_AUDIO, false, false);
@@ -331,7 +330,7 @@ find_active_client(struct list_head *head)
struct vga_switcheroo_client *client;
list_for_each_entry(client, head, list)
- if (client->active && client_is_vga(client))
+ if (client->active)
return client;
return NULL;