Commit 9fa4abc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev updates from Helge Deller:
 "The most relevant change are the patches from Dmitry Torokhov to
  switch omapfb to the gpiod API.

  The other patches are small and fix e.g. UML build issues, improve the
  error paths and cleanup code"

* tag 'fbdev-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (32 commits)
  fbdev: fbcon: release buffer when fbcon_do_set_font() failed
  fbdev: sh_mobile_lcdcfb: use sysfs_emit() to instead of scnprintf()
  fbdev: uvesafb: use sysfs_emit() to instead of scnprintf()
  fbdev: uvesafb: Simplify uvesafb_remove()
  fbdev: uvesafb: Fixes an error handling path in uvesafb_probe()
  fbdev: uvesafb: don't build on UML
  fbdev: geode: don't build on UML
  fbdev: ep93xx-fb: Add missing clk_disable_unprepare in ep93xxfb_probe()
  fbdev: matroxfb: Convert to i2c's .probe_new()
  fbdev: da8xx-fb: add missing regulator_disable() in fb_probe
  fbdev: controlfb: fix spelling mistake "paramaters"->"parameters"
  fbdev: vermilion: decrease reference count in error path
  fbdev: smscufx: fix error handling code in ufx_usb_probe
  fbdev: via: Fix error in via_core_init()
  fbdev: pm2fb: fix missing pci_disable_device()
  fbdev: pxafb: Remove unnecessary print function dev_err()
  fbdev: omapfb: panel-sharp-ls037v7dw01: fix included headers
  fbdev: omapfb: panel-tpo-td028ttec1: stop including gpio.h
  fbdev: omapfb: panel-lgphilips-lb035q02: remove backlight GPIO handling
  fbdev: omapfb: encoder-opa362: fix included headers
  ...
parents 504a73d4 3c3bfb85

drivers/video/fbdev/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ config FB_TGA 
config FB_UVESA

	tristate "Userspace VESA VGA graphics support"

	depends on FB && CONNECTOR

	depends on !UML

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -2254,7 +2255,6 @@ config FB_SSD1307 
	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select FB_DEFERRED_IO

	select PWM

	select FB_BACKLIGHT

	help

	  This driver implements support for the Solomon SSD1307

drivers/video/fbdev/controlfb.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int read_control_sense(struct fb_info_control *p) 
#define CONTROL_PIXCLOCK_MIN	5000	/* ~ 200 MHz dot clock */



/*

 * calculate the clock paramaters to be sent to CUDA according to given

 * calculate the clock parameters to be sent to CUDA according to given

 * pixclock in pico second.

 */

static int calc_clock_params(unsigned long clk, unsigned char *param)

drivers/video/fbdev/core/fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -2450,7 +2450,8 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, 


	if (userfont) {

		p->userfont = old_userfont;

		REFCOUNT(data)--;

		if (--REFCOUNT(data) == 0)

			kfree(data - FONT_EXTRA_WORDS * sizeof(int));

	}



	vc->vc_font.width = old_width;

drivers/video/fbdev/da8xx-fb.c

+5 −2
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ static int fb_probe(struct platform_device *device) 
		dev_err(&device->dev,

			"GLCD: kmalloc for frame buffer failed\n");

		ret = -EINVAL;

		goto err_release_fb;

		goto err_disable_reg;

	}



	da8xx_fb_info->screen_base = (char __iomem *) par->vram_virt;
@@ -1475,7 +1475,7 @@ static int fb_probe(struct platform_device *device) 


	ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0);

	if (ret)

		goto err_release_fb;

		goto err_disable_reg;

	da8xx_fb_info->cmap.len = par->palette_sz;



	/* initialize var_screeninfo */
@@ -1529,6 +1529,9 @@ static int fb_probe(struct platform_device *device) 
err_dealloc_cmap:

	fb_dealloc_cmap(&da8xx_fb_info->cmap);



err_disable_reg:

	if (par->lcd_supply)

		regulator_disable(par->lcd_supply);

err_release_fb:

	framebuffer_release(da8xx_fb_info);

drivers/video/fbdev/ep93xx-fb.c

+3 −1
Original line number Diff line number Diff line
@@ -552,12 +552,14 @@ static int ep93xxfb_probe(struct platform_device *pdev) 


	err = register_framebuffer(info);

	if (err)

		goto failed_check;

		goto failed_framebuffer;



	dev_info(info->dev, "registered. Mode = %dx%d-%d\n",

		 info->var.xres, info->var.yres, info->var.bits_per_pixel);

	return 0;



failed_framebuffer:

	clk_disable_unprepare(fbi->clk);

failed_check:

	if (fbi->mach_info->teardown)

		fbi->mach_info->teardown(pdev);