| Message ID | 20181207125844.18775-1-malat@debian.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | video: offb: Pass actual name in offb_init_palette_hacks | expand |
Rob, any comment ? On Fri, Dec 7, 2018 at 1:59 PM Mathieu Malaterre <malat@debian.org> wrote: > > This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to > using %pOFn instead of device_node.name"). This is the minimal work to > get a Mac Mini G4 back to a bootable state. The function > offb_init_palette_hacks would need to handle the case where `name` has > been set to NULL. > > Cc: Rob Herring <robh@kernel.org> > Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name") > Cc: stable@vger.kernel.org # v4.19+ > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > drivers/video/fbdev/offb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c > index 31f769d67195..6e75851f8142 100644 > --- a/drivers/video/fbdev/offb.c > +++ b/drivers/video/fbdev/offb.c > @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) > /* kludge for valkyrie */ > if (strcmp(dp->name, "valkyrie") == 0) > address += 0x1000; > - offb_init_fb(no_real_node ? "bootx" : NULL, > + offb_init_fb(no_real_node ? "bootx" : dp->name, > width, height, depth, pitch, address, > foreign_endian, no_real_node ? NULL : dp); > } > -- > 2.19.2 >
Patch is far from perfect but was tested also by: Elimar Riesebieter riesebie@lxtec.de Le jeu. 20 déc. 2018 17:10, Mathieu Malaterre <malat@debian.org> a écrit : > Rob, any comment ? > > On Fri, Dec 7, 2018 at 1:59 PM Mathieu Malaterre <malat@debian.org> wrote: > > > > This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to > > using %pOFn instead of device_node.name"). This is the minimal work to > > get a Mac Mini G4 back to a bootable state. The function > > offb_init_palette_hacks would need to handle the case where `name` has > > been set to NULL. > > > > Cc: Rob Herring <robh@kernel.org> > > Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of > device_node.name") > > Cc: stable@vger.kernel.org # v4.19+ > > Signed-off-by: Mathieu Malaterre <malat@debian.org> > > --- > > drivers/video/fbdev/offb.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c > > index 31f769d67195..6e75851f8142 100644 > > --- a/drivers/video/fbdev/offb.c > > +++ b/drivers/video/fbdev/offb.c > > @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct > device_node *dp, int no_real_node) > > /* kludge for valkyrie */ > > if (strcmp(dp->name, "valkyrie") == 0) > > address += 0x1000; > > - offb_init_fb(no_real_node ? "bootx" : NULL, > > + offb_init_fb(no_real_node ? "bootx" : dp->name, > > width, height, depth, pitch, address, > > foreign_endian, no_real_node ? NULL : dp); > > } > > -- > > 2.19.2 > > > <div dir="auto"><div>Patch is far from perfect but was tested also by: Elimar Riesebieter <a href="mailto:riesebie@lxtec.de">riesebie@lxtec.de</a><br><br><div class="gmail_quote"><div dir="ltr">Le jeu. 20 déc. 2018 17:10, Mathieu Malaterre <<a href="mailto:malat@debian.org">malat@debian.org</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Rob, any comment ?<br> <br> On Fri, Dec 7, 2018 at 1:59 PM Mathieu Malaterre <<a href="mailto:malat@debian.org" target="_blank" rel="noreferrer">malat@debian.org</a>> wrote:<br> ><br> > This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to<br> > using %pOFn instead of <a href="http://device_node.name" rel="noreferrer noreferrer" target="_blank">device_node.name</a>"). This is the minimal work to<br> > get a Mac Mini G4 back to a bootable state. The function<br> > offb_init_palette_hacks would need to handle the case where `name` has<br> > been set to NULL.<br> ><br> > Cc: Rob Herring <<a href="mailto:robh@kernel.org" target="_blank" rel="noreferrer">robh@kernel.org</a>><br> > Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of <a href="http://device_node.name" rel="noreferrer noreferrer" target="_blank">device_node.name</a>")<br> > Cc: <a href="mailto:stable@vger.kernel.org" target="_blank" rel="noreferrer">stable@vger.kernel.org</a> # v4.19+<br> > Signed-off-by: Mathieu Malaterre <<a href="mailto:malat@debian.org" target="_blank" rel="noreferrer">malat@debian.org</a>><br> > ---<br> > drivers/video/fbdev/offb.c | 2 +-<br> > 1 file changed, 1 insertion(+), 1 deletion(-)<br> ><br> > diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c<br> > index 31f769d67195..6e75851f8142 100644<br> > --- a/drivers/video/fbdev/offb.c<br> > +++ b/drivers/video/fbdev/offb.c<br> > @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)<br> > /* kludge for valkyrie */<br> > if (strcmp(dp->name, "valkyrie") == 0)<br> > address += 0x1000;<br> > - offb_init_fb(no_real_node ? "bootx" : NULL,<br> > + offb_init_fb(no_real_node ? "bootx" : dp->name,<br> > width, height, depth, pitch, address,<br> > foreign_endian, no_real_node ? NULL : dp);<br> > }<br> > --<br> > 2.19.2<br> ><br> </blockquote></div></div></div>
Bartlomiej,
Do you need an Acked-by from Rob, or can you take it in the next round
of fixes for v4.20 ?
Just to repeat myself, previous code would call
offb_init_palette_hacks(), which in turn would do:
if (dp && !strncmp(name, "ATY,Rage128", 11)) {
with name=NULL.
Thanks
On Thu, Dec 20, 2018 at 5:10 PM Mathieu Malaterre <malat@debian.org> wrote:
>
> Rob, any comment ?
>
> On Fri, Dec 7, 2018 at 1:59 PM Mathieu Malaterre <malat@debian.org> wrote:
> >
> > This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to
> > using %pOFn instead of device_node.name"). This is the minimal work to
> > get a Mac Mini G4 back to a bootable state. The function
> > offb_init_palette_hacks would need to handle the case where `name` has
> > been set to NULL.
> >
> > Cc: Rob Herring <robh@kernel.org>
> > Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name")
> > Cc: stable@vger.kernel.org # v4.19+
> > Signed-off-by: Mathieu Malaterre <malat@debian.org>
> > ---
> > drivers/video/fbdev/offb.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
> > index 31f769d67195..6e75851f8142 100644
> > --- a/drivers/video/fbdev/offb.c
> > +++ b/drivers/video/fbdev/offb.c
> > @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
> > /* kludge for valkyrie */
> > if (strcmp(dp->name, "valkyrie") == 0)
> > address += 0x1000;
> > - offb_init_fb(no_real_node ? "bootx" : NULL,
> > + offb_init_fb(no_real_node ? "bootx" : dp->name,
> > width, height, depth, pitch, address,
> > foreign_endian, no_real_node ? NULL : dp);
> > }
> > --
> > 2.19.2
> >
On Wed, Jan 2, 2019 at 2:03 PM Mathieu Malaterre <malat@debian.org> wrote: > > Bartlomiej, > > Do you need an Acked-by from Rob, or can you take it in the next round > of fixes for v4.20 ? Sorry, I missed this. > > Just to repeat myself, previous code would call > offb_init_palette_hacks(), which in turn would do: > > if (dp && !strncmp(name, "ATY,Rage128", 11)) { > > with name=NULL. I prefer to fix this properly using node name helper in offb_init_palette_hacks(). I'll send a patch shortly. Rob
diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c index 31f769d67195..6e75851f8142 100644 --- a/drivers/video/fbdev/offb.c +++ b/drivers/video/fbdev/offb.c @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) /* kludge for valkyrie */ if (strcmp(dp->name, "valkyrie") == 0) address += 0x1000; - offb_init_fb(no_real_node ? "bootx" : NULL, + offb_init_fb(no_real_node ? "bootx" : dp->name, width, height, depth, pitch, address, foreign_endian, no_real_node ? NULL : dp); }
This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name"). This is the minimal work to get a Mac Mini G4 back to a bootable state. The function offb_init_palette_hacks would need to handle the case where `name` has been set to NULL. Cc: Rob Herring <robh@kernel.org> Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Mathieu Malaterre <malat@debian.org> --- drivers/video/fbdev/offb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)