From: Thomas Zimmermann <tzimmermann@suse.de>
To: javierm@redhat.com, deller@gmx.de, pjones@redhat.com
Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH 2/4] fbdev/efifb: Use screen_info pointer from device
Date: Wed, 29 Nov 2023 16:48:02 +0100 [thread overview]
Message-ID: <20231129155218.3475-3-tzimmermann@suse.de> (raw)
In-Reply-To: <20231129155218.3475-1-tzimmermann@suse.de>
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.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/video/fbdev/efifb.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 6cbb65bbe1110..d0ce357ff2684 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -358,7 +358,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;
@@ -368,6 +368,13 @@ static int efifb_probe(struct platform_device *dev)
char *option = NULL;
efi_memory_desc_t md;
+ 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;
--
2.43.0
next prev parent reply other threads:[~2023-11-29 15:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 15:48 [PATCH 0/4] fbdev: Remove global screen_info in efifb/vesafb Thomas Zimmermann
2023-11-29 15:48 ` [PATCH 1/4] fbdev/efifb: Replace references to global screen_info by local pointer Thomas Zimmermann
2023-12-01 8:44 ` Javier Martinez Canillas
2023-11-29 15:48 ` Thomas Zimmermann [this message]
2023-12-01 8:54 ` [PATCH 2/4] fbdev/efifb: Use screen_info pointer from device Javier Martinez Canillas
2023-12-01 9:26 ` Thomas Zimmermann
2023-12-01 9:56 ` Javier Martinez Canillas
2023-11-29 15:48 ` [PATCH 3/4] fbdev/vesafb: Replace references to global screen_info by local pointer Thomas Zimmermann
2023-11-29 15:48 ` [PATCH 4/4] fbdev/vesafb: Use screen_info pointer from device Thomas Zimmermann
2023-12-01 8:55 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129155218.3475-3-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=pjones@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox