cirrusfb: add Laguna additional overflow register
Add additional overflow register setting for Laguna chips. Also, simplify some code in the cirrusfb_pan_display() and cirrusfb_blank(). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Krzysztof Helt
Linus Torvalds
parent
55a4ea6ab0
commit
213d4bdd8c
2 changed files with 43 additions and 26 deletions
|
|
@ -1259,13 +1259,32 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
|
|||
/* screen start addr #16-18, fastpagemode cycles */
|
||||
vga_wcrt(regbase, CL_CRT1B, tmp);
|
||||
|
||||
if (cinfo->btype == BT_SD64 ||
|
||||
cinfo->btype == BT_PICASSO4 ||
|
||||
cinfo->btype == BT_ALPINE ||
|
||||
cinfo->btype == BT_GD5480)
|
||||
/* screen start address bit 19 */
|
||||
/* screen start address bit 19 */
|
||||
if (cirrusfb_board_info[cinfo->btype].scrn_start_bit19)
|
||||
vga_wcrt(regbase, CL_CRT1D, 0x00);
|
||||
|
||||
if (cinfo->btype == BT_LAGUNA ||
|
||||
cinfo->btype == BT_GD5480) {
|
||||
|
||||
tmp = 0;
|
||||
if ((htotal + 5) & 256)
|
||||
tmp |= 128;
|
||||
if (hdispend & 256)
|
||||
tmp |= 64;
|
||||
if (hsyncstart & 256)
|
||||
tmp |= 48;
|
||||
if (vtotal & 1024)
|
||||
tmp |= 8;
|
||||
if (vdispend & 1024)
|
||||
tmp |= 4;
|
||||
if (vsyncstart & 1024)
|
||||
tmp |= 3;
|
||||
|
||||
vga_wcrt(regbase, CL_CRT1E, tmp);
|
||||
dev_dbg(info->device, "CRT1e: %d\n", tmp);
|
||||
}
|
||||
|
||||
|
||||
/* text cursor location high */
|
||||
vga_wcrt(regbase, VGA_CRTC_CURSOR_HI, 0);
|
||||
/* text cursor location low */
|
||||
|
|
@ -1383,7 +1402,7 @@ static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
|
|||
int xoffset = 0;
|
||||
int yoffset = 0;
|
||||
unsigned long base;
|
||||
unsigned char tmp = 0, tmp2 = 0, xpix;
|
||||
unsigned char tmp, xpix;
|
||||
struct cirrusfb_info *cinfo = info->par;
|
||||
|
||||
dev_dbg(info->device,
|
||||
|
|
@ -1418,6 +1437,8 @@ static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
|
|||
vga_wcrt(cinfo->regbase, VGA_CRTC_START_HI,
|
||||
(unsigned char) (base >> 8));
|
||||
|
||||
/* 0xf2 is %11110010, exclude tmp bits */
|
||||
tmp = vga_rcrt(cinfo->regbase, CL_CRT1B) & 0xf2;
|
||||
/* construct bits 16, 17 and 18 of screen start address */
|
||||
if (base & 0x10000)
|
||||
tmp |= 0x01;
|
||||
|
|
@ -1426,9 +1447,7 @@ static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
|
|||
if (base & 0x40000)
|
||||
tmp |= 0x08;
|
||||
|
||||
/* 0xf2 is %11110010, exclude tmp bits */
|
||||
tmp2 = (vga_rcrt(cinfo->regbase, CL_CRT1B) & 0xf2) | tmp;
|
||||
vga_wcrt(cinfo->regbase, CL_CRT1B, tmp2);
|
||||
vga_wcrt(cinfo->regbase, CL_CRT1B, tmp);
|
||||
|
||||
/* construct bit 19 of screen start address */
|
||||
if (cirrusfb_board_info[cinfo->btype].scrn_start_bit19)
|
||||
|
|
@ -1473,47 +1492,44 @@ static int cirrusfb_blank(int blank_mode, struct fb_info *info)
|
|||
|
||||
/* Undo current */
|
||||
if (current_mode == FB_BLANK_NORMAL ||
|
||||
current_mode == FB_BLANK_UNBLANK) {
|
||||
/* unblank the screen */
|
||||
val = vga_rseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE);
|
||||
current_mode == FB_BLANK_UNBLANK)
|
||||
/* clear "FullBandwidth" bit */
|
||||
vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, val & 0xdf);
|
||||
/* and undo VESA suspend trickery */
|
||||
vga_wgfx(cinfo->regbase, CL_GRE, 0x00);
|
||||
}
|
||||
|
||||
/* set new */
|
||||
if (blank_mode > FB_BLANK_NORMAL) {
|
||||
/* blank the screen */
|
||||
val = vga_rseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE);
|
||||
val = 0;
|
||||
else
|
||||
/* set "FullBandwidth" bit */
|
||||
vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, val | 0x20);
|
||||
}
|
||||
val = 0x20;
|
||||
|
||||
val |= vga_rseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE) & 0xdf;
|
||||
vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, val);
|
||||
|
||||
switch (blank_mode) {
|
||||
case FB_BLANK_UNBLANK:
|
||||
case FB_BLANK_NORMAL:
|
||||
val = 0x00;
|
||||
break;
|
||||
case FB_BLANK_VSYNC_SUSPEND:
|
||||
vga_wgfx(cinfo->regbase, CL_GRE, 0x04);
|
||||
val = 0x04;
|
||||
break;
|
||||
case FB_BLANK_HSYNC_SUSPEND:
|
||||
vga_wgfx(cinfo->regbase, CL_GRE, 0x02);
|
||||
val = 0x02;
|
||||
break;
|
||||
case FB_BLANK_POWERDOWN:
|
||||
vga_wgfx(cinfo->regbase, CL_GRE, 0x06);
|
||||
val = 0x06;
|
||||
break;
|
||||
default:
|
||||
dev_dbg(info->device, "EXIT, returning 1\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
vga_wgfx(cinfo->regbase, CL_GRE, val);
|
||||
|
||||
cinfo->blank_mode = blank_mode;
|
||||
dev_dbg(info->device, "EXIT, returning 0\n");
|
||||
|
||||
/* Let fbcon do a soft blank for us */
|
||||
return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;
|
||||
}
|
||||
|
||||
/**** END Hardware specific Routines **************************************/
|
||||
/****************************************************************************/
|
||||
/**** BEGIN Internal Routines ***********************************************/
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@
|
|||
#define CL_CRT1B 0x1b /* Extended Display Controls */
|
||||
#define CL_CRT1C 0x1c /* Sync adjust and genlock register */
|
||||
#define CL_CRT1D 0x1d /* Overlay Extended Control register */
|
||||
#define CL_CRT1E 0x1e /* Another overflow register */
|
||||
#define CL_CRT25 0x25 /* Part Status Register */
|
||||
#define CL_CRT27 0x27 /* ID Register */
|
||||
#define CL_CRT51 0x51 /* P4 disable "flicker fixer" */
|
||||
|
|
|
|||
Loading…
Reference in a new issue