2023-07-10 18:35:34

by Rob Herring

[permalink] [raw]
Subject: [PATCH] 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.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328
Link: https://bugs.debian.org/1033058
Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc: [email protected]
Cc: Cyril Brulebois <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: Helge Deller <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
---
drivers/of/platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 051e29b7ad2b..0c3475e7d2ff 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -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;
--
2.40.1



2023-07-11 06:21:18

by Thomas Zimmermann

[permalink] [raw]
Subject: Re: [PATCH] of: Preserve "of-display" device name for compatibility



Am 10.07.23 um 19:40 schrieb 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.
>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328
> Link: https://bugs.debian.org/1033058
> Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique")
> Cc: [email protected]
> Cc: Cyril Brulebois <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Helge Deller <[email protected]>
> Signed-off-by: Rob Herring <[email protected]>

Acked-by: Thomas Zimmermann <[email protected]>

> ---
> drivers/of/platform.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/of/platform.c b/drivers/of/platform.c
> index 051e29b7ad2b..0c3475e7d2ff 100644
> --- a/drivers/of/platform.c
> +++ b/drivers/of/platform.c
> @@ -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;

--
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)


Attachments:
OpenPGP_signature (855.00 B)
OpenPGP digital signature

2023-07-11 16:21:06

by Helge Deller

[permalink] [raw]
Subject: Re: [PATCH] of: Preserve "of-display" device name for compatibility

On 7/11/23 08:00, Thomas Zimmermann wrote:
>
>
> Am 10.07.23 um 19:40 schrieb 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.
>>
>> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328
>> Link: https://bugs.debian.org/1033058
>> Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique")
>> Cc: [email protected]
>> Cc: Cyril Brulebois <[email protected]>
>> Cc: Thomas Zimmermann <[email protected]>
>> Cc: Helge Deller <[email protected]>
>> Signed-off-by: Rob Herring <[email protected]>
>
> Acked-by: Thomas Zimmermann <[email protected]>

Acked-by: Helge Deller <[email protected]>

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

Helge

>
>> ---
>>   drivers/of/platform.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/of/platform.c b/drivers/of/platform.c
>> index 051e29b7ad2b..0c3475e7d2ff 100644
>> --- a/drivers/of/platform.c
>> +++ b/drivers/of/platform.c
>> @@ -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;
>


2023-07-11 17:14:09

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH] of: Preserve "of-display" device name for compatibility

On Tue, Jul 11, 2023 at 9:46 AM Helge Deller <[email protected]> wrote:
>
> On 7/11/23 08:00, Thomas Zimmermann wrote:
> >
> >
> > Am 10.07.23 um 19:40 schrieb 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.
> >>
> >> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328
> >> Link: https://bugs.debian.org/1033058
> >> Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique")
> >> Cc: [email protected]
> >> Cc: Cyril Brulebois <[email protected]>
> >> Cc: Thomas Zimmermann <[email protected]>
> >> Cc: Helge Deller <[email protected]>
> >> Signed-off-by: Rob Herring <[email protected]>
> >
> > Acked-by: Thomas Zimmermann <[email protected]>
>
> Acked-by: Helge Deller <[email protected]>
>
> 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