Commit 4fcae635 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Ard Biesheuvel
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 08e583ad

arch/x86/kernel/setup.c

+1 −5
Original line number Diff line number Diff line
@@ -215,10 +215,6 @@ arch_initcall(init_x86_sysctl); 


struct sysfb_display_info sysfb_primary_display;

EXPORT_SYMBOL(sysfb_primary_display);

#if defined(CONFIG_FIRMWARE_EDID)

struct edid_info edid_info;

EXPORT_SYMBOL_GPL(edid_info);

#endif



extern int root_mountflags;
@@ -530,7 +526,7 @@ static void __init parse_boot_params(void) 
	ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);

	sysfb_primary_display.screen = boot_params.screen_info;

#if defined(CONFIG_FIRMWARE_EDID)

	edid_info = boot_params.edid_info;

	sysfb_primary_display.edid = boot_params.edid_info;

#endif

#ifdef CONFIG_X86_32

	apm_info.bios = boot_params.apm_bios_info;

drivers/gpu/drm/sysfb/efidrm.c

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>



#include <video/edid.h>

#include <video/pixel_format.h>



#include "drm_sysfb_helper.h"
@@ -207,8 +206,8 @@ static struct efidrm_device *efidrm_device_create(struct drm_driver *drv, 
		&format->format, width, height, stride);



#if defined(CONFIG_FIRMWARE_EDID)

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

		sysfb->edid = edid_info.dummy;

	if (drm_edid_header_is_valid(dpy->edid.dummy) == 8)

		sysfb->edid = dpy->edid.dummy;

#endif

	sysfb->fb_mode = drm_sysfb_mode(width, height, 0, 0);

	sysfb->fb_format = format;

drivers/gpu/drm/sysfb/vesadrm.c

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>



#include <video/edid.h>

#include <video/pixel_format.h>

#include <video/vga.h>
@@ -474,8 +473,8 @@ static struct vesadrm_device *vesadrm_device_create(struct drm_driver *drv, 
	}



#if defined(CONFIG_FIRMWARE_EDID)

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

		sysfb->edid = edid_info.dummy;

	if (drm_edid_header_is_valid(dpy->edid.dummy) == 8)

		sysfb->edid = dpy->edid.dummy;

#endif

	sysfb->fb_mode = drm_sysfb_mode(width, height, 0, 0);

	sysfb->fb_format = format;

drivers/video/fbdev/core/fbmon.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

}

include/linux/sysfb.h

+6 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/screen_info.h>

#include <linux/types.h>



#include <video/edid.h>



struct device;

struct platform_device;

struct screen_info;
@@ -62,6 +64,10 @@ struct efifb_dmi_info { 


struct sysfb_display_info {

	struct screen_info screen;



#if defined(CONFIG_FIRMWARE_EDID)

	struct edid_info edid;

#endif

};



extern struct sysfb_display_info sysfb_primary_display;