| Message ID | 20230107-sam-video-backlight-drop-fb_blank-v1-15-1bd9bafb351f@ravnborg.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | backlight: Drop use of deprecated fb_blank property | expand |
On Sat, 07 Jan 2023 19:26:29 +0100, Sam Ravnborg via B4 Submission Endpoint <devnull+sam.ravnborg.org@kernel.org> wrote: > From: Sam Ravnborg <sam@ravnborg.org> > > With all users gone remove the deprecated fb_blank member in > backlight_properties. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Lee Jones <lee@kernel.org> > Cc: Daniel Thompson <daniel.thompson@linaro.org> > Cc: Jingoo Han <jingoohan1@gmail.com> > --- > drivers/video/backlight/backlight.c | 2 -- > include/linux/backlight.h | 22 ---------------------- > 2 files changed, 24 deletions(-) > > diff --git a/drivers/video/backlight/backlight.c > b/drivers/video/backlight/backlight.c index b788ff3d0f45..9b0557d094c5 > 100644 --- a/drivers/video/backlight/backlight.c > +++ b/drivers/video/backlight/backlight.c > @@ -118,14 +118,12 @@ static int fb_notifier_callback(struct notifier_block > *self, bd->fb_bl_on[node] = true; > if (!bd->use_count++) { > bd->props.state &= ~BL_CORE_FBBLANK; > - bd->props.fb_blank = FB_BLANK_UNBLANK; > backlight_update_status(bd); > } > } else if (fb_blank != FB_BLANK_UNBLANK && bd->fb_bl_on[node]) { > bd->fb_bl_on[node] = false; > if (!(--bd->use_count)) { > bd->props.state |= BL_CORE_FBBLANK; > - bd->props.fb_blank = fb_blank; > backlight_update_status(bd); > } > } > diff --git a/include/linux/backlight.h b/include/linux/backlight.h > index 614653e07e3a..c8622d6cc8c5 100644 > --- a/include/linux/backlight.h > +++ b/include/linux/backlight.h > @@ -218,25 +218,6 @@ struct backlight_properties { > */ > int power; > > - /** > - * @fb_blank: The power state from the FBIOBLANK ioctl. > - * > - * When the FBIOBLANK ioctl is called @fb_blank is set to the > - * blank parameter and the update_status() operation is called. > - * > - * When the backlight device is enabled @fb_blank is set > - * to FB_BLANK_UNBLANK. When the backlight device is disabled > - * @fb_blank is set to FB_BLANK_POWERDOWN. > - * > - * Backlight drivers should avoid using this property. It has been > - * replaced by state & BL_CORE_FBLANK (although most drivers should > - * use backlight_is_blank() as the preferred means to get the blank > - * state). > - * > - * fb_blank is deprecated and will be removed. > - */ > - int fb_blank; > - > /** > * @type: The type of backlight supported. > * > @@ -366,7 +347,6 @@ static inline int backlight_enable(struct > backlight_device *bd) return 0; > > bd->props.power = FB_BLANK_UNBLANK; > - bd->props.fb_blank = FB_BLANK_UNBLANK; > bd->props.state &= ~BL_CORE_FBBLANK; > > return backlight_update_status(bd); > @@ -382,7 +362,6 @@ static inline int backlight_disable(struct > backlight_device *bd) return 0; > > bd->props.power = FB_BLANK_POWERDOWN; > - bd->props.fb_blank = FB_BLANK_POWERDOWN; > bd->props.state |= BL_CORE_FBBLANK; > > return backlight_update_status(bd); > @@ -403,7 +382,6 @@ static inline int backlight_disable(struct > backlight_device *bd) static inline bool backlight_is_blank(const struct > backlight_device *bd) { > return bd->props.power != FB_BLANK_UNBLANK || > - bd->props.fb_blank != FB_BLANK_UNBLANK || > bd->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK); > } > > > -- > 2.34.1 Reviewed-by: Stephen Kitt <steve@sk2.org>
On Sat, Jan 07, 2023 at 07:26:29PM +0100, Sam Ravnborg via B4 Submission Endpoint wrote: > From: Sam Ravnborg <sam@ravnborg.org> > > With all users gone remove the deprecated fb_blank member in > backlight_properties. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Lee Jones <lee@kernel.org> > Cc: Daniel Thompson <daniel.thompson@linaro.org> > Cc: Jingoo Han <jingoohan1@gmail.com> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> PS Please don't treat this like a maintainer Acked-by: and merge it (Lee's not on holiday so work with Lee to figure out the merge strategy ;-) ).
Hi Daniel. On Mon, Jan 09, 2023 at 11:06:35AM +0000, Daniel Thompson wrote: > On Sat, Jan 07, 2023 at 07:26:29PM +0100, Sam Ravnborg via B4 Submission Endpoint wrote: > > From: Sam Ravnborg <sam@ravnborg.org> > > > > With all users gone remove the deprecated fb_blank member in > > backlight_properties. > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: Lee Jones <lee@kernel.org> > > Cc: Daniel Thompson <daniel.thompson@linaro.org> > > Cc: Jingoo Han <jingoohan1@gmail.com> > > > Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Thanks for the follow-up on all the backlight related patches. > > > PS Please don't treat this like a maintainer Acked-by: and merge it > (Lee's not on holiday so work with Lee to figure out the merge > strategy ;-) ). Nope, I am aware that the usual pattern here and wait for Lee to show up. For this patch there is a bug as I need to update a comment. I will fix this when I resend after all the patches in flight has landed. So likely after the next merge window, Sam
On Mon, 09 Jan 2023, Sam Ravnborg wrote: > Hi Daniel. > > On Mon, Jan 09, 2023 at 11:06:35AM +0000, Daniel Thompson wrote: > > On Sat, Jan 07, 2023 at 07:26:29PM +0100, Sam Ravnborg via B4 Submission Endpoint wrote: > > > From: Sam Ravnborg <sam@ravnborg.org> > > > > > > With all users gone remove the deprecated fb_blank member in > > > backlight_properties. > > > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > > Cc: Lee Jones <lee@kernel.org> > > > Cc: Daniel Thompson <daniel.thompson@linaro.org> > > > Cc: Jingoo Han <jingoohan1@gmail.com> > > > > > > Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> > > Thanks for the follow-up on all the backlight related patches. > > > > > > > PS Please don't treat this like a maintainer Acked-by: and merge it > > (Lee's not on holiday so work with Lee to figure out the merge > > strategy ;-) ). > Nope, I am aware that the usual pattern here and wait for Lee to show > up. It's on the list. Only 50 more reviews in the backlog now! > For this patch there is a bug as I need to update a comment. > I will fix this when I resend after all the patches in flight has > landed. So likely after the next merge window,
On Sat, 07 Jan 2023, Sam Ravnborg via B4 Submission Endpoint wrote: > From: Sam Ravnborg <sam@ravnborg.org> > > With all users gone remove the deprecated fb_blank member in > backlight_properties. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Lee Jones <lee@kernel.org> > Cc: Daniel Thompson <daniel.thompson@linaro.org> > Cc: Jingoo Han <jingoohan1@gmail.com> > --- > drivers/video/backlight/backlight.c | 2 -- > include/linux/backlight.h | 22 ---------------------- > 2 files changed, 24 deletions(-) Applied, thanks
Hi Lee, On Thu, Jan 26, 2023 at 02:27:26PM +0000, Lee Jones wrote: > On Sat, 07 Jan 2023, Sam Ravnborg via B4 Submission Endpoint wrote: > > > From: Sam Ravnborg <sam@ravnborg.org> > > > > With all users gone remove the deprecated fb_blank member in > > backlight_properties. > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: Lee Jones <lee@kernel.org> > > Cc: Daniel Thompson <daniel.thompson@linaro.org> > > Cc: Jingoo Han <jingoohan1@gmail.com> > > --- > > drivers/video/backlight/backlight.c | 2 -- > > include/linux/backlight.h | 22 ---------------------- > > 2 files changed, 24 deletions(-) > > Applied, thanks Some of the dependent patches in this series are not yet applied. I have them queued up for processing this weekend, but I missed the -rc6 window for drm-misc so they will likely not hit upstream in the upcoming merge window. I can try to expedite it. But if you have not yet pushed it, please revert this patch. Then I will resend only when the remaining patches are upstream. Sam
On Thu, 26 Jan 2023, Sam Ravnborg wrote: > Hi Lee, > On Thu, Jan 26, 2023 at 02:27:26PM +0000, Lee Jones wrote: > > On Sat, 07 Jan 2023, Sam Ravnborg via B4 Submission Endpoint wrote: > > > > > From: Sam Ravnborg <sam@ravnborg.org> > > > > > > With all users gone remove the deprecated fb_blank member in > > > backlight_properties. > > > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > > Cc: Lee Jones <lee@kernel.org> > > > Cc: Daniel Thompson <daniel.thompson@linaro.org> > > > Cc: Jingoo Han <jingoohan1@gmail.com> > > > --- > > > drivers/video/backlight/backlight.c | 2 -- > > > include/linux/backlight.h | 22 ---------------------- > > > 2 files changed, 24 deletions(-) > > > > Applied, thanks > > Some of the dependent patches in this series are not yet applied. > I have them queued up for processing this weekend, but I missed the -rc6 > window for drm-misc so they will likely not hit upstream in the upcoming > merge window. > I can try to expedite it. > > But if you have not yet pushed it, please revert this patch. > Then I will resend only when the remaining patches are upstream. Thanks for the info. Dropped.
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index b788ff3d0f45..9b0557d094c5 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -118,14 +118,12 @@ static int fb_notifier_callback(struct notifier_block *self, bd->fb_bl_on[node] = true; if (!bd->use_count++) { bd->props.state &= ~BL_CORE_FBBLANK; - bd->props.fb_blank = FB_BLANK_UNBLANK; backlight_update_status(bd); } } else if (fb_blank != FB_BLANK_UNBLANK && bd->fb_bl_on[node]) { bd->fb_bl_on[node] = false; if (!(--bd->use_count)) { bd->props.state |= BL_CORE_FBBLANK; - bd->props.fb_blank = fb_blank; backlight_update_status(bd); } } diff --git a/include/linux/backlight.h b/include/linux/backlight.h index 614653e07e3a..c8622d6cc8c5 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h @@ -218,25 +218,6 @@ struct backlight_properties { */ int power; - /** - * @fb_blank: The power state from the FBIOBLANK ioctl. - * - * When the FBIOBLANK ioctl is called @fb_blank is set to the - * blank parameter and the update_status() operation is called. - * - * When the backlight device is enabled @fb_blank is set - * to FB_BLANK_UNBLANK. When the backlight device is disabled - * @fb_blank is set to FB_BLANK_POWERDOWN. - * - * Backlight drivers should avoid using this property. It has been - * replaced by state & BL_CORE_FBLANK (although most drivers should - * use backlight_is_blank() as the preferred means to get the blank - * state). - * - * fb_blank is deprecated and will be removed. - */ - int fb_blank; - /** * @type: The type of backlight supported. * @@ -366,7 +347,6 @@ static inline int backlight_enable(struct backlight_device *bd) return 0; bd->props.power = FB_BLANK_UNBLANK; - bd->props.fb_blank = FB_BLANK_UNBLANK; bd->props.state &= ~BL_CORE_FBBLANK; return backlight_update_status(bd); @@ -382,7 +362,6 @@ static inline int backlight_disable(struct backlight_device *bd) return 0; bd->props.power = FB_BLANK_POWERDOWN; - bd->props.fb_blank = FB_BLANK_POWERDOWN; bd->props.state |= BL_CORE_FBBLANK; return backlight_update_status(bd); @@ -403,7 +382,6 @@ static inline int backlight_disable(struct backlight_device *bd) static inline bool backlight_is_blank(const struct backlight_device *bd) { return bd->props.power != FB_BLANK_UNBLANK || - bd->props.fb_blank != FB_BLANK_UNBLANK || bd->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK); }