of: Register platform device for each framebuffer
Subsystems (3)
v2 cover of: Register platform device for each framebuffer
Move the detection of OF framebuffers from fbdev into of platform code and register a Linux platform device for each framebuffer. Allows for DRM-based OF drivers and real hot-unplugging of the framebuffer.
This patchset has been tested with qemu's ppc64le emulation, which provides a framebuffer via OF display node. If someone has an older 32-bit system with BootX available, please test.
v2:
* integrate PPC code into generic platform setup (Rob)
* keep !device workaround with a warning (Javier, Daniel)
Thomas Zimmermann (2):
of: Create platform devices for OF framebuffers
fbdev: Warn in hot-unplug workaround for framebuffers without device
drivers/of/platform.c | 88 +++++++++++++++++++++------- drivers/video/fbdev/core/fbmem.c | 10 ++-- drivers/video/fbdev/offb.c | 98 +++++++++++++++++++++----------- 3 files changed, 136 insertions(+), 60 deletions(-)
base-commit: d97978df553d768e457cb68c637b2b0a6188b87c
prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: 6e1032c6302461624f33194c8b8f37103a3fa6ef
prerequisite-patch-id: 3f204510fcbf9530d6540bd8e6128cce598988b6
prerequisite-patch-id: ab7611d28d07723ab1dd392dcf9a6345de3b1040
Signature · 1 line
2.35.1
PATCH v2 1/2 of: Create platform devices for OF framebuffers
Create a platform device for each OF-declared framebuffer and have offb bind to these devices. Allows for real hot-unplugging and other drivers besides offb.
Originally, offb created framebuffer devices while initializing its module by parsing the OF device tree. No actual Linux device was set up. This tied OF framebuffers to offb and makes writing other drivers for the OF framebuffers complicated. The absence of a Linux device further prevented real hot-unplugging. Adding a distinct platform device for each OF framebuffer solves both problems. Specifically, a DRM driver can now provide graphics output for modern userspace.
Some of the offb init code is now located in the OF initialization. There's now also an implementation of of_platform_default_populate_init(), which was missing before. The OF side creates different devices for either OF display nodes or BootX displays as they require different handling by the driver. The offb drivers picks up each type of device and runs the appropriate fbdev initialization.
Tested with OF display nodes on qemu's ppc64le target.
v2:
* run PPC code as part of existing initialization (Rob)
* add a few more error warnings (Javier)
--- drivers/of/platform.c | 88 ++++++++++++++++++++++++++-------- drivers/video/fbdev/offb.c | 98 +++++++++++++++++++++++++------------- 2 files changed, 132 insertions(+), 54 deletions(-)
drivers/of/platform.c +67 -21
@@ -507,7 +507,6 @@ int of_platform_default_populate(struct device_node *root, }EXPORT_SYMBOL_GPL (of_platform_default_populate); -#ifndef CONFIG_PPC static const struct of_device_id reserved_mem_matches[] = { { .compatible ="qcom,rmtfs-mem" }, { .compatible ="qcom,cmd-db" },
@@ -520,33 +519,81 @@ static const struct of_device_id reserved_mem_matches[] = {static int __init of_platform_default_populate_init (void ) { -struct device_node *node; -device_links_supplier_sync_state_pause ();if (!of_have_populated_dt ())return -ENODEV ; -/* -* Handle certain compatibles explicitly, since we don't want to create -* platform_devices for every node in /reserved-memory with a -* "compatible", -*/ -for_each_matching_node (node, reserved_mem_matches) -of_platform_device_create (node,NULL ,NULL ); +if (IS_ENABLED (CONFIG_PPC )) { +struct device_node *boot_display =NULL ; +struct device_node *node; +struct platform_device *dev; +int ret; + +/* Check if we have a MacOS display without a node spec */ +if (of_get_property (of_chosen,"linux,bootx-noscreen" ,NULL )) { +/* +* The old code tried to work out which node was the MacOS +* display based on the address. I'm dropping that since the +* lack of a node spec only happens with old BootX versions +* (users can update) and with this code, they'll still get +* a display (just not the palette hacks). +*/ + dev =platform_device_alloc ("bootx-noscreen" ,0 ); +if (WARN_ON (!dev)) +return -ENOMEM ; + ret =platform_device_add (dev); +if (WARN_ON (ret)) { +platform_device_put (dev); +return ret; + } + } - node =of_find_node_by_path ("/firmware" ); -if (node) { -of_platform_populate (node,NULL ,NULL ,NULL ); -of_node_put (node); - } +/* +* For OF framebuffers, first create the device for the boot display, +* then for the other framebuffers. Only fail for the boot display; +* ignore errors for the rest. +*/ +for_each_node_by_type (node,"display" ) { +if (!of_get_property (node,"linux,opened" ,NULL ) || + !of_get_property (node,"linux,boot-display" ,NULL )) +continue ; + dev =of_platform_device_create (node,"of-display" ,NULL ); +if (WARN_ON (!dev)) +return -ENOMEM ; + boot_display = node; +break ; + } +for_each_node_by_type (node,"display" ) { +if (!of_get_property (node,"linux,opened" ,NULL ) || node == boot_display) +continue ; +of_platform_device_create (node,"of-display" ,NULL ); + } - node =of_get_compatible_child (of_chosen,"simple-framebuffer" ); -of_platform_device_create (node,NULL ,NULL ); -of_node_put (node); + }else { +struct device_node *node; + +/* +* Handle certain compatibles explicitly, since we don't want to create +* platform_devices for every node in /reserved-memory with a +* "compatible", +*/ +for_each_matching_node (node, reserved_mem_matches) +of_platform_device_create (node,NULL ,NULL ); -/* Populate everything else. */ -of_platform_default_populate (NULL ,NULL ,NULL ); + node =of_find_node_by_path ("/firmware" ); +if (node) { +of_platform_populate (node,NULL ,NULL ,NULL ); +of_node_put (node); + } + + node =of_get_compatible_child (of_chosen,"simple-framebuffer" ); +of_platform_device_create (node,NULL ,NULL ); +of_node_put (node); + +/* Populate everything else. */ +of_platform_default_populate (NULL ,NULL ,NULL ); + }return 0 ; }
@@ -558,7 +605,6 @@ static int __init of_platform_sync_state_init(void)return 0 ; }late_initcall_sync (of_platform_sync_state_init); -#endif int of_platform_device_destroy (struct device *dev,void *data) {
drivers/video/fbdev/offb.c +65 -33
140 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH v2 1/2] of: Create platform devices for OF framebuffers
Quoted 45 lines · Thomas Zimmermann
Create a platform device for each OF-declared framebuffer and have offb bind to these devices. Allows for real hot-unplugging and other drivers besides offb.
Originally, offb created framebuffer devices while initializing its module by parsing the OF device tree. No actual Linux device was set up. This tied OF framebuffers to offb and makes writing other drivers for the OF framebuffers complicated. The absence of a Linux device further prevented real hot-unplugging. Adding a distinct platform device for each OF framebuffer solves both problems. Specifically, a DRM driver can now provide graphics output for modern userspace.
Some of the offb init code is now located in the OF initialization. There's now also an implementation of
of_platform_default_populate_init(), which was missing before. The OF side creates different devices for either OF display nodes or BootX displays as they require different handling by the driver. The offb drivers picks up each type of device and runs the appropriate fbdev initialization.Tested with OF display nodes on qemu's ppc64le target.
v2:
* run PPC code as part of existing initialization (Rob)
* add a few more error warnings (Javier)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>--- drivers/of/platform.c | 88 ++++++++++++++++++++++++++-------- drivers/video/fbdev/offb.c | 98 +++++++++++++++++++++++++------------- 2 files changed, 132 insertions(+), 54 deletions(-)drivers/of/platform.c +0
-1@@ -507,7 +507,6 @@ int of_platform_default_populate(struct device_node *root, }EXPORT_SYMBOL_GPL (of_platform_default_populate); -#ifndef CONFIG_PPC static const struct of_device_id reserved_mem_matches[] = { { .compatible ="qcom,rmtfs-mem" }, { .compatible ="qcom,cmd-db" },
drivers/of/platform.c static const struct of_device_id reserved_mem_matches[] = { · line 524
Quoted 5 lines
drivers/of/platform.c +0
-2@@ -520,33 +519,81 @@ static const struct of_device_id reserved_mem_matches[] = {static int __init of_platform_default_populate_init (void ) { -struct device_node *node; -
As both if/else clauses need 'node', I'd keep this declared here.
Quoted 78 lines
drivers/of/platform.c +54
-16device_links_supplier_sync_state_pause ();if (!of_have_populated_dt ())return -ENODEV ; -/* -* Handle certain compatibles explicitly, since we don't want to create -* platform_devices for every node in /reserved-memory with a -* "compatible", -*/ -for_each_matching_node (node, reserved_mem_matches) -of_platform_device_create (node,NULL ,NULL ); +if (IS_ENABLED (CONFIG_PPC )) { +struct device_node *boot_display =NULL ; +struct device_node *node; +struct platform_device *dev; +int ret; + +/* Check if we have a MacOS display without a node spec */ +if (of_get_property (of_chosen,"linux,bootx-noscreen" ,NULL )) { +/* +* The old code tried to work out which node was the MacOS +* display based on the address. I'm dropping that since the +* lack of a node spec only happens with old BootX versions +* (users can update) and with this code, they'll still get +* a display (just not the palette hacks). +*/ + dev =platform_device_alloc ("bootx-noscreen" ,0 ); +if (WARN_ON (!dev)) +return -ENOMEM ; + ret =platform_device_add (dev); +if (WARN_ON (ret)) { +platform_device_put (dev); +return ret; + } + } - node =of_find_node_by_path ("/firmware" ); -if (node) { -of_platform_populate (node,NULL ,NULL ,NULL ); -of_node_put (node); - } +/* +* For OF framebuffers, first create the device for the boot display, +* then for the other framebuffers. Only fail for the boot display; +* ignore errors for the rest. +*/ +for_each_node_by_type (node,"display" ) { +if (!of_get_property (node,"linux,opened" ,NULL ) || + !of_get_property (node,"linux,boot-display" ,NULL )) +continue ; + dev =of_platform_device_create (node,"of-display" ,NULL ); +if (WARN_ON (!dev)) +return -ENOMEM ; + boot_display = node; +break ; + } +for_each_node_by_type (node,"display" ) { +if (!of_get_property (node,"linux,opened" ,NULL ) || node == boot_display) +continue ; +of_platform_device_create (node,"of-display" ,NULL ); + } - node =of_get_compatible_child (of_chosen,"simple-framebuffer" ); -of_platform_device_create (node,NULL ,NULL ); -of_node_put (node); + }else { +struct device_node *node; + +/* +* Handle certain compatibles explicitly, since we don't want to create +* platform_devices for every node in /reserved-memory with a +* "compatible", +*/ +for_each_matching_node (node, reserved_mem_matches) +of_platform_device_create (node,NULL ,NULL ); -/* Populate everything else. */
drivers/of/platform.c static const struct of_device_id reserved_mem_matches[] = { · line 592
Quoted 10 lines
drivers/of/platform.c +9
-1-of_platform_default_populate (NULL ,NULL ,NULL ); + node =of_find_node_by_path ("/firmware" ); +if (node) { +of_platform_populate (node,NULL ,NULL ,NULL ); +of_node_put (node); + } + + node =of_get_compatible_child (of_chosen,"simple-framebuffer" ); +of_platform_device_create (node,NULL ,NULL ); +of_node_put (node);
In v1, you supported "simple-framebuffer" on PPC. Don't we want to allow that? Maybe no one cares ATM, but that could change. Either way:
Quoted 15 lines
drivers/of/platform.c +4
-1+ +/* Populate everything else. */ +of_platform_default_populate (NULL ,NULL ,NULL ); + }return 0 ; }@@ -558,7 +605,6 @@ static int __init of_platform_sync_state_init(void)return 0 ; }late_initcall_sync (of_platform_sync_state_init); -#endif int of_platform_device_destroy (struct device *dev,void *data) {
Re: [PATCH v2 1/2] of: Create platform devices for OF framebuffers
Hi
Am 19.04.22 um 15:30 schrieb Rob Herring:
...
Quoted 6 lines
Quoted 6 lines
drivers/of/platform.c +0
-1-#ifndef CONFIG_PPC static const struct of_device_id reserved_mem_matches[] = { { .compatible ="qcom,rmtfs-mem" }, { .compatible ="qcom,cmd-db" },@@ -520,33 +519,81 @@ static const struct of_device_id reserved_mem_matches[] = {
Quoted 6 lines
drivers/of/platform.c static const struct of_device_id reserved_mem_matches[] = { · line 524
Quoted 4 lines
drivers/of/platform.c +0
-2static int __init of_platform_default_populate_init (void ) { -struct device_node *node; -As both if/else clauses need 'node', I'd keep this declared here.
Ok.
Quoted 78 lines
Quoted 78 lines
drivers/of/platform.c +54
-15device_links_supplier_sync_state_pause ();if (!of_have_populated_dt ())return -ENODEV ; -/* -* Handle certain compatibles explicitly, since we don't want to create -* platform_devices for every node in /reserved-memory with a -* "compatible", -*/ -for_each_matching_node (node, reserved_mem_matches) -of_platform_device_create (node,NULL ,NULL ); +if (IS_ENABLED (CONFIG_PPC )) { +struct device_node *boot_display =NULL ; +struct device_node *node; +struct platform_device *dev; +int ret; + +/* Check if we have a MacOS display without a node spec */ +if (of_get_property (of_chosen,"linux,bootx-noscreen" ,NULL )) { +/* +* The old code tried to work out which node was the MacOS +* display based on the address. I'm dropping that since the +* lack of a node spec only happens with old BootX versions +* (users can update) and with this code, they'll still get +* a display (just not the palette hacks). +*/ + dev =platform_device_alloc ("bootx-noscreen" ,0 ); +if (WARN_ON (!dev)) +return -ENOMEM ; + ret =platform_device_add (dev); +if (WARN_ON (ret)) { +platform_device_put (dev); +return ret; + } + } - node =of_find_node_by_path ("/firmware" ); -if (node) { -of_platform_populate (node,NULL ,NULL ,NULL ); -of_node_put (node); - } +/* +* For OF framebuffers, first create the device for the boot display, +* then for the other framebuffers. Only fail for the boot display; +* ignore errors for the rest. +*/ +for_each_node_by_type (node,"display" ) { +if (!of_get_property (node,"linux,opened" ,NULL ) || + !of_get_property (node,"linux,boot-display" ,NULL )) +continue ; + dev =of_platform_device_create (node,"of-display" ,NULL ); +if (WARN_ON (!dev)) +return -ENOMEM ; + boot_display = node; +break ; + } +for_each_node_by_type (node,"display" ) { +if (!of_get_property (node,"linux,opened" ,NULL ) || node == boot_display) +continue ; +of_platform_device_create (node,"of-display" ,NULL ); + } - node =of_get_compatible_child (of_chosen,"simple-framebuffer" ); -of_platform_device_create (node,NULL ,NULL ); -of_node_put (node); + }else { +struct device_node *node; + +/* +* Handle certain compatibles explicitly, since we don't want to create +* platform_devices for every node in /reserved-memory with a +* "compatible", +*/ +for_each_matching_node (node, reserved_mem_matches) +of_platform_device_create (node,NULL ,NULL );
Quoted 14 lines
drivers/of/platform.c static const struct of_device_id reserved_mem_matches[] = { · line 592
Quoted 11 lines
drivers/of/platform.c +9
-2-/* Populate everything else. */ -of_platform_default_populate (NULL ,NULL ,NULL ); + node =of_find_node_by_path ("/firmware" ); +if (node) { +of_platform_populate (node,NULL ,NULL ,NULL ); +of_node_put (node); + } + + node =of_get_compatible_child (of_chosen,"simple-framebuffer" ); +of_platform_device_create (node,NULL ,NULL ); +of_node_put (node);In v1, you supported "simple-framebuffer" on PPC. Don't we want to allow that? Maybe no one cares ATM, but that could change. Either way:
Support for these framebuffers has always been mutually exclusive. The offb driver, which originally contained the code, depends on CONFIG_PPC. And PPC never supported simple-framebuffer anywhere.
Quoted 2 lines
Reviewed-by Rob Herring <[email protected]>
Thank you.
Best regards
Thomas
Quoted 17 lines
Quoted 17 lines
drivers/of/platform.c +4
-1+ +/* Populate everything else. */ +of_platform_default_populate (NULL ,NULL ,NULL ); + }return 0 ; }@@ -558,7 +605,6 @@ static int __init of_platform_sync_state_init(void)return 0 ; }late_initcall_sync (of_platform_sync_state_init); -#endif int of_platform_device_destroy (struct device *dev,void *data) {
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
PATCH v2 2/2 fbdev: Warn in hot-unplug workaround for framebuffers without device
In reply to Thomas ZimmermannA workaround makes fbdev hot-unplugging work for framebuffers without device. The only user for this feature was offb. As each OF framebuffer now has an associated platform device, the workaround hould no longer be triggered. Update it with a warning and rewrite the comment. Fbdev drivers that trigger the hot-unplug workaround really need to be fixed.
--- drivers/video/fbdev/core/fbmem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/video/fbdev/core/fbmem.c +4 -6
@@ -1577,14 +1577,12 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,* allocate the memory range. * * If it's not a platform device, at least print a warning. A -* fix would add code to remove the device from the system. +* fix would add code to remove the device from the system. For +* framebuffers without any Linux device, print a warning as +* well. */ if (!device) { -/* TODO: Represent each OF framebuffer as its own -* device in the device hierarchy. For now, offb -* doesn't have such a device, so unregister the -* framebuffer as before without warning. -*/ +pr_warn ("fb%d: no device set\n" , i);do_unregister_framebuffer (registered_fb[i]); }else if (dev_is_platform (device)) { registered_fb[i]->forced_out = true;
Signature · 1 line
2.35.1
Re: [PATCH v2 2/2] fbdev: Warn in hot-unplug workaround for framebuffers without device
Hello Thomas,
Thanks a lot for re-spinning your series.
Quoted 9 lines · Thomas Zimmermann
A workaround makes fbdev hot-unplugging work for framebuffers without device. The only user for this feature was offb. As each OF framebuffer now has an associated platform device, the workaround hould no longer be triggered. Update it with a warning and rewrite the comment. Fbdev drivers that trigger the hot-unplug workaround really need to be fixed.
Signed-off-by Thomas Zimmermann <[email protected]>Suggested-by Javier Martinez Canillas <[email protected]>---
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat