drm, coreboot: Add DRM coreboot driver
Subsystems (7)
Thomas Zimmermann
maintainerv4 cover drm, coreboot: Add DRM coreboot driver
Coreboot implements framebuffer support via simple-framebuffer. Provide a dedicated DRM driver. Keep the simple-framebuffer code for now.
For each firmware's provided framebuffer, we prefer a dedicated DRM driver tailored towards the platform's feature set. The coreboot framebuffer device currently creates a simple-framebuffer device for the provided framebuffer aperture. But simple-framebuffer is for DeviceTree nodes; not for coreboot. The simple-framebuffer infrastructure should be phased out for non-DT use cases. Coreboot is one of the final users of the code (besides n64).
Patches 1 to 5 start by fixing problems in the coreboot framebuffer implementation. There is a possible dangling pointer, the memory is marked as busy, the device hierarchy is incorrect, and a few minor things.
Patches 6 to 9 prepare the coreboot support for use by external drivers. Specifically, structures for the entries os the coreboot payload table have to be exported.
Patches 10 to 12 add corebootdrm, a DRM driver for the new coreboot-framebuffer platform device. Corebootdrm follows the pattern established by similar drivers. It also uses the same sysfb helpers. It is therefore fairly small. With patch 11, it has feature parity with simpledrm on the old simple-framebuffer. Patch 12 adds support for panel- orientation flags that coreboot makes available.
Tested on an HP Chromebook with MrChromebox 4.16. Runs with Weston and fbcon. Xorg requires an additional patch available at [1].
v4:
- sort include statements
- remove changelog from commit description in coreboot patch #9 v3:
- avoid packed types for coreboot headers
- comment in various places
- fix typos
v2:
- keep design of coreboot framebuffer code intact
- fix bugs in the coreboot framebuffer code
- rewrite corebootdrm as platform device
- support panel orientation
[1] https://gitlab.freedesktop.org/tzimmermann/xserver/-/commit/0b326aad28549762ed2b0e2bedf8f8a42f1f6b3b
Thomas Zimmermann (12):
firmware: google: framebuffer: Do not unregister platform device
firmware: google: framebuffer: Do not mark framebuffer as busy
firmware: google: framebuffer: Init memory resource with helper macro
firmware: google: framebuffer: Tie platform device to PCI hardware
firmware: google: framebuffer: Fix dependencies
firmware: google: Init coreboot bus with subsys_initcall()
firmware: google: Clean up include statements in coreboot_table.h
firmware: google: Export coreboot table entries
firmware: google: Pack structures for coreboot table entries drm/sysfb: Generalize pixel-format matching
drm/sysfb: corebootdrm: Add DRM driver for coreboot framebuffers drm/sysfb: corebootdrm: Support panel orientation
MAINTAINERS | 1 + drivers/firmware/google/Kconfig | 5 +- drivers/firmware/google/cbmem.c | 1 + drivers/firmware/google/coreboot_table.c | 13 +- drivers/firmware/google/coreboot_table.h | 59 +-- .../firmware/google/framebuffer-coreboot.c | 126 +++-- drivers/firmware/google/memconsole-coreboot.c | 1 + drivers/firmware/google/vpd.c | 1 + drivers/gpu/drm/sysfb/Kconfig | 16 + drivers/gpu/drm/sysfb/Makefile | 1 + drivers/gpu/drm/sysfb/corebootdrm.c | 434 ++++++++++++++++++ drivers/gpu/drm/sysfb/drm_sysfb.c | 24 + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 8 +- drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c | 30 -- drivers/gpu/drm/sysfb/efidrm.c | 8 +- drivers/gpu/drm/sysfb/vesadrm.c | 8 +- include/linux/coreboot.h | 90 ++++ 17 files changed, 702 insertions(+), 124 deletions(-) create mode 100644 drivers/gpu/drm/sysfb/corebootdrm.c create mode 100644 include/linux/coreboot.h
base-commit: 0082025812a31eda451fb14f13f52683ed375c49
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 1/12 firmware: google: framebuffer: Do not unregister platform device
The native driver takes over the framebuffer aperture by removing the system- framebuffer platform device. Afterwards the pointer in drvdata is dangling. Remove the entire logic around drvdata and let the kernel's aperture helpers handle this. The platform device depends on the native hardware device instead of the coreboot device anyway.
When commit 851b4c14532d ("firmware: coreboot: Add coreboot framebuffer driver") added the coreboot framebuffer code, the kernel did not support device-based aperture management. Instead native driviers only removed the conflicting fbdev device. At that point, unregistering the framebuffer device most likely worked correctly. It was definitely broken after commit d9702b2a2171 ("fbdev/simplefb: Do not use struct fb_info.apertures"). So take this commit for the Fixes tag. Earlier releases might work depending on the native hardware driver.
--- drivers/firmware/google/framebuffer-coreboot.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/firmware/google/framebuffer-coreboot.c +0 -10
@@ -81,19 +81,10 @@ static int framebuffer_probe(struct coreboot_device *dev) sizeof(pdata));if (IS_ERR (pdev))pr_warn ("coreboot: could not register framebuffer\n" ); -else -dev_set_drvdata (&dev->dev, pdev);return PTR_ERR_OR_ZERO (pdev); } -static void framebuffer_remove (struct coreboot_device *dev) -{ -struct platform_device *pdev =dev_get_drvdata (&dev->dev); - -platform_device_unregister (pdev); -} -static const struct coreboot_device_id framebuffer_ids[] = { { .tag =CB_TAG_FRAMEBUFFER }, {/* sentinel */ }
@@ -102,7 +93,6 @@ MODULE_DEVICE_TABLE(coreboot, framebuffer_ids);static struct coreboot_driver framebuffer_driver = { .probe = framebuffer_probe, - .remove = framebuffer_remove, .drv = { .name ="framebuffer" , },
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 2/12 firmware: google: framebuffer: Do not mark framebuffer as busy
In reply to Thomas ZimmermannRemove the flag IORESOURCE_BUSY flag from coreboot's framebuffer resource. It prevents simpledrm from successfully requesting the range for its own use; resulting in errors such as
[ 2.775430] simple-framebuffer simple-framebuffer.0: [drm] could not acquire memory region [mem 0x80000000-0x80407fff flags 0x80000200]
As with other uses of simple-framebuffer, the simple-framebuffer device should only declare it's I/O resources, but not actively use them.
--- drivers/firmware/google/framebuffer-coreboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/google/framebuffer-coreboot.c +1 -1
@@ -67,7 +67,7 @@ static int framebuffer_probe(struct coreboot_device *dev)return -ENODEV ;memset (&res,0 ,sizeof (res)); - res.flags =IORESOURCE_MEM |IORESOURCE_BUSY ; + res.flags =IORESOURCE_MEM ; res.name ="Coreboot Framebuffer" ; res.start = fb->physical_address; length =PAGE_ALIGN (fb->y_resolution * fb->bytes_per_line);
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 3/12 firmware: google: framebuffer: Init memory resource with helper macro
In reply to Thomas ZimmermannInitialize framebuffer memory resource with DEFINE_RES_MEM() instead of open-coding the setup.
While at it, drop the resource name to make the kernel use the device name of the simple-framebuffer device for the resource. The latter includes a device number. While the meaning of the resource name is somewhat fuzzy and varies across entries in /proc/iomem, showing the device name seems more helpful than showing a fixed name.
--- drivers/firmware/google/framebuffer-coreboot.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/firmware/google/framebuffer-coreboot.c +5 -10
@@ -26,7 +26,6 @@ static const struct simplefb_format formats[] = SIMPLEFB_FORMATS;static int framebuffer_probe (struct coreboot_device *dev) {int i; -u32 length;struct lb_framebuffer *fb = &dev->framebuffer;struct platform_device *pdev;struct resource res;
@@ -53,6 +52,11 @@ static int framebuffer_probe(struct coreboot_device *dev)if (!fb->physical_address)return -ENODEV ; + res =DEFINE_RES_MEM (fb->physical_address, +PAGE_ALIGN (fb->y_resolution * fb->bytes_per_line)); +if (res.end <= res.start) +return -EINVAL ; +for (i =0 ; i <ARRAY_SIZE (formats); ++i) { if (fb->bits_per_pixel == formats[i].bits_per_pixel && fb->red_mask_pos == formats[i].red.offset &&
@@ -66,15 +70,6 @@ static int framebuffer_probe(struct coreboot_device *dev)if (!pdata.format)return -ENODEV ; -memset (&res,0 ,sizeof (res)); - res.flags =IORESOURCE_MEM ; - res.name ="Coreboot Framebuffer" ; - res.start = fb->physical_address; - length =PAGE_ALIGN (fb->y_resolution * fb->bytes_per_line); - res.end = res.start + length -1 ; -if (res.end <= res.start) -return -EINVAL ; - pdev = platform_device_register_resndata(&dev->dev, "simple-framebuffer", 0, &res, 1, &pdata,
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 4/12 firmware: google: framebuffer: Tie platform device to PCI hardware
In reply to Thomas ZimmermannUse the PCI device as parent of the system-framebuffer device instead of the coreboot device. Prevents SIGBUS or SIGSEG after hot-unplug of the PCI device while the framebuffer is active.
The simple-framebuffer device depends on the PCI hardware, so this device needs to be its parent. The current coreboot parent is no longer needed after the system-framebuffer device has been created.
On systems without PCI or if no PCI parent device could be found, the platform device hangs on the platform bus directly.
The fix here is similar to code in sysfb, which contained that same bug.
--- .../firmware/google/framebuffer-coreboot.c | 82 +++++++++++++++++-- 1 file changed, 77 insertions(+), 5 deletions(-)
drivers/firmware/google/framebuffer-coreboot.c +77 -5
@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/mm.h> #include <linux/module.h> +#include <linux/pci.h> #include <linux/platform_data/simplefb.h> #include <linux/platform_device.h> #include <linux/sysfb.h>
@@ -21,14 +22,71 @@#define CB_TAG_FRAMEBUFFER 0x12 +#if defined(CONFIG_PCI ) +static bool framebuffer_pci_dev_is_enabled (struct pci_dev *pdev) +{ +/* +* TODO: Try to integrate this code into the PCI subsystem +*/ +int ret; +u16 command; + + ret =pci_read_config_word (pdev,PCI_COMMAND , &command); +if (ret !=PCIBIOS_SUCCESSFUL ) +return false; +if (!(command &PCI_COMMAND_MEMORY )) +return false; +return true; +} + +static struct pci_dev *framebuffer_parent_pci_dev (struct resource *res) +{ +struct pci_dev *pdev =NULL ; +const struct resource *r =NULL ; + +while (!r && (pdev =pci_get_base_class (PCI_BASE_CLASS_DISPLAY , pdev))) + r =pci_find_resource (pdev, res); + +if (!r || !pdev) +return NULL ;/* not found; not an error */ + +if (!framebuffer_pci_dev_is_enabled (pdev)) { +pci_dev_put (pdev); +return ERR_PTR (-ENODEV ); + } + +return pdev; +} +#else +static struct pci_dev *framebuffer_parent_pci_dev (struct resource *res) +{ +return NULL ; +} +#endif + +static struct device *framebuffer_parent_dev (struct resource *res) +{ +struct pci_dev *pdev; + + pdev =framebuffer_parent_pci_dev (res); +if (IS_ERR (pdev)) +return ERR_CAST (pdev); +else if (pdev) +return &pdev->dev; + +return NULL ; +} +static const struct simplefb_format formats[] =SIMPLEFB_FORMATS ;static int framebuffer_probe (struct coreboot_device *dev) {int i;struct lb_framebuffer *fb = &dev->framebuffer; +struct device *parent;struct platform_device *pdev;struct resource res; +int ret;struct simplefb_platform_data pdata = { .width = fb->x_resolution, .height = fb->y_resolution,
@@ -57,6 +115,10 @@ static int framebuffer_probe(struct coreboot_device *dev)if (res.end <= res.start)return -EINVAL ; + parent =framebuffer_parent_dev (&res); +if (IS_ERR (parent)) +return PTR_ERR (parent); +for (i =0 ; i <ARRAY_SIZE (formats); ++i) { if (fb->bits_per_pixel == formats[i].bits_per_pixel && fb->red_mask_pos == formats[i].red.offset &&
@@ -67,17 +129,27 @@ static int framebuffer_probe(struct coreboot_device *dev) fb->blue_mask_size == formats[i].blue.length) pdata.format = formats[i].name; } -if (!pdata.format) -return -ENODEV ; +if (!pdata.format) { + ret = -ENODEV ; + goto out_put_device_parent; + } - pdev =platform_device_register_resndata (&dev->dev, + pdev =platform_device_register_resndata (parent,"simple-framebuffer" ,0 , &res,1 , &pdata,sizeof (pdata)); -if (IS_ERR (pdev)) +if (IS_ERR (pdev)) { + ret =PTR_ERR (pdev);pr_warn ("coreboot: could not register framebuffer\n" ); + goto out_put_device_parent; + } + + ret =0 ; -return PTR_ERR_OR_ZERO (pdev); +out_put_device_parent: +if (parent) +put_device (parent); +return ret; }static const struct coreboot_device_id framebuffer_ids[] = {
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 5/12 firmware: google: framebuffer: Fix dependencies
In reply to Thomas ZimmermannThe framebuffer on the coreboot bus represents an entry in the coreboot payload table; not the actual device. [1] Hence it must not depend on any other driver setting.
--- drivers/firmware/google/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/google/Kconfig +2 -2
@@ -59,11 +59,11 @@ config GOOGLE_MEMCONSOLE_X86_LEGACY config GOOGLE_FRAMEBUFFER_COREBOOT tristate "Coreboot Framebuffer" - depends on FB_SIMPLE || DRM_SIMPLEDRM depends on GOOGLE_COREBOOT_TABLE help This option enables the kernel to search for a framebuffer in - the coreboot table. If found, it is registered with simplefb. + the coreboot table. If found, it is registered with a platform + device of type simple-framebuffer. config GOOGLE_MEMCONSOLE_COREBOOT tristate "Firmware Memory Console"
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 6/12 firmware: google: Init coreboot bus with subsys_initcall()
In reply to Thomas ZimmermannUsing module_init()/device_initcall() is too late to initialize the coreboot bus, as there might already be drivers that depend on it.
So far this hasn't been a problem, as coreboot controls all device creation. Initializing the coreboot bus earlier in subsys_initcall() will allow for external coreboot drivers to register themselves with device_initcall(). Prepares coreboot to support additional coreboot drivers from other subsystems.
--- drivers/firmware/google/coreboot_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/google/coreboot_table.c +1 -1
@@ -251,7 +251,7 @@ static void __exit coreboot_table_driver_exit(void)bus_unregister (&coreboot_bus_type); } -module_init (coreboot_table_driver_init); +subsys_initcall (coreboot_table_driver_init);module_exit (coreboot_table_driver_exit);MODULE_AUTHOR ("Google, Inc." );
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 7/12 firmware: google: Clean up include statements in coreboot_table.h
In reply to Thomas ZimmermannInclude <linux/mod_devicetable.h> from source files and only forward- declare struct coreboot_device_id in coreboot_table.h.
--- drivers/firmware/google/cbmem.c | 1 + drivers/firmware/google/coreboot_table.c | 1 + drivers/firmware/google/coreboot_table.h | 3 ++- drivers/firmware/google/framebuffer-coreboot.c | 1 + drivers/firmware/google/memconsole-coreboot.c | 1 + drivers/firmware/google/vpd.c | 1 + 6 files changed, 7 insertions(+), 1 deletion(-)
drivers/firmware/google/cbmem.c +1 -0
@@ -12,6 +12,7 @@#include <linux/io.h> #include <linux/kernel.h> #include <linux/kobject.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h>
drivers/firmware/google/coreboot_table.c +1 -0
@@ -14,6 +14,7 @@#include <linux/init.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h>
drivers/firmware/google/coreboot_table.h +2 -1
@@ -13,7 +13,8 @@#define __COREBOOT_TABLE_H#include <linux/device.h> -#include <linux/mod_devicetable.h> + +struct coreboot_device_id ;/* Coreboot table header structure */ struct coreboot_table_header {
drivers/firmware/google/framebuffer-coreboot.c +1 -0
@@ -12,6 +12,7 @@#include <linux/device.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/pci.h> #include <linux/platform_data/simplefb.h>
drivers/firmware/google/memconsole-coreboot.c +1 -0
@@ -10,6 +10,7 @@#include <linux/device.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include "memconsole.h"
drivers/firmware/google/vpd.c +1 -0
@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/kobject.h> #include <linux/list.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/of_address.h> #include <linux/platform_device.h>
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 8/12 firmware: google: Export coreboot table entries
In reply to Thomas ZimmermannMove types for coreboot table entries to <linux/coreboot.h>. Allows drivers in other subsystems to use these structures.
--- MAINTAINERS | 1 + drivers/firmware/google/coreboot_table.c | 10 +++ drivers/firmware/google/coreboot_table.h | 60 +---------------- .../firmware/google/framebuffer-coreboot.c | 2 - include/linux/coreboot.h | 66 +++++++++++++++++++ 5 files changed, 78 insertions(+), 61 deletions(-) create mode 100644 include/linux/coreboot.h
MAINTAINERS +1 -0
@@ -10751,6 +10751,7 @@ L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git F: drivers/firmware/google/ +F: include/linux/coreboot.h GOOGLE TENSOR SoC SUPPORT M: Peter Griffin <[email protected]>
drivers/firmware/google/coreboot_table.c +10 -0
@@ -22,6 +22,16 @@#include "coreboot_table.h" +/* Coreboot table header structure */ +struct coreboot_table_header { +char signature[4 ]; +u32 header_bytes; +u32 header_checksum; +u32 table_bytes; +u32 table_checksum; +u32 table_entries; +}; +#define CB_DEV (d) container_of(d, struct coreboot_device, dev)#define CB_DRV (d) container_of_const(d, struct coreboot_driver, drv)
drivers/firmware/google/coreboot_table.h +1 -59
68 lines not on this page · raw message
drivers/firmware/google/framebuffer-coreboot.c +0 -2
@@ -21,8 +21,6 @@#include "coreboot_table.h" -#define CB_TAG_FRAMEBUFFER 0x12 -#if defined(CONFIG_PCI )static bool framebuffer_pci_dev_is_enabled (struct pci_dev *pdev) {
include/linux/coreboot.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 9/12 firmware: google: Pack structures for coreboot table entries
In reply to Thomas ZimmermannPack the fields in the coreboot table entries. These entries are part of the coreboot ABI, so they don't follow regular calling conventions. Fields of type u64 are aligned to boundaries of 4 bytes instead of 8. [1]
So far this has not been a problem. In the future, padding bytes should be added where explicit alignment is required.
---
v2:
- use aligned 64-bit type instead of __packed__ attribute (Julius)
--- include/linux/coreboot.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
include/linux/coreboot.h +6 -3
@@ -12,8 +12,11 @@#ifndef _LINUX_COREBOOT_H#define _LINUX_COREBOOT_H +#include <linux/compiler_attributes.h> #include <linux/types.h> +typedef __aligned(4) u64 cb_u64 ; +/* List of coreboot entry structures that is used */ #define CB_TAG_FRAMEBUFFER 0x12
@@ -30,7 +33,7 @@ struct lb_cbmem_ref {u32 tag;u32 size; -u64 cbmem_addr; +cb_u64 cbmem_addr; };/* Corresponds to LB_TAG_CBMEM_ENTRY */
@@ -38,7 +41,7 @@ struct lb_cbmem_entry {u32 tag;u32 size; -u64 address; +cb_u64 address;u32 entry_size;u32 id; };
@@ -48,7 +51,7 @@ struct lb_framebuffer {u32 tag;u32 size; -u64 physical_address; +cb_u64 physical_address;u32 x_resolution;u32 y_resolution;u32 bytes_per_line;
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 10/12 drm/sysfb: Generalize pixel-format matching
In reply to Thomas ZimmermannProvide drm_sysfb_get_format(), a helper that finds a specific DRM format from a list of pixel formats. The new function builds upon drm_sysfb_get_format_si(), which finds the DRM format from a given instance of struct screen_info. Now get the screen_info's pixel format in the caller. Allows for matching pixel formats in drivers without screen_info.
Convert the callers in efidrm and vesadrm to the new interface.
--- drivers/gpu/drm/sysfb/drm_sysfb.c | 24 +++++++++++++++ drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 8 ++--- drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c | 30 ------------------- drivers/gpu/drm/sysfb/efidrm.c | 8 ++++- drivers/gpu/drm/sysfb/vesadrm.c | 8 ++++- 5 files changed, 42 insertions(+), 36 deletions(-)
drivers/gpu/drm/sysfb/drm_sysfb.c +24 -0
@@ -31,5 +31,29 @@ int drm_sysfb_get_validated_int0(struct drm_device *dev, const char *name, }EXPORT_SYMBOL (drm_sysfb_get_validated_int0); +const struct drm_format_info *drm_sysfb_get_format (struct drm_device *dev, +const struct drm_sysfb_format *formats, +size_t nformats, +const struct pixel_format *pixel) +{ +const struct drm_format_info *format =NULL ; +size_t i; + +for (i =0 ; i < nformats; ++i) { +const struct drm_sysfb_format *f = &formats[i]; + +if (pixel_format_equal (pixel, &f->pixel)) { + format =drm_format_info (f->fourcc); +break ; + } + } + +if (!format) +drm_warn (dev,"No compatible color format found\n" ); + +return format; +} +EXPORT_SYMBOL (drm_sysfb_get_format); +MODULE_DESCRIPTION ("Helpers for DRM sysfb drivers" );MODULE_LICENSE ("GPL" );
drivers/gpu/drm/sysfb/drm_sysfb_helper.h +4 -4
@@ -36,6 +36,10 @@ int drm_sysfb_get_validated_int(struct drm_device *dev, const char *name, u64 value, u32 max);int drm_sysfb_get_validated_int0 (struct drm_device *dev,const char *name,u64 value,u32 max); +const struct drm_format_info *drm_sysfb_get_format (struct drm_device *dev, +const struct drm_sysfb_format *formats, +size_t nformats, +const struct pixel_format *pixel);#if defined(CONFIG_SCREEN_INFO )int drm_sysfb_get_width_si (struct drm_device *dev,const struct screen_info *si);
@@ -48,10 +52,6 @@ int drm_sysfb_get_stride_si(struct drm_device *dev, const struct screen_info *si unsigned int width, unsigned int height, u64 size);u64 drm_sysfb_get_visible_size_si (struct drm_device *dev,const struct screen_info *si,unsigned int height,unsigned int stride,u64 size); -const struct drm_format_info *drm_sysfb_get_format_si (struct drm_device *dev, -const struct drm_sysfb_format *formats, -size_t nformats, -const struct screen_info *si);#endif /*
drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c +0 -30
@@ -72,33 +72,3 @@ u64 drm_sysfb_get_visible_size_si(struct drm_device *dev, const struct screen_inreturn drm_sysfb_get_validated_size0 (dev,"visible size" , vsize, size); }EXPORT_SYMBOL (drm_sysfb_get_visible_size_si); - -const struct drm_format_info *drm_sysfb_get_format_si (struct drm_device *dev, -const struct drm_sysfb_format *formats, -size_t nformats, -const struct screen_info *si) -{ -const struct drm_format_info *format =NULL ; -struct pixel_format pixel; -size_t i; -int ret; - - ret =screen_info_pixel_format (si, &pixel); -if (ret) -return NULL ; - -for (i =0 ; i < nformats; ++i) { -const struct drm_sysfb_format *f = &formats[i]; - -if (pixel_format_equal (&pixel, &f->pixel)) { - format =drm_format_info (f->fourcc); -break ; - } - } - -if (!format) -drm_warn (dev,"No compatible color format found\n" ); - -return format; -} -EXPORT_SYMBOL (drm_sysfb_get_format_si);
drivers/gpu/drm/sysfb/efidrm.c +7 -1
@@ -45,8 +45,14 @@ static const struct drm_format_info *efidrm_get_format_si(struct drm_device *dev { PIXEL_FORMAT_XBGR8888, DRM_FORMAT_XBGR8888, }, { PIXEL_FORMAT_XRGB2101010, DRM_FORMAT_XRGB2101010, }, }; +struct pixel_format pixel; +int ret; + + ret =screen_info_pixel_format (si, &pixel); +if (ret) +return NULL ; -return drm_sysfb_get_format_si (dev, formats,ARRAY_SIZE (formats), si); +return drm_sysfb_get_format (dev, formats,ARRAY_SIZE (formats), &pixel); } static u64 efidrm_get_mem_flags(struct drm_device *dev, resource_size_t start,
drivers/gpu/drm/sysfb/vesadrm.c +7 -1
@@ -49,8 +49,14 @@ static const struct drm_format_info *vesadrm_get_format_si(struct drm_device *de { PIXEL_FORMAT_XBGR8888, DRM_FORMAT_XBGR8888, }, { PIXEL_FORMAT_C8, DRM_FORMAT_C8, }, }; +struct pixel_format pixel; +int ret; + + ret =screen_info_pixel_format (si, &pixel); +if (ret) +return NULL ; -return drm_sysfb_get_format_si (dev, formats,ARRAY_SIZE (formats), si); +return drm_sysfb_get_format (dev, formats,ARRAY_SIZE (formats), &pixel); }/*
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 11/12 drm/sysfb: corebootdrm: Add DRM driver for coreboot framebuffers
In reply to Thomas ZimmermannAdd corebootdrm, a DRM driver for coreboot framebuffers. The driver supports a pre-initialized framebuffer with various packed RGB formats. The driver code is fairly small and uses the same logic as the other sysfb drivers. Most of the implementation comes from existing sysfb helpers.
Until now, coreboot relied on simpledrm or simplefb for boot-up graphics output. Initialize the platform device for corebootdrm in the same place in framebuffer_probe(). With a later commit, the simple-framebuffer should be removed.
v4:
- sort include statements (Tzung-Bi)
v3:
- comment on _HAS_LFB semantics (Tzung-Bi)
- fix typo in commit description (Tzung-Bi)
- comment on simple-framebuffer being obsolete for coreboot v2:
- reimplement as platform driver
- limit resources and mappings to known framebuffer memory; no page alignment
- create corebootdrm device from coreboot framebuffer code
--- drivers/firmware/google/Kconfig | 3 +- .../firmware/google/framebuffer-coreboot.c | 22 +- drivers/gpu/drm/sysfb/Kconfig | 16 + drivers/gpu/drm/sysfb/Makefile | 1 + drivers/gpu/drm/sysfb/corebootdrm.c | 412 ++++++++++++++++++ include/linux/coreboot.h | 8 + 6 files changed, 458 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/sysfb/corebootdrm.c
drivers/firmware/google/Kconfig +2 -1
@@ -63,7 +63,8 @@ config GOOGLE_FRAMEBUFFER_COREBOOT help This option enables the kernel to search for a framebuffer in the coreboot table. If found, it is registered with a platform - device of type simple-framebuffer. + device of type coreboot-framebuffer. Using the old device of + type simple-framebuffer is deprecated. config GOOGLE_MEMCONSOLE_COREBOOT tristate "Firmware Memory Console"
drivers/firmware/google/framebuffer-coreboot.c +19 -3
@@ -76,22 +76,23 @@ static struct device *framebuffer_parent_dev(struct resource *res)return NULL ; } -static const struct simplefb_format formats[] =SIMPLEFB_FORMATS ; -static int framebuffer_probe (struct coreboot_device *dev) { -int i;struct lb_framebuffer *fb = &dev->framebuffer;struct device *parent;struct platform_device *pdev;struct resource res;int ret; +#if !IS_ENABLED (CONFIG_DRM_COREBOOTDRM )struct simplefb_platform_data pdata = { .width = fb->x_resolution, .height = fb->y_resolution, .stride = fb->bytes_per_line, .format =NULL , }; +int i; +static const struct simplefb_format formats[] =SIMPLEFB_FORMATS ; +#endif /* * On coreboot systems, the advertised LB_TAG_FRAMEBUFFER entry
@@ -118,6 +119,20 @@ static int framebuffer_probe(struct coreboot_device *dev)if (IS_ERR (parent))return PTR_ERR (parent); +#if IS_ENABLED (CONFIG_DRM_COREBOOTDRM ) + pdev =platform_device_register_resndata (parent,"coreboot-framebuffer" ,0 , + &res,1 , fb, fb->size); +if (IS_ERR (pdev)) { +pr_warn ("coreboot: could not register framebuffer\n" ); + ret =PTR_ERR (pdev); + goto out_put_device_parent; + } +#else +/* +* FIXME: Coreboot systems should use a driver that binds to +* coreboot-framebuffer devices. Remove support for +* simple-framebuffer at some point. +*/ for (i =0 ; i <ARRAY_SIZE (formats); ++i) { if (fb->bits_per_pixel == formats[i].bits_per_pixel && fb->red_mask_pos == formats[i].red.offset &&
@@ -142,6 +157,7 @@ static int framebuffer_probe(struct coreboot_device *dev)pr_warn ("coreboot: could not register framebuffer\n" ); goto out_put_device_parent; } +#endif ret =0 ;
drivers/gpu/drm/sysfb/Kconfig +16 -0
@@ -7,6 +7,22 @@ config DRM_SYSFB_HELPER tristate depends on DRM +config DRM_COREBOOTDRM + tristate "Coreboot framebuffer driver" + depends on DRM && MMU + depends on GOOGLE_FRAMEBUFFER_COREBOOT + select APERTURE_HELPERS + select DRM_CLIENT_SELECTION + select DRM_GEM_SHMEM_HELPER + select DRM_KMS_HELPER + select DRM_SYSFB_HELPER + help + DRM driver for coreboot-provided framebuffers. + + This driver assumes that the display hardware has been initialized + by coreboot firmware before the kernel boots. Scanout buffer, size, + and display format must be provided via coreboot framebuffer device. + config DRM_EFIDRM tristate "EFI framebuffer driver" depends on DRM && MMU && EFI && (!SYSFB_SIMPLEFB || COMPILE_TEST)
drivers/gpu/drm/sysfb/Makefile +1 -0
@@ -6,6 +6,7 @@ drm_sysfb_helper-y := \ drm_sysfb_helper-$(CONFIG_SCREEN_INFO) += drm_sysfb_screen_info.o obj-$(CONFIG_DRM_SYSFB_HELPER) += drm_sysfb_helper.o +obj-$(CONFIG_DRM_COREBOOTDRM) += corebootdrm.o obj-$(CONFIG_DRM_EFIDRM) += efidrm.o obj-$(CONFIG_DRM_OFDRM) += ofdrm.o obj-$(CONFIG_DRM_SIMPLEDRM) += simpledrm.o
drivers/gpu/drm/sysfb/corebootdrm.c new file +412 -0
412 lines not on this page · raw message
include/linux/coreboot.h +8 -0
@@ -13,6 +13,7 @@#define _LINUX_COREBOOT_H#include <linux/compiler_attributes.h> +#include <linux/stddef.h> #include <linux/types.h> typedef __aligned(4) u64 cb_u64 ;
@@ -66,4 +67,11 @@ struct lb_framebuffer { u8 reserved_mask_size; }; +/* +* True if the coreboot-provided data is large enough to hold information +* on the linear framebuffer. False otherwise. +*/ +#define LB_FRAMEBUFFER_HAS_LFB (__fb) \ + ((__fb)->size >= offsetofend(struct lb_framebuffer, reserved_mask_size)) +#endif /* _LINUX_COREBOOT_H */
Signature · 1 line
2.52.0
Thomas Zimmermann
maintainerPATCH v4 12/12 drm/sysfb: corebootdrm: Support panel orientation
In reply to Thomas ZimmermannAdd fields and constants for coreboot framebuffer orientation. Set corebootdrm's DRM connector state from the values. Not all firmware provides orientation, so make it optional. Systems without, continue to use unknown orientation.
v3:
- comment on _HAS_ORIENTATION semantics (Tzung-Bi)
--- drivers/gpu/drm/sysfb/corebootdrm.c | 30 +++++++++++++++++++++++++---- include/linux/coreboot.h | 13 +++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-)
drivers/gpu/drm/sysfb/corebootdrm.c +26 -4
@@ -110,6 +110,26 @@ static phys_addr_t corebootdrm_get_address_fb(struct drm_device *dev, resource_sreturn fb->physical_address; } +static enum drm_panel_orientation corebootdrm_get_orientation_fb (struct drm_device *dev, +const struct lb_framebuffer *fb) +{ +if (!LB_FRAMEBUFFER_HAS_ORIENTATION (fb)) +return DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; + +switch (fb->orientation) { +case LB_FRAMEBUFFER_ORIENTATION_NORMAL : +return DRM_MODE_PANEL_ORIENTATION_NORMAL ; +case LB_FRAMEBUFFER_ORIENTATION_BOTTOM_UP : +return DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP ; +case LB_FRAMEBUFFER_ORIENTATION_LEFT_UP : +return DRM_MODE_PANEL_ORIENTATION_LEFT_UP ; +case LB_FRAMEBUFFER_ORIENTATION_RIGHT_UP : +return DRM_MODE_PANEL_ORIENTATION_RIGHT_UP ; + } + +return DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; +} +/* * Simple Framebuffer device */
@@ -168,7 +188,8 @@ static const struct drm_mode_config_funcs corebootdrm_mode_config_funcs = { DRM_SYSFB_MODE_CONFIG_FUNCS, }; -static int corebootdrm_mode_config_init (struct corebootdrm_device *cdev) +static int corebootdrm_mode_config_init (struct corebootdrm_device *cdev, +enum drm_panel_orientation orientation) {struct drm_sysfb_device *sysfb = &cdev->sysfb;struct drm_device *dev = &sysfb->dev;
@@ -234,8 +255,7 @@ static int corebootdrm_mode_config_init(struct corebootdrm_device *cdev)if (ret)return ret;drm_connector_helper_add (connector, &corebootdrm_connector_helper_funcs); -drm_connector_set_panel_orientation_with_quirk (connector, -DRM_MODE_PANEL_ORIENTATION_UNKNOWN , +drm_connector_set_panel_orientation_with_quirk (connector, orientation, width, height); ret =drm_connector_attach_encoder (connector, encoder);
@@ -276,6 +296,7 @@ static int corebootdrm_probe(struct platform_device *pdev)int width, height, pitch;resource_size_t size;phys_addr_t address; +enum drm_panel_orientation orientation;struct resource *res, *mem =NULL ;struct resource aperture;void __iomem *screen_base;
@@ -320,6 +341,7 @@ static int corebootdrm_probe(struct platform_device *pdev) address =corebootdrm_get_address_fb (dev, size, fb);if (!address)return -EINVAL ; + orientation =corebootdrm_get_orientation_fb (dev, fb); sysfb->fb_mode =drm_sysfb_mode (width, height,0 ,0 ); sysfb->fb_format = format;
@@ -375,7 +397,7 @@ static int corebootdrm_probe(struct platform_device *pdev)* DRM mode setting and registration */ - ret =corebootdrm_mode_config_init (cdev); + ret =corebootdrm_mode_config_init (cdev, orientation);if (ret)return ret;
include/linux/coreboot.h +13 -0
@@ -47,6 +47,11 @@ struct lb_cbmem_entry {u32 id; }; +#define LB_FRAMEBUFFER_ORIENTATION_NORMAL 0 +#define LB_FRAMEBUFFER_ORIENTATION_BOTTOM_UP 1 +#define LB_FRAMEBUFFER_ORIENTATION_LEFT_UP 2 +#define LB_FRAMEBUFFER_ORIENTATION_RIGHT_UP 3 +/* Describes framebuffer setup by coreboot */ struct lb_framebuffer {u32 tag;
@@ -65,6 +70,7 @@ struct lb_framebuffer {u8 blue_mask_size;u8 reserved_mask_pos;u8 reserved_mask_size; +u8 orientation; };/*
@@ -74,4 +80,11 @@ struct lb_framebuffer {#define LB_FRAMEBUFFER_HAS_LFB (__fb) \ ((__fb)->size >= offsetofend(struct lb_framebuffer, reserved_mask_size)) +/* +* True if the coreboot-provided data is large enough to hold information +* on the display orientation. False otherwise. +*/ +#define LB_FRAMEBUFFER_HAS_ORIENTATION (__fb) \ + ((__fb)->size >= offsetofend(struct lb_framebuffer, orientation)) +#endif /* _LINUX_COREBOOT_H */
Signature · 1 line
2.52.0