backlight_properties.fb_blank is deprecated. The states it represents
are handled by other properties; but instead of accessing those
properties directly, drivers should use the helpers provided by
backlight.h.

Instead of retrieving the backlight brightness in struct
backlight_properties manually, and then checking whether the backlight
should be on at all, use backlight_get_brightness() which does all
this and insulates this from future changes.

Signed-off-by: Stephen Kitt <steve@sk2.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_backlight.c b/drivers/gpu/drm/shmobile/shmob_drm_backlight.c
index f6628a5ee95f..794573badfe8 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_backlight.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_backlight.c
@@ -18,11 +18,7 @@ static int shmob_drm_backlight_update(struct backlight_device *bdev)
 	struct shmob_drm_connector *scon = bl_get_data(bdev);
 	struct shmob_drm_device *sdev = scon->connector.dev->dev_private;
 	const struct shmob_drm_backlight_data *bdata = &sdev->pdata->backlight;
-	int brightness = bdev->props.brightness;
-
-	if (bdev->props.power != FB_BLANK_UNBLANK ||
-	    bdev->props.state & BL_CORE_SUSPENDED)
-		brightness = 0;
+	int brightness = backlight_get_brightness(bdev);
 
 	return bdata->set_brightness(brightness);
 }

base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
-- 
2.30.2

On Tue,  7 Jun 2022 20:31:32 +0200, Stephen Kitt <steve@sk2.org> wrote:
> backlight_properties.fb_blank is deprecated. The states it represents
> are handled by other properties; but instead of accessing those
> properties directly, drivers should use the helpers provided by
> backlight.h.

Apologies for the misleading boilerplate, this patch came about as a result
of cleaning up fb_blank usage but doesn't involve fb_blank itself.

> Instead of retrieving the backlight brightness in struct
> backlight_properties manually, and then checking whether the backlight
> should be on at all, use backlight_get_brightness() which does all
> this and insulates this from future changes.
> 
> Signed-off-by: Stephen Kitt <steve@sk2.org>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/shmobile/shmob_drm_backlight.c
> b/drivers/gpu/drm/shmobile/shmob_drm_backlight.c index
> f6628a5ee95f..794573badfe8 100644 ---
> a/drivers/gpu/drm/shmobile/shmob_drm_backlight.c +++
> b/drivers/gpu/drm/shmobile/shmob_drm_backlight.c @@ -18,11 +18,7 @@ static
> int shmob_drm_backlight_update(struct backlight_device *bdev) struct
> shmob_drm_connector *scon = bl_get_data(bdev); struct shmob_drm_device
> *sdev = scon->connector.dev->dev_private; const struct
> shmob_drm_backlight_data *bdata = &sdev->pdata->backlight;
> -	int brightness = bdev->props.brightness;
> -
> -	if (bdev->props.power != FB_BLANK_UNBLANK ||
> -	    bdev->props.state & BL_CORE_SUSPENDED)
> -		brightness = 0;
> +	int brightness = backlight_get_brightness(bdev);
>  
>  	return bdata->set_brightness(brightness);
>  }
> 
> base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
> -- 
> 2.30.2
> 

Hi Stephen,

On Tue, Jun 07, 2022 at 11:05:37PM +0200, Stephen Kitt wrote:
> On Tue,  7 Jun 2022 20:31:32 +0200, Stephen Kitt <steve@sk2.org> wrote:
> > backlight_properties.fb_blank is deprecated. The states it represents
> > are handled by other properties; but instead of accessing those
> > properties directly, drivers should use the helpers provided by
> > backlight.h.
> 
> Apologies for the misleading boilerplate, this patch came about as a result
> of cleaning up fb_blank usage but doesn't involve fb_blank itself.

No worries. Would you like to submit a v2 with a better commit message ?
The patch otherwise looks good to me.

> > Instead of retrieving the backlight brightness in struct
> > backlight_properties manually, and then checking whether the backlight
> > should be on at all, use backlight_get_brightness() which does all
> > this and insulates this from future changes.
> > 
> > Signed-off-by: Stephen Kitt <steve@sk2.org>
> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: dri-devel@lists.freedesktop.org
> > ---
> >  drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 6 +-----
> >  1 file changed, 1 insertion(+), 5 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_backlight.c
> > b/drivers/gpu/drm/shmobile/shmob_drm_backlight.c index
> > f6628a5ee95f..794573badfe8 100644 ---
> > a/drivers/gpu/drm/shmobile/shmob_drm_backlight.c +++
> > b/drivers/gpu/drm/shmobile/shmob_drm_backlight.c @@ -18,11 +18,7 @@ static
> > int shmob_drm_backlight_update(struct backlight_device *bdev) struct
> > shmob_drm_connector *scon = bl_get_data(bdev); struct shmob_drm_device
> > *sdev = scon->connector.dev->dev_private; const struct
> > shmob_drm_backlight_data *bdata = &sdev->pdata->backlight;
> > -	int brightness = bdev->props.brightness;
> > -
> > -	if (bdev->props.power != FB_BLANK_UNBLANK ||
> > -	    bdev->props.state & BL_CORE_SUSPENDED)
> > -		brightness = 0;
> > +	int brightness = backlight_get_brightness(bdev);
> >  
> >  	return bdata->set_brightness(brightness);
> >  }
> > 
> > base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56

-- 
Regards,

Laurent Pinchart

Hi Laurent,

On Wed, 8 Jun 2022 10:08:40 +0300, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Tue, Jun 07, 2022 at 11:05:37PM +0200, Stephen Kitt wrote:
> > On Tue,  7 Jun 2022 20:31:32 +0200, Stephen Kitt <steve@sk2.org> wrote:  
> > > backlight_properties.fb_blank is deprecated. The states it represents
> > > are handled by other properties; but instead of accessing those
> > > properties directly, drivers should use the helpers provided by
> > > backlight.h.  
> > 
> > Apologies for the misleading boilerplate, this patch came about as a
> > result of cleaning up fb_blank usage but doesn't involve fb_blank itself.
> >  
> 
> No worries. Would you like to submit a v2 with a better commit message ?
> The patch otherwise looks good to me.

Yes, I’ll do that.

Thanks,

Stephen