[v3,2/3] drm/fb-helper: Set framebuffer for vga-switcheroo clients

Commit Message

Thomas Zimmermann Jan. 16, 2023, 11:54 a.m. UTC

Set the framebuffer info for drivers that support VGA switcheroo. Only
affects the amdgpu and nouveau drivers, which use VGA switcheroo and
generic fbdev emulation. For other drivers, this does nothing.

This fixes a potential regression in the console code. Both, amdgpu and
nouveau, invoked vga_switcheroo_client_fb_set() from their internal fbdev
code. But the call got lost when the drivers switched to the generic
emulation.

Fixes: 087451f372bf ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's.")
Fixes: 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
Signed-off-by: Thomas Zimmermann <[e-mail]>
Reviewed-by: Daniel Vetter <[e-mail]>
Reviewed-by: Alex Deucher <[e-mail]>
Cc: Ben Skeggs <[e-mail]>
Cc: Karol Herbst <[e-mail]>
Cc: Lyude Paul <[e-mail]>
Cc: Thomas Zimmermann <[e-mail]>
Cc: Javier Martinez Canillas <[e-mail]>
Cc: Laurent Pinchart <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Dave Airlie <[e-mail]>
Cc: Evan Quan <[e-mail]>
Cc: Christian König <[e-mail]>
Cc: Alex Deucher <[e-mail]>
Cc: Hawking Zhang <[e-mail]>
Cc: Likun Gao <[e-mail]>
Cc: "Christian König" <[e-mail]>
Cc: Stanley Yang <[e-mail]>
Cc: "Tianci.Yin" <[e-mail]>
Cc: Xiaojian Du <[e-mail]>
Cc: Andrey Grodzovsky <[e-mail]>
Cc: YiPeng Chai <[e-mail]>
Cc: Somalapuram Amaranath <[e-mail]>
Cc: Bokun Zhang <[e-mail]>
Cc: Guchun Chen <[e-mail]>
Cc: Hamza Mahfooz <[e-mail]>
Cc: Aurabindo Pillai <[e-mail]>
Cc: Mario Limonciello <[e-mail]>
Cc: Solomon Chiu <[e-mail]>
Cc: Kai-Heng Feng <[e-mail]>
Cc: Felix Kuehling <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: "Marek Olšák" <[e-mail]>
Cc: Sam Ravnborg <[e-mail]>
Cc: Hans de Goede <[e-mail]>
Cc: "Ville Syrjälä" <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: <[e-mail]> # v5.17+
---
 drivers/gpu/drm/drm_fb_helper.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Patch

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 367fb8b2d5fa..c5c13e192b64 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -30,7 +30,9 @@ 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/console.h>
+#include <linux/pci.h>
 #include <linux/sysrq.h>
+#include <linux/vga_switcheroo.h>
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_drv.h>
@@ -1924,6 +1926,7 @@  static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 					 int preferred_bpp)
 {
 	struct drm_client_dev *client = &fb_helper->client;
+	struct drm_device *dev = fb_helper->dev;
 	struct drm_fb_helper_surface_size sizes;
 	int ret;
 
@@ -1945,6 +1948,11 @@  static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 		return ret;
 
 	strcpy(fb_helper->fb->comm, "[fbcon]");
+
+	/* Set the fb info for vgaswitcheroo clients. Does nothing otherwise. */
+	if (dev_is_pci(dev->dev))
+		vga_switcheroo_client_fb_set(to_pci_dev(dev->dev), fb_helper->info);
+
 	return 0;
 }