Commit 33b4e4fc authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarHelge Deller <deller@gmx.de>
Link: https://lore.kernel.org/r/20250602075537.137759-3-tzimmermann@suse.de
parent 7e35fc7a

arch/x86/kernel/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -213,8 +213,10 @@ arch_initcall(init_x86_sysctl); 
 */

struct screen_info screen_info;

EXPORT_SYMBOL(screen_info);

#if defined(CONFIG_FIRMWARE_EDID)

struct edid_info edid_info;

EXPORT_SYMBOL_GPL(edid_info);

#endif



extern int root_mountflags;
@@ -525,7 +527,9 @@ static void __init parse_boot_params(void) 
{

	ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);

	screen_info = boot_params.screen_info;

#if defined(CONFIG_FIRMWARE_EDID)

	edid_info = boot_params.edid_info;

#endif

#ifdef CONFIG_X86_32

	apm_info.bios = boot_params.apm_bios_info;

	ist_info = boot_params.ist_info;

drivers/gpu/drm/sysfb/efidrm.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static struct efidrm_device *efidrm_device_create(struct drm_driver *drv, 
	drm_dbg(dev, "framebuffer format=%p4cc, size=%dx%d, stride=%d bytes\n",

		&format->format, width, height, stride);



#ifdef CONFIG_X86

#if defined(CONFIG_FIRMWARE_EDID)

	if (drm_edid_header_is_valid(edid_info.dummy) == 8)

		sysfb->edid = edid_info.dummy;

#endif

drivers/gpu/drm/sysfb/vesadrm.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static struct vesadrm_device *vesadrm_device_create(struct drm_driver *drv, 
#endif

	}



#ifdef CONFIG_X86

#if defined(CONFIG_FIRMWARE_EDID)

	if (drm_edid_header_is_valid(edid_info.dummy) == 8)

		sysfb->edid = edid_info.dummy;

#endif

include/video/edid.h

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 


#include <uapi/video/edid.h>



#ifdef CONFIG_X86

#if defined(CONFIG_FIRMWARE_EDID)

extern struct edid_info edid_info;

#endif



#endif /* __linux_video_edid_h__ */