mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-09-02 08:32:55 +00:00
fbdev/efifb: 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 efifb can modify it at will. v2: * comment on devm_kmemdup() usage (Javier) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Tested-by: Sui Jingfeng <sui.jingfeng@linux.dev> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231206135153.2599-3-tzimmermann@suse.de
This commit is contained in:
parent
8505e70821
commit
b9cfd1d271
@ -359,7 +359,7 @@ static u64 bar_offset;
|
||||
|
||||
static int efifb_probe(struct platform_device *dev)
|
||||
{
|
||||
struct screen_info *si = &screen_info;
|
||||
struct screen_info *si;
|
||||
struct fb_info *info;
|
||||
struct efifb_par *par;
|
||||
int err, orientation;
|
||||
@ -369,6 +369,18 @@ static int efifb_probe(struct platform_device *dev)
|
||||
char *option = NULL;
|
||||
efi_memory_desc_t md;
|
||||
|
||||
/*
|
||||
* 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;
|
||||
|
||||
if (si->orig_video_isVGA != VIDEO_TYPE_EFI || pci_dev_disabled)
|
||||
return -ENODEV;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user