Commit 70e137e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes from Helge Deller:
 "A few small unspectacular fbdev fixes:

   - Fix for USB endpoint check in udlfb (found by syzbot fuzzer)

   - Small fix in error code path in omapfb

   - compiler warning fixes in fbmem & i810

   - code removal and whitespace cleanups in stifb and atyfb"

* tag 'fbdev-for-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: stifb: Whitespace cleanups
  fbdev: udlfb: Use usb_control_msg_send()
  fbdev: udlfb: Fix endpoint check
  fbdev: atyfb: Remove unused clock determination
  fbdev: i810: include i810_main.h in i810_dvt.c
  fbdev: fbmem: mark get_fb_unmapped_area() static
  fbdev: omapfb: panel-tpo-td043mtea1: fix error code in probe()
parents e2065b8c d9a45969

drivers/video/fbdev/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ config FB_PROVIDE_GET_FB_UNMAPPED_AREA 
	depends on FB

	help

	  Allow generic frame-buffer to provide get_fb_unmapped_area

	  function.

	  function to provide shareable character device support on nommu.



menuconfig FB_FOREIGN_ENDIAN

	bool "Framebuffer foreign endianness support"

drivers/video/fbdev/aty/atyfb_base.c

+0 −5
Original line number Diff line number Diff line
@@ -3498,11 +3498,6 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info, 
	if (ret)

		goto atyfb_setup_generic_fail;

#endif

	if (!(aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC_EXT_DISP_EN))

		par->clk_wr_offset = (inb(R_GENMO) & 0x0CU) >> 2;

	else

		par->clk_wr_offset = aty_ld_8(CLOCK_CNTL, par) & 0x03U;



	/* according to ATI, we should use clock 3 for acelerated mode */

	par->clk_wr_offset = 3;

drivers/video/fbdev/core/fbmem.c

+1 −1
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ __releases(&info->lock) 
}



#if defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA) && !defined(CONFIG_MMU)

unsigned long get_fb_unmapped_area(struct file *filp,

static unsigned long get_fb_unmapped_area(struct file *filp,

				   unsigned long addr, unsigned long len,

				   unsigned long pgoff, unsigned long flags)

{

drivers/video/fbdev/i810/i810_dvt.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "i810_regs.h"

#include "i810.h"

#include "i810_main.h"



struct mode_registers std_modes[] = {

	/* 640x480 @ 60Hz */
@@ -276,7 +277,7 @@ void i810fb_fill_var_timings(struct fb_var_screeninfo *var) 
	var->upper_margin = total - (yres + var->lower_margin + var->vsync_len);

}



u32 i810_get_watermark(struct fb_var_screeninfo *var,

u32 i810_get_watermark(const struct fb_var_screeninfo *var,

		       struct i810fb_par *par)

{

	struct mode_registers *params = &par->regs;

drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c

+2 −1
Original line number Diff line number Diff line
@@ -491,7 +491,8 @@ static int tpo_td043_probe(struct spi_device *spi) 


	ddata->vcc_reg = devm_regulator_get(&spi->dev, "vcc");

	if (IS_ERR(ddata->vcc_reg)) {

		r = dev_err_probe(&spi->dev, r, "failed to get LCD VCC regulator\n");

		r = dev_err_probe(&spi->dev, PTR_ERR(ddata->vcc_reg),

				  "failed to get LCD VCC regulator\n");

		goto err_regulator;

	}