Commit 55c225fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes and cleanups from Helge Deller:
 "Just the usual bunch of code cleanups in various drivers, this time
  mostly in vgacon and imxfb:

   - Code cleanup in vgacon (Jiri Slaby)

   - Explicitly include correct DT includes (Rob Herring)

   - imxfb code cleanup (Yangtao Li, Martin Kaiser)

   - kyrofb: make arrays const and smaller (Colin Ian King)

   - ep93xx-fb: return value check fix (Yuanjun Gong)

   - au1200fb: add missing IRQ check (Zhang Shurong)"

* tag 'fbdev-for-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: Explicitly include correct DT includes
  fbdev: ep93xx-fb: fix return value check in ep93xxfb_probe
  fbdev: au1200fb: Fix missing IRQ check in au1200fb_drv_probe
  fbdev: kyro: make some const read-only arrays static and reduce type size
  fbcon: remove unused display (p) from fbcon_redraw()
  sticon: make sticon_set_def_font() void and remove op parameter
  vgacon: cache vc_cell_height in vgacon_cursor()
  vgacon: let vgacon_doresize() return void
  vgacon: remove unused xpos from vgacon_set_cursor_size()
  vgacon: remove unneeded forward declarations
  vgacon: switch vgacon_scrolldelta() and vgacon_restore_screen()
  fbdev: imxfb: remove unneeded labels
  fbdev: imxfb: Convert to devm_platform_ioremap_resource()
  fbdev: imxfb: Convert to devm_kmalloc_array()
  fbdev: imxfb: Removed unneeded release_mem_region
  fbdev: imxfb: switch to DEFINE_SIMPLE_DEV_PM_OPS
  fbdev: imxfb: warn about invalid left/right margin
parents 4e076c73 e8812acb

drivers/video/console/sticon.c

+6 −6
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static bool sticon_scroll(struct vc_data *conp, unsigned int t, 
    return false;

}



static int sticon_set_def_font(int unit, struct console_font *op)

static void sticon_set_def_font(int unit)

{

	if (font_data[unit] != STI_DEF_FONT) {

		if (--FNTREFCOUNT(font_data[unit]) == 0) {
@@ -165,8 +165,6 @@ static int sticon_set_def_font(int unit, struct console_font *op) 
		}

		font_data[unit] = STI_DEF_FONT;

	}



	return 0;

}



static int sticon_set_font(struct vc_data *vc, struct console_font *op,
@@ -246,7 +244,7 @@ static int sticon_set_font(struct vc_data *vc, struct console_font *op, 
		  vc->vc_video_erase_char, font_data[vc->vc_num]);



	/* delete old font in case it is a user font */

	sticon_set_def_font(unit, NULL);

	sticon_set_def_font(unit);



	FNTREFCOUNT(cooked_font)++;

	font_data[unit] = cooked_font;
@@ -264,7 +262,9 @@ static int sticon_set_font(struct vc_data *vc, struct console_font *op, 


static int sticon_font_default(struct vc_data *vc, struct console_font *op, char *name)

{

	return sticon_set_def_font(vc->vc_num, op);

	sticon_set_def_font(vc->vc_num);



	return 0;

}



static int sticon_font_set(struct vc_data *vc, struct console_font *font,
@@ -297,7 +297,7 @@ static void sticon_deinit(struct vc_data *c) 


    /* free memory used by user font */

    for (i = 0; i < MAX_NR_CONSOLES; i++)

	sticon_set_def_font(i, NULL);

	sticon_set_def_font(i);

}



static void sticon_clear(struct vc_data *conp, int sy, int sx, int height,

drivers/video/console/vgacon.c

+28 −46
Original line number Diff line number Diff line
@@ -65,16 +65,8 @@ static struct vgastate vgastate; 
 *  Interface used by the world

 */



static const char *vgacon_startup(void);

static void vgacon_init(struct vc_data *c, int init);

static void vgacon_deinit(struct vc_data *c);

static void vgacon_cursor(struct vc_data *c, int mode);

static int vgacon_switch(struct vc_data *c);

static int vgacon_blank(struct vc_data *c, int blank, int mode_switch);

static void vgacon_scrolldelta(struct vc_data *c, int lines);

static int vgacon_set_origin(struct vc_data *c);

static void vgacon_save_screen(struct vc_data *c);

static void vgacon_invert_region(struct vc_data *c, u16 * p, int count);



static struct uni_pagedict *vgacon_uni_pagedir;

static int vgacon_refcount;
@@ -142,12 +134,6 @@ static inline void vga_set_mem_top(struct vc_data *c) 
	write_vga(12, (c->vc_visible_origin - vga_vram_base) / 2);

}



static void vgacon_restore_screen(struct vc_data *c)

{

	if (c->vc_origin != c->vc_visible_origin)

		vgacon_scrolldelta(c, 0);

}



static void vgacon_scrolldelta(struct vc_data *c, int lines)

{

	vc_scrolldelta_helper(c, lines, vga_rolled_over, (void *)vga_vram_base,
@@ -155,6 +141,12 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines) 
	vga_set_mem_top(c);

}



static void vgacon_restore_screen(struct vc_data *c)

{

	if (c->vc_origin != c->vc_visible_origin)

		vgacon_scrolldelta(c, 0);

}



static const char *vgacon_startup(void)

{

	const char *display_desc = NULL;
@@ -445,7 +437,7 @@ static void vgacon_invert_region(struct vc_data *c, u16 * p, int count) 
	}

}



static void vgacon_set_cursor_size(int xpos, int from, int to)

static void vgacon_set_cursor_size(int from, int to)

{

	unsigned long flags;

	int curs, cure;
@@ -478,18 +470,22 @@ static void vgacon_set_cursor_size(int xpos, int from, int to) 


static void vgacon_cursor(struct vc_data *c, int mode)

{

	unsigned int c_height;



	if (c->vc_mode != KD_TEXT)

		return;



	vgacon_restore_screen(c);



	c_height = c->vc_cell_height;



	switch (mode) {

	case CM_ERASE:

		write_vga(14, (c->vc_pos - vga_vram_base) / 2);

	        if (vga_video_type >= VIDEO_TYPE_VGAC)

			vgacon_set_cursor_size(c->state.x, 31, 30);

			vgacon_set_cursor_size(31, 30);

		else

			vgacon_set_cursor_size(c->state.x, 31, 31);

			vgacon_set_cursor_size(31, 31);

		break;



	case CM_MOVE:
@@ -497,51 +493,38 @@ static void vgacon_cursor(struct vc_data *c, int mode) 
		write_vga(14, (c->vc_pos - vga_vram_base) / 2);

		switch (CUR_SIZE(c->vc_cursor_type)) {

		case CUR_UNDERLINE:

			vgacon_set_cursor_size(c->state.x,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 2 : 3),

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height -

					       (c_height < 10 ? 2 : 3),

					       c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_TWO_THIRDS:

			vgacon_set_cursor_size(c->state.x,

					       c->vc_cell_height / 3,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height / 3, c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_LOWER_THIRD:

			vgacon_set_cursor_size(c->state.x,

					       (c->vc_cell_height * 2) / 3,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height * 2 / 3, c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_LOWER_HALF:

			vgacon_set_cursor_size(c->state.x,

					       c->vc_cell_height / 2,

					       c->vc_cell_height -

					       (c->vc_cell_height <

						10 ? 1 : 2));

			vgacon_set_cursor_size(c_height / 2, c_height -

					       (c_height < 10 ? 1 : 2));

			break;

		case CUR_NONE:

			if (vga_video_type >= VIDEO_TYPE_VGAC)

				vgacon_set_cursor_size(c->state.x, 31, 30);

				vgacon_set_cursor_size(31, 30);

			else

				vgacon_set_cursor_size(c->state.x, 31, 31);

				vgacon_set_cursor_size(31, 31);

			break;

		default:

			vgacon_set_cursor_size(c->state.x, 1,

					       c->vc_cell_height);

			vgacon_set_cursor_size(1, c_height);

			break;

		}

		break;

	}

}



static int vgacon_doresize(struct vc_data *c,

static void vgacon_doresize(struct vc_data *c,

		unsigned int width, unsigned int height)

{

	unsigned long flags;
@@ -600,7 +583,6 @@ static int vgacon_doresize(struct vc_data *c, 
	}



	raw_spin_unlock_irqrestore(&vga_lock, flags);

	return 0;

}



static int vgacon_switch(struct vc_data *c)

drivers/video/fbdev/au1200fb.c

+3 −0
Original line number Diff line number Diff line
@@ -1732,6 +1732,9 @@ static int au1200fb_drv_probe(struct platform_device *dev) 


	/* Now hook interrupt too */

	irq = platform_get_irq(dev, 0);

	if (irq < 0)

		return irq;



	ret = request_irq(irq, au1200fb_handle_irq,

			  IRQF_SHARED, "lcd", (void *)dev);

	if (ret) {

drivers/video/fbdev/bw2.c

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include <linux/init.h>

#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>



#include <asm/io.h>

#include <asm/fbio.h>

drivers/video/fbdev/cg14.c

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/uaccess.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>



#include <asm/io.h>

#include <asm/fbio.h>