tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
video: Make global edid_info depend on CONFIG_FIRMWARE_EDID
Protect global edid_info behind CONFIG_FIRMWARE_EDID and remove
the config tests for CONFIG_X86. Makes edid_info available iff
its option has been enabled.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Helge Deller <deller@gmx.de>
Link: https://lore.kernel.org/r/20250602075537.137759-3-tzimmermann@suse.de
+8
-3
+4
arch/x86/kernel/setup.c
+4
arch/x86/kernel/setup.c
···
213
213
*/
214
214
struct screen_info screen_info;
215
215
EXPORT_SYMBOL(screen_info);
216
+
#if defined(CONFIG_FIRMWARE_EDID)
216
217
struct edid_info edid_info;
217
218
EXPORT_SYMBOL_GPL(edid_info);
219
+
#endif
218
220
219
221
extern int root_mountflags;
220
222
···
527
525
{
528
526
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
529
527
screen_info = boot_params.screen_info;
528
+
#if defined(CONFIG_FIRMWARE_EDID)
530
529
edid_info = boot_params.edid_info;
530
+
#endif
531
531
#ifdef CONFIG_X86_32
532
532
apm_info.bios = boot_params.apm_bios_info;
533
533
ist_info = boot_params.ist_info;
+1
-1
drivers/gpu/drm/sysfb/efidrm.c
+1
-1
drivers/gpu/drm/sysfb/efidrm.c
···
202
202
drm_dbg(dev, "framebuffer format=%p4cc, size=%dx%d, stride=%d bytes\n",
203
203
&format->format, width, height, stride);
204
204
205
-
#ifdef CONFIG_X86
205
+
#if defined(CONFIG_FIRMWARE_EDID)
206
206
if (drm_edid_header_is_valid(edid_info.dummy) == 8)
207
207
sysfb->edid = edid_info.dummy;
208
208
#endif
+1
-1
drivers/gpu/drm/sysfb/vesadrm.c
+1
-1
drivers/gpu/drm/sysfb/vesadrm.c