Commit 0f7c2462 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/vesafb: Use screen_info pointer from device 



Use the screen_info instance from the device instead of dereferencing
the global screen_info state. Decouples the driver from per-architecture
code. Duplicated the screen_info data, so that vesafb can modify it at
will.

v2:
	* comment on devm_kmemdup() usage (Javier)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231206135153.2599-5-tzimmermann@suse.de
parent 3218286b

drivers/video/fbdev/vesafb.c

+13 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int vesafb_setup(char *options) 


static int vesafb_probe(struct platform_device *dev)

{

	struct screen_info *si = &screen_info;

	struct screen_info *si;

	struct fb_info *info;

	struct vesafb_par *par;

	int i, err;
@@ -252,6 +252,18 @@ static int vesafb_probe(struct platform_device *dev) 
	unsigned int size_total;

	char *option = NULL;



	/*

	 * If we fail probing the device, the kernel might try a different

	 * driver. We get a copy of the attached screen_info, so that we can

	 * modify its values without affecting later drivers.

	 */

	si = dev_get_platdata(&dev->dev);

	if (!si)

		return -ENODEV;

	si = devm_kmemdup(&dev->dev, si, sizeof(*si), GFP_KERNEL);

	if (!si)

		return -ENOMEM;



	/* ignore error return of fb_get_options */

	fb_get_options("vesafb", &option);

	vesafb_setup(option);