Commit b4296655 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev updates from Helge Deller:
 "Many small but important fixes for special cases in the fbdev, fbcon
  and vgacon code which were found with Syzkaller, Svace and other tools
  by various people and teams (e.g. Linux Verification Center).

  Some smaller code cleanups in the nvidiafb, arkfb, atyfb and viafb
  drivers and two spelling fixes"

* tag 'fbdev-for-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: Fix fb_set_var to prevent null-ptr-deref in fb_videomode_to_var
  fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var
  fbdev: sstfb.rst: Fix spelling mistake
  fbdev: core: fbcvt: avoid division by 0 in fb_cvt_hperiod()
  fbcon: Make sure modelist not set on unregistered console
  vgacon: Add check for vc_origin address range in vgacon_scroll()
  fbdev: arkfb: Cast ics5342_init() allocation type
  fbdev: nvidiafb: Correct const string length in nvidiafb_setup()
  fbdev: atyfb: Remove unused PCI vendor ID
  fbdev: carminefb: Fix spelling mistake of CARMINE_TOTAL_DIPLAY_MEM
  fbdev: via: use new GPIO line value setter callbacks
parents 4cb6c8af 05f6e183

Documentation/fb/sstfb.rst

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ Todo 
- Get rid of the previous paragraph.

- Buy more coffee.

- test/port to other arch.

- try to add panning using tweeks with front and back buffer .

- try to add panning using tweaks with front and back buffer.

- try to implement accel on voodoo2, this board can actually do a

  lot in 2D even if it was sold as a 3D only board ...

drivers/video/console/vgacon.c

+1 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,7 @@ static bool vgacon_scroll(struct vc_data *c, unsigned int t, unsigned int b, 
				     c->vc_screenbuf_size - delta);

			c->vc_origin = vga_vram_end - c->vc_screenbuf_size;

			vga_rolled_over = 0;

		} else

		} else if (oldo - delta >= (unsigned long)c->vc_screenbuf)

			c->vc_origin -= delta;

		c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;

		scr_memsetw((u16 *) (c->vc_origin), c->vc_video_erase_char,

drivers/video/fbdev/arkfb.c

+3 −2
Original line number Diff line number Diff line
@@ -431,9 +431,10 @@ static struct dac_ops ics5342_ops = { 


static struct dac_info * ics5342_init(dac_read_regs_t drr, dac_write_regs_t dwr, void *data)

{

	struct dac_info *info = kzalloc(sizeof(struct ics5342_info), GFP_KERNEL);

	struct ics5342_info *ics_info = kzalloc(sizeof(struct ics5342_info), GFP_KERNEL);

	struct dac_info *info = &ics_info->dac;



	if (! info)

	if (!ics_info)

		return NULL;



	info->dacops = &ics5342_ops;

drivers/video/fbdev/carminefb.c

+4 −4
Original line number Diff line number Diff line
@@ -649,13 +649,13 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent) 
	 * is required for that largest resolution to avoid remaps at run

	 * time

	 */

	if (carminefb_fix.smem_len > CARMINE_TOTAL_DIPLAY_MEM)

		carminefb_fix.smem_len = CARMINE_TOTAL_DIPLAY_MEM;

	if (carminefb_fix.smem_len > CARMINE_TOTAL_DISPLAY_MEM)

		carminefb_fix.smem_len = CARMINE_TOTAL_DISPLAY_MEM;



	else if (carminefb_fix.smem_len < CARMINE_TOTAL_DIPLAY_MEM) {

	else if (carminefb_fix.smem_len < CARMINE_TOTAL_DISPLAY_MEM) {

		printk(KERN_ERR "carminefb: Memory bar is only %d bytes, %d "

				"are required.", carminefb_fix.smem_len,

				CARMINE_TOTAL_DIPLAY_MEM);

				CARMINE_TOTAL_DISPLAY_MEM);

		goto err_unmap_vregs;

	}

drivers/video/fbdev/carminefb.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#define MAX_DISPLAY	2

#define CARMINE_DISPLAY_MEM	(800 * 600 * 4)

#define CARMINE_TOTAL_DIPLAY_MEM	(CARMINE_DISPLAY_MEM * MAX_DISPLAY)

#define CARMINE_TOTAL_DISPLAY_MEM	(CARMINE_DISPLAY_MEM * MAX_DISPLAY)



#define CARMINE_USE_DISPLAY0	(1 << 0)

#define CARMINE_USE_DISPLAY1	(1 << 1)