diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-11-05 05:52:50 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-11-05 08:56:21 -0500 |
commit | fc09ab7a767394f9ecdad84ea6e85d68b83c8e21 (patch) | |
tree | 528092c94abe1705aa9cf5b6e98f4f40249f9379 | |
parent | 651022382c7f8da46cb4872a545ee1da6d097d2a (diff) |
vga_switcheroo: Fix missing gpu_bound call at audio client registration
The commit 37a3a98ef601 ("ALSA: hda - Enable runtime PM only for
discrete GPU") added a new ops gpu_bound to be called when GPU gets
bound. The patch overlooked, however, that vga_switcheroo_enable() is
called only once at GPU is bound. When an audio client is registered
after that point, it would miss the gpu_bound call. This leads to the
unexpected lack of runtime PM in HD-audio side.
For addressing that regression, just call gpu_bound callback manually
at vga_switcheroo_register_audio_client() when the GPU was already
bound.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201615
Fixes: 37a3a98ef601 ("ALSA: hda - Enable runtime PM only for discrete GPU")
Cc: <stable@vger.kernel.org>
Reviewed-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | drivers/gpu/vga/vga_switcheroo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index cf2a18571d48..a132c37d7334 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c | |||
@@ -380,6 +380,9 @@ int vga_switcheroo_register_audio_client(struct pci_dev *pdev, | |||
380 | mutex_unlock(&vgasr_mutex); | 380 | mutex_unlock(&vgasr_mutex); |
381 | return -EINVAL; | 381 | return -EINVAL; |
382 | } | 382 | } |
383 | /* notify if GPU has been already bound */ | ||
384 | if (ops->gpu_bound) | ||
385 | ops->gpu_bound(pdev, id); | ||
383 | } | 386 | } |
384 | mutex_unlock(&vgasr_mutex); | 387 | mutex_unlock(&vgasr_mutex); |
385 | 388 | ||