Commit 403f0dda authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/core: Pass Linux device to pm_vt_switch_*() functions 



Pass the Linux device to pm_vt_switch_*() instead of the virtual
fbdev device. Prepares fbdev for making struct fb_info.dev optional.

The type of device that is passed to the PM functions does not matter
much. It is only a token within the internal list of known devices.
The PM functions do not refer to any of the device's properties or its
type.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: linux-pm@vger.kernel.org
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-33-tzimmermann@suse.de
parent 8adcfd21

drivers/video/fbdev/core/fbmem.c

+3 −3
Original line number Diff line number Diff line
@@ -1478,9 +1478,9 @@ static int do_register_framebuffer(struct fb_info *fb_info) 
		INIT_LIST_HEAD(&fb_info->modelist);



	if (fb_info->skip_vt_switch)

		pm_vt_switch_required(fb_info->dev, false);

		pm_vt_switch_required(fb_info->device, false);

	else

		pm_vt_switch_required(fb_info->dev, true);

		pm_vt_switch_required(fb_info->device, true);



	fb_var_to_videomode(&mode, &fb_info->var);

	fb_add_videomode(&mode, &fb_info->modelist);
@@ -1520,7 +1520,7 @@ static void unlink_framebuffer(struct fb_info *fb_info) 


	device_destroy(fb_class, MKDEV(FB_MAJOR, i));



	pm_vt_switch_unregister(fb_info->dev);

	pm_vt_switch_unregister(fb_info->device);



	unbind_console(fb_info);