Skip to contentSkip to conversation

of: Preserve "of-display" device name for compatibility

PATCH In review Rob Herring 4 participants 5 messages Jul 10, 2023 – Jul 11, 2023

Subsystems (3)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 of: Preserve "of-display" device name for compatibility

Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), as spotted by Frédéric Bonnard, the historical "of-display" device is
gone: the updated logic creates "of-display.0" instead, then as many "of-display.N" as required.

This means that offb no longer finds the expected device, which prevents the Debian Installer from setting up its interface, at least on ppc64el.

Fix this by keeping "of-display" for the first device and "of-display.N" for subsequent devices.

Fixes 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc Cyril Brulebois <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Helge Deller <[email protected]>
---
 drivers/of/platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/platform.c +1 -1
index 051e29b7ad2b..0c3475e7d2ff 100644
@@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void)
 			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.0", NULL);
+			dev = of_platform_device_create(node, "of-display", NULL);
 			of_node_put(node);
 			if (WARN_ON(!dev))
 				return -ENOMEM;
Signature · 1 line
2.40.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Rob Herring

Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), as spotted by Frédéric Bonnard, the historical "of-display" device is
gone: the updated logic creates "of-display.0" instead, then as many "of-display.N" as required.

This means that offb no longer finds the expected device, which prevents the Debian Installer from setting up its interface, at least on ppc64el.

Fix this by keeping "of-display" for the first device and "of-display.N" for subsequent devices.

Quoted 8 lines
Fixes 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc Cyril Brulebois <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Helge Deller <[email protected]>

This is exclusive with the other patchset that updates the other side:
https://lore.kernel.org/lkml/[email protected]/

Thanks

Michal

Quoted 20 lines
---
 drivers/of/platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/platform.c +1 -1
index 051e29b7ad2b..0c3475e7d2ff 100644
@@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void)
 			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.0", NULL);
+			dev = of_platform_device_create(node, "of-display", NULL);
 			of_node_put(node);
 			if (WARN_ON(!dev))
 				return -ENOMEM;
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#2 lore raw
In reply to Rob Herring

Am 10.07.23 um 19:40 schrieb Rob Herring:

Quoted 11 lines

Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), as spotted by Frédéric Bonnard, the historical "of-display" device is
gone: the updated logic creates "of-display.0" instead, then as many "of-display.N" as required.

This means that offb no longer finds the expected device, which prevents the Debian Installer from setting up its interface, at least on ppc64el.

Fix this by keeping "of-display" for the first device and "of-display.N" for subsequent devices.

Quoted 8 lines
Fixes 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc Cyril Brulebois <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Helge Deller <[email protected]>
Quoted 17 lines
---
  drivers/of/platform.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/platform.c +1 -1
index 051e29b7ad2b..0c3475e7d2ff 100644
@@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void)
  			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.0", NULL);
+			dev = of_platform_device_create(node, "of-display", NULL);
  			of_node_put(node);
  			if (WARN_ON(!dev))
  				return -ENOMEM;
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
maintainer Acked-by
#3 lore raw
Quoted 23 lines · Thomas Zimmermann

Am 10.07.23 um 19:40 schrieb Rob Herring:

Quoted 11 lines

Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), as spotted by Frédéric Bonnard, the historical "of-display" device is
gone: the updated logic creates "of-display.0" instead, then as many "of-display.N" as required.

This means that offb no longer finds the expected device, which prevents the Debian Installer from setting up its interface, at least on ppc64el.

Fix this by keeping "of-display" for the first device and "of-display.N" for subsequent devices.

Quoted 8 lines
Fixes 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc Cyril Brulebois <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Helge Deller <[email protected]>
Quoted 1 line

Who will pick up that patch?
Shall I take it via fbdev git tree?

Helge

Quoted 19 lines
Quoted 18 lines

---
  drivers/of/platform.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/platform.c +0 -0
index 051e29b7ad2b..0c3475e7d2ff 100644
@@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void)

              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.0", NULL); +            dev = of_platform_device_create(node, "of-display", NULL); of_node_put(node);
              if (WARN_ON(!dev))
                  return -ENOMEM;

author maintainer
#4 lore raw
Quoted 25 lines · Helge Deller
Quoted 23 lines · Thomas Zimmermann

Am 10.07.23 um 19:40 schrieb Rob Herring:

Quoted 19 lines

Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), as spotted by Frédéric Bonnard, the historical "of-display" device is
gone: the updated logic creates "of-display.0" instead, then as many "of-display.N" as required.

This means that offb no longer finds the expected device, which prevents the Debian Installer from setting up its interface, at least on ppc64el.

Fix this by keeping "of-display" for the first device and "of-display.N" for subsequent devices.

Fixes 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc Cyril Brulebois <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Helge Deller <[email protected]>
Quoted 6 lines
Quoted 1 line

Who will pick up that patch?
Shall I take it via fbdev git tree?

I'll take it. I've got other fixes queued up already.

Rob