diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2025-11-26 17:03:23 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2025-12-16 14:12:44 +0100 |
| commit | 4fcae635887195d6ecc427d503d7671ca46bc11b (patch) | |
| tree | 31a42454f03c299d19f655fe42a6328d4ef332f0 /drivers/video/fbdev | |
| parent | 08e583ad68577ff5135d2b6fad1d3b4b400074a5 (diff) | |
sysfb: Move edid_info into sysfb_primary_display
Move x86's edid_info into sysfb_primary_display as a new field named
edid. Adapt all users.
An instance of edid_info has only been defined on x86. With the move
into sysfb_primary_display, it becomes available on all architectures.
Therefore remove this contraint from CONFIG_FIRMWARE_EDID.
x86 fills the EDID data from boot_params.edid_info. DRM drivers pick
up the raw data and make it available to DRM clients. Replace the
drivers' references to edid_info and instead use the sysfb_display_info
as passed from sysfb.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/core/fbmon.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 0a65bef01e3c..07df7e98f8a3 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -32,11 +32,13 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/slab.h> -#include <video/edid.h> +#include <linux/string_choices.h> +#include <linux/sysfb.h> + #include <video/of_videomode.h> #include <video/videomode.h> + #include "../edid.h" -#include <linux/string_choices.h> /* * EDID parser @@ -1504,7 +1506,7 @@ const unsigned char *fb_firmware_edid(struct device *device) res = &dev->resource[PCI_ROM_RESOURCE]; if (res && res->flags & IORESOURCE_ROM_SHADOW) - edid = edid_info.dummy; + edid = sysfb_primary_display.edid.dummy; return edid; } |