Re: [Intel-gfx] [PATCH v2 2/3] drm/fb-helper: Set framebuffer for vga-switcheroo clients

[Thomas Zimmermann <tzimmermann@xxxxxxx>]

Hi

Am 18.01.23 um 20:21 schrieb Rodrigo Vivi:
> On Thu, Jan 12, 2023 at 09:11:55PM +0100, Thomas Zimmermann wrote:
> > 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 <tzimmermann@xxxxxxx>
> > Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> > Cc: Ben Skeggs <bskeggs@xxxxxxxxxx>
> > Cc: Karol Herbst <kherbst@xxxxxxxxxx>
> > Cc: Lyude Paul <lyude@xxxxxxxxxx>
> > Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> > Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx>
> > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
> > Cc: Dave Airlie <airlied@xxxxxxxxxx>
> > Cc: Evan Quan <evan.quan@xxxxxxx>
> > Cc: Christian König <christian.koenig@xxxxxxx>
> > Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> > Cc: Hawking Zhang <Hawking.Zhang@xxxxxxx>
> > Cc: Likun Gao <Likun.Gao@xxxxxxx>
> > Cc: "Christian König" <christian.koenig@xxxxxxx>
> > Cc: Stanley Yang <Stanley.Yang@xxxxxxx>
> > Cc: "Tianci.Yin" <tianci.yin@xxxxxxx>
> > Cc: Xiaojian Du <Xiaojian.Du@xxxxxxx>
> > Cc: Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx>
> > Cc: YiPeng Chai <YiPeng.Chai@xxxxxxx>
> > Cc: Somalapuram Amaranath <Amaranath.Somalapuram@xxxxxxx>
> > Cc: Bokun Zhang <Bokun.Zhang@xxxxxxx>
> > Cc: Guchun Chen <guchun.chen@xxxxxxx>
> > Cc: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
> > Cc: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
> > Cc: Mario Limonciello <mario.limonciello@xxxxxxx>
> > Cc: Solomon Chiu <solomon.chiu@xxxxxxx>
> > Cc: Kai-Heng Feng <kai.heng.feng@xxxxxxxxxxxxx>
> > Cc: Felix Kuehling <Felix.Kuehling@xxxxxxx>
> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > Cc: "Marek Olšák" <marek.olsak@xxxxxxx>
> > Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
> > Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
> > Cc: "Ville Syrjälä" <ville.syrjala@xxxxxxxxxxxxxxx>
> > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > Cc: nouveau@xxxxxxxxxxxxxxxxxxxxx
> > Cc: <stable@xxxxxxxxxxxxxxx> # v5.17+
> > ---
> >   drivers/gpu/drm/drm_fb_helper.c | 8 ++++++++
> >   1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> > index 427631706128..5e445c61252d 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>
> > @@ -1940,6 +1942,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;
>
> On drm-tip, this commit has a silent conflict with
> cff84bac9922 ("drm/fh-helper: Split fbdev single-probe helper")
> that's already in drm-next.
>
> I had created a fix-up patch in drm-tip re-introducing this line.

Thank you. Is it fixed for now?

> We probably need a backmerge from drm-next into drm-misc-fixes with
> the resolution applied there. And probably propagated that resolution
> later...

Backmerging from -next into -fixes branches is a problem, as -fixes 
should be close to the latest release.

Can we solve this by merging -fixes into upstream and backmerging this 
into our -next branches?

Best regards
Thomas

> >   	struct drm_fb_helper_surface_size sizes;
> >   	int ret;
> >   
> > @@ -1961,6 +1964,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;
> >   }
> >   
> > --
> > 2.39.0

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

Attachment: OpenPGP_signature
Description: OpenPGP digital signature