Commit 870c3a9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev fixes from Helge Deller:

 - fix fbcon to prevent fonts bigger than 32x32 pixels to avoid
   overflows reported by syzbot

 - switch omapfb to use kstrtobool()

 - switch some fbdev drivers to use the backlight helpers

* tag 'fbdev-for-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbcon: Check font dimension limits
  fbdev: omapfb: Use kstrtobool() instead of strtobool()
  fbdev: fbmon: fix function name in kernel-doc
  fbdev: atmel_lcdfb: Rework backlight status updates
  fbdev: riva: Use backlight helper
  fbdev: omapfb: panel-dsi-cm: Use backlight helper
  fbdev: nvidia: Use backlight helper
  fbdev: mx3fb: Use backlight helper
  fbdev: radeon: Use backlight helper
  fbdev: atyfb: Use backlight helper
  fbdev: aty128fb: Use backlight helper
parents 9e482602 2b09d5d3

drivers/video/fbdev/atmel_lcdfb.c

+1 −21
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ struct atmel_lcdfb_info { 
	struct clk		*lcdc_clk;



	struct backlight_device	*backlight;

	u8			bl_power;

	u8			saved_lcdcon;



	u32			pseudo_palette[16];
@@ -109,22 +108,7 @@ static u32 contrast_ctr = ATMEL_LCDC_PS_DIV8 
static int atmel_bl_update_status(struct backlight_device *bl)

{

	struct atmel_lcdfb_info *sinfo = bl_get_data(bl);

	int			power = sinfo->bl_power;

	int			brightness = bl->props.brightness;



	/* REVISIT there may be a meaningful difference between

	 * fb_blank and power ... there seem to be some cases

	 * this doesn't handle correctly.

	 */

	if (bl->props.fb_blank != sinfo->bl_power)

		power = bl->props.fb_blank;

	else if (bl->props.power != sinfo->bl_power)

		power = bl->props.power;



	if (brightness < 0 && power == FB_BLANK_UNBLANK)

		brightness = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);

	else if (power != FB_BLANK_UNBLANK)

		brightness = 0;

	int			brightness = backlight_get_brightness(bl);



	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, brightness);

	if (contrast_ctr & ATMEL_LCDC_POL_POSITIVE)
@@ -133,8 +117,6 @@ static int atmel_bl_update_status(struct backlight_device *bl) 
	else

		lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);



	bl->props.fb_blank = bl->props.power = sinfo->bl_power = power;



	return 0;

}
@@ -155,8 +137,6 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo) 
	struct backlight_properties props;

	struct backlight_device	*bl;



	sinfo->bl_power = FB_BLANK_UNBLANK;



	if (sinfo->backlight)

		return;

drivers/video/fbdev/aty/aty128fb.c

+2 −4
Original line number Diff line number Diff line
@@ -1766,12 +1766,10 @@ static int aty128_bl_update_status(struct backlight_device *bd) 
	unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);

	int level;



	if (bd->props.power != FB_BLANK_UNBLANK ||

	    bd->props.fb_blank != FB_BLANK_UNBLANK ||

	    !par->lcd_on)

	if (!par->lcd_on)

		level = 0;

	else

		level = bd->props.brightness;

		level = backlight_get_brightness(bd);



	reg |= LVDS_BL_MOD_EN | LVDS_BLON;

	if (level > 0) {

drivers/video/fbdev/aty/atyfb_base.c

+1 −7
Original line number Diff line number Diff line
@@ -2219,13 +2219,7 @@ static int aty_bl_update_status(struct backlight_device *bd) 
{

	struct atyfb_par *par = bl_get_data(bd);

	unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);

	int level;



	if (bd->props.power != FB_BLANK_UNBLANK ||

	    bd->props.fb_blank != FB_BLANK_UNBLANK)

		level = 0;

	else

		level = bd->props.brightness;

	int level = backlight_get_brightness(bd);



	reg |= (BLMOD_EN | BIASMOD_EN);

	if (level > 0) {

drivers/video/fbdev/aty/radeon_backlight.c

+1 −5
Original line number Diff line number Diff line
@@ -57,11 +57,7 @@ static int radeon_bl_update_status(struct backlight_device *bd) 
	 * backlight. This provides some greater power saving and the display

	 * is useless without backlight anyway.

	 */

        if (bd->props.power != FB_BLANK_UNBLANK ||

	    bd->props.fb_blank != FB_BLANK_UNBLANK)

		level = 0;

	else

		level = bd->props.brightness;

	level = backlight_get_brightness(bd);



	del_timer_sync(&rinfo->lvds_timer);

	radeon_engine_idle();

drivers/video/fbdev/core/fbcon.c

+5 −2
Original line number Diff line number Diff line
@@ -2495,9 +2495,12 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, 
	    h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres))

		return -EINVAL;



	if (font->width > 32 || font->height > 32)

		return -EINVAL;



	/* Make sure drawing engine can handle the font */

	if (!(info->pixmap.blit_x & (1 << (font->width - 1))) ||

	    !(info->pixmap.blit_y & (1 << (font->height - 1))))

	if (!(info->pixmap.blit_x & BIT(font->width - 1)) ||

	    !(info->pixmap.blit_y & BIT(font->height - 1)))

		return -EINVAL;



	/* Make sure driver can handle the font length */