[PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Huacai Chen]

In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
occurs due to recently backport:

  CC      drivers/platform/loongarch/loongson-laptop.o
drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
  428 |         props.power = BACKLIGHT_POWER_ON;
      |                       ^~~~~~~~~~~~~~~~~~

Use FB_BLANK_UNBLANK instead which has the same meaning.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
 drivers/platform/loongarch/loongson-laptop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/loongarch/loongson-laptop.c b/drivers/platform/loongarch/loongson-laptop.c
index 61b18ac206c9..5fcfa3a7970b 100644
--- a/drivers/platform/loongarch/loongson-laptop.c
+++ b/drivers/platform/loongarch/loongson-laptop.c
@@ -425,7 +425,7 @@ static int laptop_backlight_register(void)
 
 	props.max_brightness = status;
 	props.brightness = ec_get_brightness();
-	props.power = BACKLIGHT_POWER_ON;
+	props.power = FB_BLANK_UNBLANK;
 	props.type = BACKLIGHT_PLATFORM;
 
 	backlight_device_register("loongson_laptop",
-- 
2.47.1

Re: [PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Greg Kroah-Hartman]

On Sun, Jun 22, 2025 at 07:01:48PM +0800, Huacai Chen wrote:
> In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
> occurs due to recently backport:
> 
>   CC      drivers/platform/loongarch/loongson-laptop.o
> drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
> drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
>   428 |         props.power = BACKLIGHT_POWER_ON;
>       |                       ^~~~~~~~~~~~~~~~~~
> 
> Use FB_BLANK_UNBLANK instead which has the same meaning.
> 
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> ---
>  drivers/platform/loongarch/loongson-laptop.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

What commit id is this fixing?

thanks,

greg k-h

Re: [PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Huacai Chen]

On Sun, Jun 22, 2025 at 9:10 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Sun, Jun 22, 2025 at 07:01:48PM +0800, Huacai Chen wrote:
> > In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
> > occurs due to recently backport:
> >
> >   CC      drivers/platform/loongarch/loongson-laptop.o
> > drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
> > drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
> >   428 |         props.power = BACKLIGHT_POWER_ON;
> >       |                       ^~~~~~~~~~~~~~~~~~
> >
> > Use FB_BLANK_UNBLANK instead which has the same meaning.
> >
> > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > ---
> >  drivers/platform/loongarch/loongson-laptop.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> What commit id is this fixing?

commit 53c762b47f726e4079a1f06f684bce2fc0d56fba upstream.

>
> thanks,
>
> greg k-h

Re: [PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Greg Kroah-Hartman]

On Sun, Jun 22, 2025 at 09:11:44PM +0800, Huacai Chen wrote:
> On Sun, Jun 22, 2025 at 9:10 PM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > On Sun, Jun 22, 2025 at 07:01:48PM +0800, Huacai Chen wrote:
> > > In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
> > > occurs due to recently backport:
> > >
> > >   CC      drivers/platform/loongarch/loongson-laptop.o
> > > drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
> > > drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
> > >   428 |         props.power = BACKLIGHT_POWER_ON;
> > >       |                       ^~~~~~~~~~~~~~~~~~
> > >
> > > Use FB_BLANK_UNBLANK instead which has the same meaning.
> > >
> > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > > ---
> > >  drivers/platform/loongarch/loongson-laptop.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > What commit id is this fixing?
> 
> commit 53c762b47f726e4079a1f06f684bce2fc0d56fba upstream.

Great, can you resend this with a proper Fixes: tag so I don't have to
manually add it myself?

thanks,

greg k-h

Re: [PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Huacai Chen]

On Mon, Jun 23, 2025 at 2:28 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Sun, Jun 22, 2025 at 09:11:44PM +0800, Huacai Chen wrote:
> > On Sun, Jun 22, 2025 at 9:10 PM Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Sun, Jun 22, 2025 at 07:01:48PM +0800, Huacai Chen wrote:
> > > > In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
> > > > occurs due to recently backport:
> > > >
> > > >   CC      drivers/platform/loongarch/loongson-laptop.o
> > > > drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
> > > > drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
> > > >   428 |         props.power = BACKLIGHT_POWER_ON;
> > > >       |                       ^~~~~~~~~~~~~~~~~~
> > > >
> > > > Use FB_BLANK_UNBLANK instead which has the same meaning.
> > > >
> > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > > > ---
> > > >  drivers/platform/loongarch/loongson-laptop.c | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > What commit id is this fixing?
> >
> > commit 53c762b47f726e4079a1f06f684bce2fc0d56fba upstream.
>
> Great, can you resend this with a proper Fixes: tag so I don't have to
> manually add it myself?
Upstream kernel doesn't need to be fixed, and for 6.1/6.6, the commits
need to be fixed are in linux-stable-rc.git[1][2] rather than
linux-stable.git now.

I don't know your policy about stable branch maintenance, one of the
alternatives is modify [1][2] directly. And if you prefer me to resend
this patch, I think the commit id is not the upstream id, but the ids
in [1][2]?

[1]https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/6.1&id=f78d337c63e738ebd556bf67472b2b5c5d8e9a1c
[2]https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/6.6&id=797cbc5bc7e7a9cd349b5c54c6128a4077b9a8c6

Huacai

>
> thanks,
>
> greg k-h

Re: [PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Greg Kroah-Hartman]

On Mon, Jun 23, 2025 at 02:36:18PM +0800, Huacai Chen wrote:
> On Mon, Jun 23, 2025 at 2:28 PM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > On Sun, Jun 22, 2025 at 09:11:44PM +0800, Huacai Chen wrote:
> > > On Sun, Jun 22, 2025 at 9:10 PM Greg Kroah-Hartman
> > > <gregkh@linuxfoundation.org> wrote:
> > > >
> > > > On Sun, Jun 22, 2025 at 07:01:48PM +0800, Huacai Chen wrote:
> > > > > In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
> > > > > occurs due to recently backport:
> > > > >
> > > > >   CC      drivers/platform/loongarch/loongson-laptop.o
> > > > > drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
> > > > > drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
> > > > >   428 |         props.power = BACKLIGHT_POWER_ON;
> > > > >       |                       ^~~~~~~~~~~~~~~~~~
> > > > >
> > > > > Use FB_BLANK_UNBLANK instead which has the same meaning.
> > > > >
> > > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > > > > ---
> > > > >  drivers/platform/loongarch/loongson-laptop.c | 2 +-
> > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > What commit id is this fixing?
> > >
> > > commit 53c762b47f726e4079a1f06f684bce2fc0d56fba upstream.
> >
> > Great, can you resend this with a proper Fixes: tag so I don't have to
> > manually add it myself?
> Upstream kernel doesn't need to be fixed, and for 6.1/6.6, the commits
> need to be fixed are in linux-stable-rc.git[1][2] rather than
> linux-stable.git now.
> 
> I don't know your policy about stable branch maintenance, one of the
> alternatives is modify [1][2] directly. And if you prefer me to resend
> this patch, I think the commit id is not the upstream id, but the ids
> in [1][2]?
> 
> [1]https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/6.1&id=f78d337c63e738ebd556bf67472b2b5c5d8e9a1c
> [2]https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/6.6&id=797cbc5bc7e7a9cd349b5c54c6128a4077b9a8c6

What we should do is just drop those patches from the 6.1.y and 6.6.y
queues, I'll go do that now, and wait for you to submit a working
version of this patch for those branches, so that we do not have any
build breakages anywhere.

Can you submit the updated patches for that now?

thanks,

greg k-h

Re: [PATCH for 6.1/6.6] platform/loongarch: laptop: Fix build error due to backport

[Huacai Chen]

On Mon, Jun 23, 2025 at 4:03 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Mon, Jun 23, 2025 at 02:36:18PM +0800, Huacai Chen wrote:
> > On Mon, Jun 23, 2025 at 2:28 PM Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Sun, Jun 22, 2025 at 09:11:44PM +0800, Huacai Chen wrote:
> > > > On Sun, Jun 22, 2025 at 9:10 PM Greg Kroah-Hartman
> > > > <gregkh@linuxfoundation.org> wrote:
> > > > >
> > > > > On Sun, Jun 22, 2025 at 07:01:48PM +0800, Huacai Chen wrote:
> > > > > > In 6.1/6.6 there is no BACKLIGHT_POWER_ON definition so a build error
> > > > > > occurs due to recently backport:
> > > > > >
> > > > > >   CC      drivers/platform/loongarch/loongson-laptop.o
> > > > > > drivers/platform/loongarch/loongson-laptop.c: In function 'laptop_backlight_register':
> > > > > > drivers/platform/loongarch/loongson-laptop.c:428:23: error: 'BACKLIGHT_POWER_ON' undeclared (first use in this function)
> > > > > >   428 |         props.power = BACKLIGHT_POWER_ON;
> > > > > >       |                       ^~~~~~~~~~~~~~~~~~
> > > > > >
> > > > > > Use FB_BLANK_UNBLANK instead which has the same meaning.
> > > > > >
> > > > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > > > > > ---
> > > > > >  drivers/platform/loongarch/loongson-laptop.c | 2 +-
> > > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > >
> > > > > What commit id is this fixing?
> > > >
> > > > commit 53c762b47f726e4079a1f06f684bce2fc0d56fba upstream.
> > >
> > > Great, can you resend this with a proper Fixes: tag so I don't have to
> > > manually add it myself?
> > Upstream kernel doesn't need to be fixed, and for 6.1/6.6, the commits
> > need to be fixed are in linux-stable-rc.git[1][2] rather than
> > linux-stable.git now.
> >
> > I don't know your policy about stable branch maintenance, one of the
> > alternatives is modify [1][2] directly. And if you prefer me to resend
> > this patch, I think the commit id is not the upstream id, but the ids
> > in [1][2]?
> >
> > [1]https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/6.1&id=f78d337c63e738ebd556bf67472b2b5c5d8e9a1c
> > [2]https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/6.6&id=797cbc5bc7e7a9cd349b5c54c6128a4077b9a8c6
>
> What we should do is just drop those patches from the 6.1.y and 6.6.y
> queues, I'll go do that now, and wait for you to submit a working
> version of this patch for those branches, so that we do not have any
> build breakages anywhere.
>
> Can you submit the updated patches for that now?
OK, will do.

>
> thanks,
>
> greg k-h