Commit 9c96394b authored by David Miller's avatar David Miller Committed by Paul Mundt
Browse files

svga: Make svga_set_textmode_vga_regs() take an iomem regbase pointer. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 1d28fcad

drivers/video/arkfb.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static int arkfb_set_par(struct fb_info *info) 
	switch (mode) {

	case 0:

		pr_debug("fb%d: text mode\n", info->node);

		svga_set_textmode_vga_regs();

		svga_set_textmode_vga_regs(par->state.vgabase);



		vga_wseq(NULL, 0x11, 0x10); /* basic VGA mode */

		svga_wcrt_mask(par->state.vgabase, 0x46, 0x00, 0x04); /* 8bit pixel path */

drivers/video/s3fb.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static int s3fb_set_par(struct fb_info *info) 
	switch (mode) {

	case 0:

		pr_debug("fb%d: text mode\n", info->node);

		svga_set_textmode_vga_regs();

		svga_set_textmode_vga_regs(par->state.vgabase);



		/* Set additional registers like in 8-bit mode */

		svga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30);

drivers/video/svgalib.c

+20 −20
Original line number Diff line number Diff line
@@ -137,33 +137,33 @@ void svga_set_default_crt_regs(void __iomem *regbase) 
	vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3);

}



void svga_set_textmode_vga_regs(void)

void svga_set_textmode_vga_regs(void __iomem *regbase)

{

	/* svga_wseq_mask(NULL, 0x1, 0x00, 0x01); */   /* Switch 8/9 pixel per char */

	vga_wseq(NULL, VGA_SEQ_MEMORY_MODE,	VGA_SR04_EXT_MEM);

	vga_wseq(NULL, VGA_SEQ_PLANE_WRITE,	0x03);

	/* svga_wseq_mask(regbase, 0x1, 0x00, 0x01); */   /* Switch 8/9 pixel per char */

	vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM);

	vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0x03);



	vga_wcrt(NULL, VGA_CRTC_MAX_SCAN,	0x0f); /* 0x4f */

	vga_wcrt(NULL, VGA_CRTC_UNDERLINE,	0x1f);

	svga_wcrt_mask(NULL, VGA_CRTC_MODE, 0x23, 0x7f);

	vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */

	vga_wcrt(regbase, VGA_CRTC_UNDERLINE, 0x1f);

	svga_wcrt_mask(regbase, VGA_CRTC_MODE, 0x23, 0x7f);



	vga_wcrt(NULL, VGA_CRTC_CURSOR_START,	0x0d);

	vga_wcrt(NULL, VGA_CRTC_CURSOR_END,	0x0e);

	vga_wcrt(NULL, VGA_CRTC_CURSOR_HI,	0x00);

	vga_wcrt(NULL, VGA_CRTC_CURSOR_LO,	0x00);

	vga_wcrt(regbase, VGA_CRTC_CURSOR_START, 0x0d);

	vga_wcrt(regbase, VGA_CRTC_CURSOR_END, 0x0e);

	vga_wcrt(regbase, VGA_CRTC_CURSOR_HI, 0x00);

	vga_wcrt(regbase, VGA_CRTC_CURSOR_LO, 0x00);



	vga_wgfx(NULL, VGA_GFX_MODE,		0x10); /* Odd/even memory mode */

	vga_wgfx(NULL, VGA_GFX_MISC,		0x0E); /* Misc graphics register - text mode enable */

	vga_wgfx(NULL, VGA_GFX_COMPARE_MASK,	0x00);

	vga_wgfx(regbase, VGA_GFX_MODE, 0x10); /* Odd/even memory mode */

	vga_wgfx(regbase, VGA_GFX_MISC, 0x0E); /* Misc graphics register - text mode enable */

	vga_wgfx(regbase, VGA_GFX_COMPARE_MASK, 0x00);



	vga_r(NULL, 0x3DA);

	vga_w(NULL, VGA_ATT_W, 0x00);

	vga_r(regbase, 0x3DA);

	vga_w(regbase, VGA_ATT_W, 0x00);



	svga_wattr(NULL, 0x10, 0x0C);			/* Attribute Mode Control Register - text mode, blinking and line graphics */

	svga_wattr(NULL, 0x13, 0x08);			/* Horizontal Pixel Panning Register  */

	svga_wattr(regbase, 0x10, 0x0C);			/* Attribute Mode Control Register - text mode, blinking and line graphics */

	svga_wattr(regbase, 0x13, 0x08);			/* Horizontal Pixel Panning Register  */



	vga_r(NULL, 0x3DA);

	vga_w(NULL, VGA_ATT_W, 0x20);

	vga_r(regbase, 0x3DA);

	vga_w(regbase, VGA_ATT_W, 0x20);

}



#if 0

drivers/video/vt8623fb.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int vt8623fb_set_par(struct fb_info *info) 
	switch (mode) {

	case 0:

		pr_debug("fb%d: text mode\n", info->node);

		svga_set_textmode_vga_regs();

		svga_set_textmode_vga_regs(par->state.vgabase);

		svga_wseq_mask(par->state.vgabase, 0x15, 0x00, 0xFE);

		svga_wcrt_mask(par->state.vgabase, 0x11, 0x60, 0x70);

		break;

include/linux/svga.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void svga_set_default_gfx_regs(void __iomem *regbase); 
void svga_set_default_atc_regs(void __iomem *regbase);

void svga_set_default_seq_regs(void __iomem *regbase);

void svga_set_default_crt_regs(void __iomem *regbase);

void svga_set_textmode_vga_regs(void);

void svga_set_textmode_vga_regs(void __iomem *regbase);



void svga_settile(struct fb_info *info, struct fb_tilemap *map);

void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area);