Skip to content

L
linux
Commit 245a2c2c authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files
Options

tridentfb: coding style improvement 

This patch contains coding style improvements to the tridentfb driver (white
spaces, indentations, long lines).

It also moves fb_ops structure after fb api functions are defined.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9ffa7396
Hide whitespace changes
Inline Side-by-side
Showing with 592 additions and 483 deletions
drivers/video/tridentfb.c
View file @ 245a2c2c
/* /*
* Frame buffer driver for Trident Blade and Image series * Frame buffer driver for Trident Blade and Image series
* *
* Copyright 2001,2002 - Jani Monoses <jani@iv.ro> * Copyright 2001, 2002 - Jani Monoses <jani@iv.ro>
* *
* *
* CREDITS:(in order of appearance) * CREDITS:(in order of appearance)
* skeletonfb.c by Geert Uytterhoeven and other fb code in drivers/video * skeletonfb.c by Geert Uytterhoeven and other fb code in drivers/video
* Special thanks ;) to Mattia Crivellini <tia@mclink.it> * Special thanks ;) to Mattia Crivellini <tia@mclink.it>
* much inspired by the XFree86 4.x Trident driver sources by Alan Hourihane * much inspired by the XFree86 4.x Trident driver sources
* the FreeVGA project * by Alan Hourihane the FreeVGA project
* Francesco Salvestrini <salvestrini@users.sf.net> XP support,code,suggestions * Francesco Salvestrini <salvestrini@users.sf.net> XP support,
* code, suggestions
* TODO: * TODO:
* timing value tweaking so it looks good on every monitor in every mode * timing value tweaking so it looks good on every monitor in every mode
* TGUI acceleration * TGUI acceleration
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -26,11 +27,11 @@ ...@@ -26,11 +27,11 @@
#define VERSION "0.7.8-NEWAPI" #define VERSION "0.7.8-NEWAPI"
struct tridentfb_par { struct tridentfb_par {
int vclk; //in MHz int vclk; /* in MHz */
void __iomem * io_virt; //iospace virtual memory address void __iomem *io_virt; /* iospace virtual memory address */
}; };
static unsigned char eng_oper; //engine operation... static unsigned char eng_oper; /* engine operation... */
static struct fb_ops tridentfb_ops; static struct fb_ops tridentfb_ops;
static struct tridentfb_par default_par; static struct tridentfb_par default_par;
...@@ -39,11 +40,10 @@ static struct tridentfb_par default_par; ...@@ -39,11 +40,10 @@ static struct tridentfb_par default_par;
static struct fb_info fb_info; static struct fb_info fb_info;
static u32 pseudo_pal[16]; static u32 pseudo_pal[16];
static struct fb_var_screeninfo default_var; static struct fb_var_screeninfo default_var;
static struct fb_fix_screeninfo tridentfb_fix = { static struct fb_fix_screeninfo tridentfb_fix = {
.id = "Trident", .id = "Trident",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.ypanstep = 1, .ypanstep = 1,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
...@@ -55,11 +55,10 @@ static int chip_id; ...@@ -55,11 +55,10 @@ static int chip_id;
static int defaultaccel; static int defaultaccel;
static int displaytype; static int displaytype;
/* defaults which are normally overriden by user values */ /* defaults which are normally overriden by user values */
/* video mode */ /* video mode */
static char * mode = "640x480"; static char *mode = "640x480";
static int bpp = 8; static int bpp = 8;
static int noaccel; static int noaccel;
...@@ -74,7 +73,6 @@ static int memsize; ...@@ -74,7 +73,6 @@ static int memsize;
static int memdiff; static int memdiff;
static int nativex; static int nativex;
module_param(mode, charp, 0); module_param(mode, charp, 0);
module_param(bpp, int, 0); module_param(bpp, int, 0);
module_param(center, int, 0); module_param(center, int, 0);
...@@ -86,88 +84,85 @@ module_param(nativex, int, 0); ...@@ -86,88 +84,85 @@ module_param(nativex, int, 0);
module_param(fp, int, 0); module_param(fp, int, 0);
module_param(crt, int, 0); module_param(crt, int, 0);
static int chip3D; static int chip3D;
static int chipcyber; static int chipcyber;
static int is3Dchip(int id) static int is3Dchip(int id)
{ {
return ((id == BLADE3D) || (id == CYBERBLADEE4) || return ((id == BLADE3D) || (id == CYBERBLADEE4) ||
(id == CYBERBLADEi7) || (id == CYBERBLADEi7D) || (id == CYBERBLADEi7) || (id == CYBERBLADEi7D) ||
(id == CYBER9397) || (id == CYBER9397DVD) || (id == CYBER9397) || (id == CYBER9397DVD) ||
(id == CYBER9520) || (id == CYBER9525DVD) || (id == CYBER9520) || (id == CYBER9525DVD) ||
(id == IMAGE975) || (id == IMAGE985) || (id == IMAGE975) || (id == IMAGE985) ||
(id == CYBERBLADEi1) || (id == CYBERBLADEi1D) || (id == CYBERBLADEi1) || (id == CYBERBLADEi1D) ||
(id == CYBERBLADEAi1) || (id == CYBERBLADEAi1D) || (id == CYBERBLADEAi1) || (id == CYBERBLADEAi1D) ||
(id == CYBERBLADEXPm8) || (id == CYBERBLADEXPm16) || (id == CYBERBLADEXPm8) || (id == CYBERBLADEXPm16) ||
(id == CYBERBLADEXPAi1)); (id == CYBERBLADEXPAi1));
} }
static int iscyber(int id) static int iscyber(int id)
{ {
switch (id) { switch (id) {
case CYBER9388: case CYBER9388:
case CYBER9382: case CYBER9382:
case CYBER9385: case CYBER9385:
case CYBER9397: case CYBER9397:
case CYBER9397DVD: case CYBER9397DVD:
case CYBER9520: case CYBER9520:
case CYBER9525DVD: case CYBER9525DVD:
case CYBERBLADEE4: case CYBERBLADEE4:
case CYBERBLADEi7D: case CYBERBLADEi7D:
case CYBERBLADEi1: case CYBERBLADEi1:
case CYBERBLADEi1D: case CYBERBLADEi1D:
case CYBERBLADEAi1: case CYBERBLADEAi1:
case CYBERBLADEAi1D: case CYBERBLADEAi1D:
case CYBERBLADEXPAi1: case CYBERBLADEXPAi1:
return 1; return 1;
case CYBER9320:
case TGUI9660:
case IMAGE975:
case IMAGE985:
case BLADE3D:
case CYBERBLADEi7: /* VIA MPV4 integrated version */
default: case CYBER9320:
/* case CYBERBLDAEXPm8: Strange */ case TGUI9660:
/* case CYBERBLDAEXPm16: Strange */ case IMAGE975:
return 0; case IMAGE985:
case BLADE3D:
case CYBERBLADEi7: /* VIA MPV4 integrated version */
default:
/* case CYBERBLDAEXPm8: Strange */
/* case CYBERBLDAEXPm16: Strange */
return 0;
} }
} }
#define CRT 0x3D0 //CRTC registers offset for color display #define CRT 0x3D0 /* CRTC registers offset for color display */
#ifndef TRIDENT_MMIO #ifndef TRIDENT_MMIO
#define TRIDENT_MMIO 1 #define TRIDENT_MMIO 1
#endif #endif
#if TRIDENT_MMIO #if TRIDENT_MMIO
#define t_outb(val,reg) writeb(val,((struct tridentfb_par *)(fb_info.par))->io_virt + reg) #define t_outb(val, reg) writeb(val,((struct tridentfb_par *)(fb_info.par))->io_virt + reg)
#define t_inb(reg) readb(((struct tridentfb_par*)(fb_info.par))->io_virt + reg) #define t_inb(reg) readb(((struct tridentfb_par*)(fb_info.par))->io_virt + reg)
#else #else
#define t_outb(val,reg) outb(val,reg) #define t_outb(val, reg) outb(val, reg)
#define t_inb(reg) inb(reg) #define t_inb(reg) inb(reg)
#endif #endif
static struct accel_switch { static struct accel_switch {
void (*init_accel)(int,int); void (*init_accel) (int, int);
void (*wait_engine)(void); void (*wait_engine) (void);
void (*fill_rect)(__u32,__u32,__u32,__u32,__u32,__u32); void (*fill_rect) (u32, u32, u32, u32, u32, u32);
void (*copy_rect)(__u32,__u32,__u32,__u32,__u32,__u32); void (*copy_rect) (u32, u32, u32, u32, u32, u32);
} *acc; } *acc;
#define writemmr(r,v) writel(v, ((struct tridentfb_par *)fb_info.par)->io_virt + r) #define writemmr(r, v) writel(v, ((struct tridentfb_par *)fb_info.par)->io_virt + r)
#define readmmr(r) readl(((struct tridentfb_par *)fb_info.par)->io_virt + r) #define readmmr(r) readl(((struct tridentfb_par *)fb_info.par)->io_virt + r)
/* /*
* Blade specific acceleration. * Blade specific acceleration.
*/ */
#define point(x,y) ((y)<<16|(x)) #define point(x, y) ((y) << 16 | (x))
#define STA 0x2120 #define STA 0x2120
#define CMD 0x2144 #define CMD 0x2144
#define ROP 0x2148 #define ROP 0x2148
...@@ -179,64 +174,71 @@ static struct accel_switch { ...@@ -179,64 +174,71 @@ static struct accel_switch {
#define ROP_S 0xCC #define ROP_S 0xCC
static void blade_init_accel(int pitch,int bpp) static void blade_init_accel(int pitch, int bpp)
{ {
int v1 = (pitch>>3)<<20; int v1 = (pitch >> 3) << 20;
int tmp = 0,v2; int tmp = 0, v2;
switch (bpp) { switch (bpp) {
case 8:tmp = 0;break; case 8:
case 15:tmp = 5;break; tmp = 0;
case 16:tmp = 1;break; break;
case 24: case 15:
case 32:tmp = 2;break; tmp = 5;
break;
case 16:
tmp = 1;
break;
case 24:
case 32:
tmp = 2;
break;
} }
v2 = v1 | (tmp<<29); v2 = v1 | (tmp << 29);
writemmr(0x21C0,v2); writemmr(0x21C0, v2);
writemmr(0x21C4,v2); writemmr(0x21C4, v2);
writemmr(0x21B8,v2); writemmr(0x21B8, v2);
writemmr(0x21BC,v2); writemmr(0x21BC, v2);
writemmr(0x21D0,v1); writemmr(0x21D0, v1);
writemmr(0x21D4,v1); writemmr(0x21D4, v1);
writemmr(0x21C8,v1); writemmr(0x21C8, v1);
writemmr(0x21CC,v1); writemmr(0x21CC, v1);
writemmr(0x216C,0); writemmr(0x216C, 0);
} }
static void blade_wait_engine(void) static void blade_wait_engine(void)
{ {
while(readmmr(STA) & 0xFA800000); while (readmmr(STA) & 0xFA800000) ;
} }
static void blade_fill_rect(__u32 x,__u32 y,__u32 w,__u32 h,__u32 c,__u32 rop) static void blade_fill_rect(u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
{ {
writemmr(CLR,c); writemmr(CLR, c);
writemmr(ROP,rop ? 0x66:ROP_S); writemmr(ROP, rop ? 0x66 : ROP_S);
writemmr(CMD,0x20000000|1<<19|1<<4|2<<2); writemmr(CMD, 0x20000000 | 1 << 19 | 1 << 4 | 2 << 2);
writemmr(DR1,point(x,y)); writemmr(DR1, point(x, y));
writemmr(DR2,point(x+w-1,y+h-1)); writemmr(DR2, point(x + w - 1, y + h - 1));
} }
static void blade_copy_rect(__u32 x1,__u32 y1,__u32 x2,__u32 y2,__u32 w,__u32 h) static void blade_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
{ {
__u32 s1,s2,d1,d2; u32 s1, s2, d1, d2;
int direction = 2; int direction = 2;
s1 = point(x1,y1); s1 = point(x1, y1);
s2 = point(x1+w-1,y1+h-1); s2 = point(x1 + w - 1, y1 + h - 1);
d1 = point(x2,y2); d1 = point(x2, y2);
d2 = point(x2+w-1,y2+h-1); d2 = point(x2 + w - 1, y2 + h - 1);
if ((y1 > y2) || ((y1 == y2) && (x1 > x2))) if ((y1 > y2) || ((y1 == y2) && (x1 > x2)))
direction = 0; direction = 0;
writemmr(ROP,ROP_S); writemmr(ROP, ROP_S);
writemmr(CMD,0xE0000000|1<<19|1<<4|1<<2|direction); writemmr(CMD, 0xE0000000 | 1 << 19 | 1 << 4 | 1 << 2 | direction);
writemmr(SR1,direction?s2:s1); writemmr(SR1, direction ? s2 : s1);
writemmr(SR2,direction?s1:s2); writemmr(SR2, direction ? s1 : s2);
writemmr(DR1,direction?d2:d1); writemmr(DR1, direction ? d2 : d1);
writemmr(DR2,direction?d1:d2); writemmr(DR2, direction ? d1 : d2);
} }
static struct accel_switch accel_blade = { static struct accel_switch accel_blade = {
...@@ -246,51 +248,72 @@ static struct accel_switch accel_blade = { ...@@ -246,51 +248,72 @@ static struct accel_switch accel_blade = {
blade_copy_rect, blade_copy_rect,
}; };
/* /*
* BladeXP specific acceleration functions * BladeXP specific acceleration functions
*/ */
#define ROP_P 0xF0 #define ROP_P 0xF0
#define masked_point(x,y) ((y & 0xffff)<<16|(x & 0xffff)) #define masked_point(x, y) ((y & 0xffff)<<16|(x & 0xffff))
static void xp_init_accel(int pitch,int bpp) static void xp_init_accel(int pitch, int bpp)
{ {
int tmp = 0,v1; int tmp = 0, v1;
unsigned char x = 0; unsigned char x = 0;
switch (bpp) { switch (bpp) {
case 8: x = 0; break; case 8:
case 16: x = 1; break; x = 0;
case 24: x = 3; break; break;
case 32: x = 2; break; case 16:
x = 1;
break;
case 24:
x = 3;
break;
case 32:
x = 2;
break;
} }
switch (pitch << (bpp >> 3)) { switch (pitch << (bpp >> 3)) {
case 8192: case 8192:
case 512: x |= 0x00; break; case 512:
case 1024: x |= 0x04; break; x |= 0x00;
case 2048: x |= 0x08; break; break;
case 4096: x |= 0x0C; break; case 1024:
x |= 0x04;
break;
case 2048:
x |= 0x08;
break;
case 4096:
x |= 0x0C;
break;
} }
t_outb(x,0x2125); t_outb(x, 0x2125);
eng_oper = x | 0x40; eng_oper = x | 0x40;
switch (bpp) { switch (bpp) {
case 8: tmp = 18; break; case 8:
case 15: tmp = 18;
case 16: tmp = 19; break; break;
case 24: case 15:
case 32: tmp = 20; break; case 16:
tmp = 19;
break;
case 24:
case 32:
tmp = 20;
break;
} }
v1 = pitch << tmp; v1 = pitch << tmp;
writemmr(0x2154,v1); writemmr(0x2154, v1);
writemmr(0x2150,v1); writemmr(0x2150, v1);
t_outb(3,0x2126); t_outb(3, 0x2126);
} }
static void xp_wait_engine(void) static void xp_wait_engine(void)
...@@ -318,24 +341,24 @@ static void xp_wait_engine(void) ...@@ -318,24 +341,24 @@ static void xp_wait_engine(void)
} }
} }
static void xp_fill_rect(__u32 x,__u32 y,__u32 w,__u32 h,__u32 c,__u32 rop) static void xp_fill_rect(u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
{ {
writemmr(0x2127,ROP_P); writemmr(0x2127, ROP_P);
writemmr(0x2158,c); writemmr(0x2158, c);
writemmr(0x2128,0x4000); writemmr(0x2128, 0x4000);
writemmr(0x2140,masked_point(h,w)); writemmr(0x2140, masked_point(h, w));
writemmr(0x2138,masked_point(y,x)); writemmr(0x2138, masked_point(y, x));
t_outb(0x01,0x2124); t_outb(0x01, 0x2124);
t_outb(eng_oper,0x2125); t_outb(eng_oper, 0x2125);
} }
static void xp_copy_rect(__u32 x1,__u32 y1,__u32 x2,__u32 y2,__u32 w,__u32 h) static void xp_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
{ {
int direction; int direction;
__u32 x1_tmp, x2_tmp, y1_tmp, y2_tmp; u32 x1_tmp, x2_tmp, y1_tmp, y2_tmp;
direction = 0x0004; direction = 0x0004;
if ((x1 < x2) && (y1 == y2)) { if ((x1 < x2) && (y1 == y2)) {
direction |= 0x0200; direction |= 0x0200;
x1_tmp = x1 + w - 1; x1_tmp = x1 + w - 1;
...@@ -344,53 +367,60 @@ static void xp_copy_rect(__u32 x1,__u32 y1,__u32 x2,__u32 y2,__u32 w,__u32 h) ...@@ -344,53 +367,60 @@ static void xp_copy_rect(__u32 x1,__u32 y1,__u32 x2,__u32 y2,__u32 w,__u32 h)
x1_tmp = x1; x1_tmp = x1;
x2_tmp = x2; x2_tmp = x2;
} }
if (y1 < y2) { if (y1 < y2) {
direction |= 0x0100; direction |= 0x0100;
y1_tmp = y1 + h - 1; y1_tmp = y1 + h - 1;
y2_tmp = y2 + h - 1; y2_tmp = y2 + h - 1;
} else { } else {
y1_tmp = y1; y1_tmp = y1;
y2_tmp = y2; y2_tmp = y2;
} }
writemmr(0x2128,direction); writemmr(0x2128, direction);
t_outb(ROP_S,0x2127); t_outb(ROP_S, 0x2127);
writemmr(0x213C,masked_point(y1_tmp,x1_tmp)); writemmr(0x213C, masked_point(y1_tmp, x1_tmp));
writemmr(0x2138,masked_point(y2_tmp,x2_tmp)); writemmr(0x2138, masked_point(y2_tmp, x2_tmp));
writemmr(0x2140,masked_point(h,w)); writemmr(0x2140, masked_point(h, w));
t_outb(0x01,0x2124); t_outb(0x01, 0x2124);
} }
static struct accel_switch accel_xp = { static struct accel_switch accel_xp = {
xp_init_accel, xp_init_accel,
xp_wait_engine, xp_wait_engine,
xp_fill_rect, xp_fill_rect,
xp_copy_rect, xp_copy_rect,
}; };
/* /*
* Image specific acceleration functions * Image specific acceleration functions
*/ */
static void image_init_accel(int pitch,int bpp) static void image_init_accel(int pitch, int bpp)
{ {
int tmp = 0; int tmp = 0;
switch (bpp) { switch (bpp) {
case 8:tmp = 0;break; case 8:
case 15:tmp = 5;break; tmp = 0;
case 16:tmp = 1;break; break;
case 24: case 15:
case 32:tmp = 2;break; tmp = 5;
break;
case 16:
tmp = 1;
break;
case 24:
case 32:
tmp = 2;
break;
} }
writemmr(0x2120, 0xF0000000); writemmr(0x2120, 0xF0000000);
writemmr(0x2120, 0x40000000|tmp); writemmr(0x2120, 0x40000000 | tmp);
writemmr(0x2120, 0x80000000); writemmr(0x2120, 0x80000000);
writemmr(0x2144, 0x00000000); writemmr(0x2144, 0x00000000);
writemmr(0x2148, 0x00000000); writemmr(0x2148, 0x00000000);
writemmr(0x2150, 0x00000000); writemmr(0x2150, 0x00000000);
writemmr(0x2154, 0x00000000); writemmr(0x2154, 0x00000000);
writemmr(0x2120, 0x60000000|(pitch<<16) |pitch); writemmr(0x2120, 0x60000000 | (pitch << 16) | pitch);
writemmr(0x216C, 0x00000000); writemmr(0x216C, 0x00000000);
writemmr(0x2170, 0x00000000); writemmr(0x2170, 0x00000000);
writemmr(0x217C, 0x00000000); writemmr(0x217C, 0x00000000);
...@@ -400,44 +430,43 @@ static void image_init_accel(int pitch,int bpp) ...@@ -400,44 +430,43 @@ static void image_init_accel(int pitch,int bpp)
static void image_wait_engine(void) static void image_wait_engine(void)
{ {
while(readmmr(0x2164) & 0xF0000000); while (readmmr(0x2164) & 0xF0000000) ;
} }
static void image_fill_rect(__u32 x, __u32 y, __u32 w, __u32 h, __u32 c, __u32 rop) static void image_fill_rect(u32 x, u32 y, u32 w, u32 h, u32 c, u32 rop)
{ {
writemmr(0x2120,0x80000000); writemmr(0x2120, 0x80000000);
writemmr(0x2120,0x90000000|ROP_S); writemmr(0x2120, 0x90000000 | ROP_S);
writemmr(0x2144,c); writemmr(0x2144, c);
writemmr(DR1,point(x,y)); writemmr(DR1, point(x, y));
writemmr(DR2,point(x+w-1,y+h-1)); writemmr(DR2, point(x + w - 1, y + h - 1));
writemmr(0x2124,0x80000000|3<<22|1<<10|1<<9); writemmr(0x2124, 0x80000000 | 3 << 22 | 1 << 10 | 1 << 9);
} }
static void image_copy_rect(__u32 x1,__u32 y1,__u32 x2,__u32 y2,__u32 w,__u32 h) static void image_copy_rect(u32 x1, u32 y1, u32 x2, u32 y2, u32 w, u32 h)
{ {
__u32 s1,s2,d1,d2; u32 s1, s2, d1, d2;
int direction = 2; int direction = 2;
s1 = point(x1,y1); s1 = point(x1, y1);
s2 = point(x1+w-1,y1+h-1); s2 = point(x1 + w - 1, y1 + h - 1);
d1 = point(x2,y2); d1 = point(x2, y2);
d2 = point(x2+w-1,y2+h-1); d2 = point(x2 + w - 1, y2 + h - 1);
if ((y1 > y2) || ((y1 == y2) && (x1 >x2)))
direction = 0;
writemmr(0x2120,0x80000000);
writemmr(0x2120,0x90000000|ROP_S);
writemmr(SR1,direction?s2:s1);
writemmr(SR2,direction?s1:s2);
writemmr(DR1,direction?d2:d1);
writemmr(DR2,direction?d1:d2);
writemmr(0x2124,0x80000000|1<<22|1<<10|1<<7|direction);
}
if ((y1 > y2) || ((y1 == y2) && (x1 > x2)))
direction = 0;
writemmr(0x2120, 0x80000000);
writemmr(0x2120, 0x90000000 | ROP_S);
writemmr(SR1, direction ? s2 : s1);
writemmr(SR2, direction ? s1 : s2);
writemmr(DR1, direction ? d2 : d1);
writemmr(DR2, direction ? d1 : d2);
writemmr(0x2124, 0x80000000 | 1 << 22 | 1 << 10 | 1 << 7 | direction);
}
static struct accel_switch accel_image = { static struct accel_switch accel_image = {
image_init_accel, image_init_accel,
...@@ -450,30 +479,34 @@ static struct accel_switch accel_image = { ...@@ -450,30 +479,34 @@ static struct accel_switch accel_image = {
* Accel functions called by the upper layers * Accel functions called by the upper layers
*/ */
#ifdef CONFIG_FB_TRIDENT_ACCEL #ifdef CONFIG_FB_TRIDENT_ACCEL
static void tridentfb_fillrect(struct fb_info * info, const struct fb_fillrect *fr) static void tridentfb_fillrect(struct fb_info *info,
const struct fb_fillrect *fr)
{ {
int bpp = info->var.bits_per_pixel; int bpp = info->var.bits_per_pixel;
int col = 0; int col = 0;
switch (bpp) { switch (bpp) {
default: default:
case 8: col |= fr->color; case 8:
col |= col << 8; col |= fr->color;
col |= col << 16; col |= col << 8;
break; col |= col << 16;
case 16: col = ((u32 *)(info->pseudo_palette))[fr->color]; break;
case 16:
break; col = ((u32 *)(info->pseudo_palette))[fr->color];
case 32: col = ((u32 *)(info->pseudo_palette))[fr->color]; break;
break; case 32:
} col = ((u32 *)(info->pseudo_palette))[fr->color];
break;
}
acc->fill_rect(fr->dx, fr->dy, fr->width, fr->height, col, fr->rop); acc->fill_rect(fr->dx, fr->dy, fr->width, fr->height, col, fr->rop);
acc->wait_engine(); acc->wait_engine();
} }
static void tridentfb_copyarea(struct fb_info *info, const struct fb_copyarea *ca) static void tridentfb_copyarea(struct fb_info *info,
const struct fb_copyarea *ca)
{ {
acc->copy_rect(ca->sx,ca->sy,ca->dx,ca->dy,ca->width,ca->height); acc->copy_rect(ca->sx, ca->sy, ca->dx, ca->dy, ca->width, ca->height);
acc->wait_engine(); acc->wait_engine();
} }
#else /* !CONFIG_FB_TRIDENT_ACCEL */ #else /* !CONFIG_FB_TRIDENT_ACCEL */
...@@ -488,14 +521,14 @@ static void tridentfb_copyarea(struct fb_info *info, const struct fb_copyarea *c ...@@ -488,14 +521,14 @@ static void tridentfb_copyarea(struct fb_info *info, const struct fb_copyarea *c
static inline unsigned char read3X4(int reg) static inline unsigned char read3X4(int reg)
{ {
struct tridentfb_par * par = (struct tridentfb_par *)fb_info.par; struct tridentfb_par *par = (struct tridentfb_par *)fb_info.par;
writeb(reg, par->io_virt + CRT + 4); writeb(reg, par->io_virt + CRT + 4);
return readb( par->io_virt + CRT + 5); return readb(par->io_virt + CRT + 5);
} }
static inline void write3X4(int reg, unsigned char val) static inline void write3X4(int reg, unsigned char val)
{ {
struct tridentfb_par * par = (struct tridentfb_par *)fb_info.par; struct tridentfb_par *par = (struct tridentfb_par *)fb_info.par;
writeb(reg, par->io_virt + CRT + 4); writeb(reg, par->io_virt + CRT + 4);
writeb(val, par->io_virt + CRT + 5); writeb(val, par->io_virt + CRT + 5);
} }
...@@ -520,7 +553,7 @@ static inline unsigned char read3CE(int reg) ...@@ -520,7 +553,7 @@ static inline unsigned char read3CE(int reg)
static inline void writeAttr(int reg, unsigned char val) static inline void writeAttr(int reg, unsigned char val)
{ {
readb(((struct tridentfb_par *)fb_info.par)->io_virt + CRT + 0x0A); //flip-flop to index readb(((struct tridentfb_par *)fb_info.par)->io_virt + CRT + 0x0A); /* flip-flop to index */
t_outb(reg, 0x3C0); t_outb(reg, 0x3C0);
t_outb(val, 0x3C0); t_outb(val, 0x3C0);
} }
...@@ -540,32 +573,41 @@ static inline void enable_mmio(void) ...@@ -540,32 +573,41 @@ static inline void enable_mmio(void)
/* Unprotect registers */ /* Unprotect registers */
outb(NewMode1, 0x3C4); outb(NewMode1, 0x3C4);
outb(0x80, 0x3C5); outb(0x80, 0x3C5);
/* Enable MMIO */ /* Enable MMIO */
outb(PCIReg, 0x3D4); outb(PCIReg, 0x3D4);
outb(inb(0x3D5) | 0x01, 0x3D5); outb(inb(0x3D5) | 0x01, 0x3D5);
} }
#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F) #define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
/* Return flat panel's maximum x resolution */ /* Return flat panel's maximum x resolution */
static int __devinit get_nativex(void) static int __devinit get_nativex(void)
{ {
int x,y,tmp; int x, y, tmp;
if (nativex) if (nativex)
return nativex; return nativex;
tmp = (read3CE(VertStretch) >> 4) & 3; tmp = (read3CE(VertStretch) >> 4) & 3;
switch (tmp) { switch (tmp) {
case 0: x = 1280; y = 1024; break; case 0:
case 2: x = 1024; y = 768; break; x = 1280; y = 1024;
case 3: x = 800; y = 600; break; break;
case 4: x = 1400; y = 1050; break; case 2:
case 1: x = 1024; y = 768;
default:x = 640; y = 480; break; break;
case 3:
x = 800; y = 600;
break;
case 4:
x = 1400; y = 1050;
break;
case 1:
default:
x = 640; y = 480;
break;
} }
output("%dx%d flat panel found\n", x, y); output("%dx%d flat panel found\n", x, y);
...@@ -576,25 +618,26 @@ static int __devinit get_nativex(void) ...@@ -576,25 +618,26 @@ static int __devinit get_nativex(void)
static void set_lwidth(int width) static void set_lwidth(int width)
{ {
write3X4(Offset, width & 0xFF); write3X4(Offset, width & 0xFF);
write3X4(AddColReg, (read3X4(AddColReg) & 0xCF) | ((width & 0x300) >>4)); write3X4(AddColReg,
(read3X4(AddColReg) & 0xCF) | ((width & 0x300) >> 4));
} }
/* For resolutions smaller than FP resolution stretch */ /* For resolutions smaller than FP resolution stretch */
static void screen_stretch(void) static void screen_stretch(void)
{ {
if (chip_id != CYBERBLADEXPAi1) if (chip_id != CYBERBLADEXPAi1)
write3CE(BiosReg,0); write3CE(BiosReg, 0);
else else
write3CE(BiosReg,8); write3CE(BiosReg, 8);
write3CE(VertStretch,(read3CE(VertStretch) & 0x7C) | 1); write3CE(VertStretch, (read3CE(VertStretch) & 0x7C) | 1);
write3CE(HorStretch,(read3CE(HorStretch) & 0x7C) | 1); write3CE(HorStretch, (read3CE(HorStretch) & 0x7C) | 1);
} }
/* For resolutions smaller than FP resolution center */ /* For resolutions smaller than FP resolution center */
static void screen_center(void) static void screen_center(void)
{ {
write3CE(VertStretch,(read3CE(VertStretch) & 0x7C) | 0x80); write3CE(VertStretch, (read3CE(VertStretch) & 0x7C) | 0x80);
write3CE(HorStretch,(read3CE(HorStretch) & 0x7C) | 0x80); write3CE(HorStretch, (read3CE(HorStretch) & 0x7C) | 0x80);
} }
/* Address of first shown pixel in display memory */ /* Address of first shown pixel in display memory */
...@@ -602,40 +645,42 @@ static void set_screen_start(int base) ...@@ -602,40 +645,42 @@ static void set_screen_start(int base)
{ {
write3X4(StartAddrLow, base & 0xFF); write3X4(StartAddrLow, base & 0xFF);
write3X4(StartAddrHigh, (base & 0xFF00) >> 8); write3X4(StartAddrHigh, (base & 0xFF00) >> 8);
write3X4(CRTCModuleTest, (read3X4(CRTCModuleTest) & 0xDF) | ((base & 0x10000) >> 11)); write3X4(CRTCModuleTest,
write3X4(CRTHiOrd, (read3X4(CRTHiOrd) & 0xF8) | ((base & 0xE0000) >> 17)); (read3X4(CRTCModuleTest) & 0xDF) | ((base & 0x10000) >> 11));
write3X4(CRTHiOrd,
(read3X4(CRTHiOrd) & 0xF8) | ((base & 0xE0000) >> 17));
} }
/* Use 20.12 fixed-point for NTSC value and frequency calculation */ /* Use 20.12 fixed-point for NTSC value and frequency calculation */
#define calc_freq(n,m,k) ( ((unsigned long)0xE517 * (n+8) / ((m+2)*(1<<k))) >> 12 ) #define calc_freq(n, m, k) ( ((unsigned long)0xE517 * (n + 8) / ((m + 2) * (1 << k))) >> 12 )
/* Set dotclock frequency */ /* Set dotclock frequency */
static void set_vclk(int freq) static void set_vclk(int freq)
{ {
int m,n,k; int m, n, k;
int f,fi,d,di; int f, fi, d, di;
unsigned char lo=0,hi=0; unsigned char lo = 0, hi = 0;
d = 20; d = 20;
for(k = 2;k>=0;k--) for (k = 2; k >= 0; k--)
for(m = 0;m<63;m++) for (m = 0; m < 63; m++)
for(n = 0;n<128;n++) { for (n = 0; n < 128; n++) {
fi = calc_freq(n,m,k); fi = calc_freq(n, m, k);
if ((di = abs(fi - freq)) < d) { if ((di = abs(fi - freq)) < d) {
d = di; d = di;
f = fi; f = fi;
lo = n; lo = n;
hi = (k<<6) | m; hi = (k << 6) | m;
} }
} }
if (chip3D) { if (chip3D) {
write3C4(ClockHigh,hi); write3C4(ClockHigh, hi);
write3C4(ClockLow,lo); write3C4(ClockLow, lo);
} else { } else {
outb(lo,0x43C8); outb(lo, 0x43C8);
outb(hi,0x43C9); outb(hi, 0x43C9);
} }
debug("VCLK = %X %X\n",hi,lo); debug("VCLK = %X %X\n", hi, lo);
} }
/* Set number of lines for flat panels*/ /* Set number of lines for flat panels*/
...@@ -663,7 +708,7 @@ static unsigned int __devinit get_displaytype(void) ...@@ -663,7 +708,7 @@ static unsigned int __devinit get_displaytype(void)
return DISPLAY_FP; return DISPLAY_FP;
if (crt || !chipcyber) if (crt || !chipcyber)
return DISPLAY_CRT; return DISPLAY_CRT;
return (read3CE(FPConfig) & 0x10)?DISPLAY_FP:DISPLAY_CRT; return (read3CE(FPConfig) & 0x10) ? DISPLAY_FP : DISPLAY_CRT;
} }
/* Try detecting the video memory size */ /* Try detecting the video memory size */
...@@ -676,100 +721,136 @@ static unsigned int __devinit get_memsize(void) ...@@ -676,100 +721,136 @@ static unsigned int __devinit get_memsize(void)
if (memsize) if (memsize)
k = memsize * Kb; k = memsize * Kb;
else else
switch (chip_id) { switch (chip_id) {
case CYBER9525DVD: k = 2560 * Kb; break; case CYBER9525DVD:
k = 2560 * Kb;
break;
default: default:
tmp = read3X4(SPR) & 0x0F; tmp = read3X4(SPR) & 0x0F;
switch (tmp) { switch (tmp) {
case 0x01: k = 512; break; case 0x01:
case 0x02: k = 6 * Mb; break; /* XP */ k = 512;
case 0x03: k = 1 * Mb; break; break;
case 0x04: k = 8 * Mb; break; case 0x02:
case 0x06: k = 10 * Mb; break; /* XP */ k = 6 * Mb; /* XP */
case 0x07: k = 2 * Mb; break; break;
case 0x08: k = 12 * Mb; break; /* XP */ case 0x03:
case 0x0A: k = 14 * Mb; break; /* XP */ k = 1 * Mb;
case 0x0C: k = 16 * Mb; break; /* XP */ break;
case 0x0E: /* XP */ case 0x04:
k = 8 * Mb;
tmp2 = read3C4(0xC1); break;
switch (tmp2) { case 0x06:
case 0x00: k = 20 * Mb; break; k = 10 * Mb; /* XP */
case 0x01: k = 24 * Mb; break; break;
case 0x10: k = 28 * Mb; break; case 0x07:
case 0x11: k = 32 * Mb; break; k = 2 * Mb;
default: k = 1 * Mb; break; break;
} case 0x08:
k = 12 * Mb; /* XP */
break;
case 0x0A:
k = 14 * Mb; /* XP */
break;
case 0x0C:
k = 16 * Mb; /* XP */
break;
case 0x0E: /* XP */
tmp2 = read3C4(0xC1);
switch (tmp2) {
case 0x00:
k = 20 * Mb;
break;
case 0x01:
k = 24 * Mb;
break;
case 0x10:
k = 28 * Mb;
break;
case 0x11:
k = 32 * Mb;
break;
default:
k = 1 * Mb;
break;
}
break;
case 0x0F:
k = 4 * Mb;
break;
default:
k = 1 * Mb;
break; break;
case 0x0F: k = 4 * Mb; break;
default: k = 1 * Mb;
} }
} }
k -= memdiff * Kb; k -= memdiff * Kb;
output("framebuffer size = %d Kb\n", k/Kb); output("framebuffer size = %d Kb\n", k / Kb);
return k; return k;
} }
/* See if we can handle the video mode described in var */ /* See if we can handle the video mode described in var */
static int tridentfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int tridentfb_check_var(struct fb_var_screeninfo *var,
struct fb_info *info)
{ {
int bpp = var->bits_per_pixel; int bpp = var->bits_per_pixel;
debug("enter\n"); debug("enter\n");
/* check color depth */ /* check color depth */
if (bpp == 24 ) if (bpp == 24)
bpp = var->bits_per_pixel = 32; bpp = var->bits_per_pixel = 32;
/* check whether resolution fits on panel and in memory*/ /* check whether resolution fits on panel and in memory */
if (flatpanel && nativex && var->xres > nativex) if (flatpanel && nativex && var->xres > nativex)
return -EINVAL; return -EINVAL;
if (var->xres * var->yres_virtual * bpp/8 > info->fix.smem_len) if (var->xres * var->yres_virtual * bpp / 8 > info->fix.smem_len)
return -EINVAL; return -EINVAL;
switch (bpp) { switch (bpp) {
case 8: case 8:
var->red.offset = 0; var->red.offset = 0;
var->green.offset = 0; var->green.offset = 0;
var->blue.offset = 0; var->blue.offset = 0;
var->red.length = 6; var->red.length = 6;
var->green.length = 6; var->green.length = 6;
var->blue.length = 6; var->blue.length = 6;
break; break;
case 16: case 16:
var->red.offset = 11; var->red.offset = 11;
var->green.offset = 5; var->green.offset = 5;
var->blue.offset = 0; var->blue.offset = 0;
var->red.length = 5; var->red.length = 5;
var->green.length = 6; var->green.length = 6;
var->blue.length = 5; var->blue.length = 5;
break; break;
case 32: case 32:
var->red.offset = 16; var->red.offset = 16;
var->green.offset = 8; var->green.offset = 8;
var->blue.offset = 0; var->blue.offset = 0;
var->red.length = 8; var->red.length = 8;
var->green.length = 8; var->green.length = 8;
var->blue.length = 8; var->blue.length = 8;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
debug("exit\n"); debug("exit\n");
return 0; return 0;
} }
/* Pan the display */ /* Pan the display */
static int tridentfb_pan_display(struct fb_var_screeninfo *var, static int tridentfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
unsigned int offset; unsigned int offset;
debug("enter\n"); debug("enter\n");
offset = (var->xoffset + (var->yoffset * var->xres)) offset = (var->xoffset + (var->yoffset * var->xres))
* var->bits_per_pixel/32; * var->bits_per_pixel / 32;
info->var.xoffset = var->xoffset; info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset; info->var.yoffset = var->yoffset;
set_screen_start(offset); set_screen_start(offset);
...@@ -777,36 +858,38 @@ static int tridentfb_pan_display(struct fb_var_screeninfo *var, ...@@ -777,36 +858,38 @@ static int tridentfb_pan_display(struct fb_var_screeninfo *var,
return 0; return 0;
} }
#define shadowmode_on() write3CE(CyberControl,read3CE(CyberControl) | 0x81) #define shadowmode_on() write3CE(CyberControl, read3CE(CyberControl) | 0x81)
#define shadowmode_off() write3CE(CyberControl,read3CE(CyberControl) & 0x7E) #define shadowmode_off() write3CE(CyberControl, read3CE(CyberControl) & 0x7E)
/* Set the hardware to the requested video mode */ /* Set the hardware to the requested video mode */
static int tridentfb_set_par(struct fb_info *info) static int tridentfb_set_par(struct fb_info *info)
{ {
struct tridentfb_par * par = (struct tridentfb_par *)(info->par); struct tridentfb_par *par = (struct tridentfb_par *)(info->par);
u32 htotal,hdispend,hsyncstart,hsyncend,hblankstart,hblankend, u32 htotal, hdispend, hsyncstart, hsyncend, hblankstart, hblankend;
vtotal,vdispend,vsyncstart,vsyncend,vblankstart,vblankend; u32 vtotal, vdispend, vsyncstart, vsyncend, vblankstart, vblankend;
struct fb_var_screeninfo *var = &info->var; struct fb_var_screeninfo *var = &info->var;
int bpp = var->bits_per_pixel; int bpp = var->bits_per_pixel;
unsigned char tmp; unsigned char tmp;
debug("enter\n"); debug("enter\n");
htotal = (var->xres + var->left_margin + var->right_margin + var->hsync_len)/8 - 10; hdispend = var->xres / 8 - 1;
hdispend = var->xres/8 - 1; hsyncstart = (var->xres + var->right_margin) / 8;
hsyncstart = (var->xres + var->right_margin)/8; hsyncend = var->hsync_len / 8;
hsyncend = var->hsync_len/8; htotal =
(var->xres + var->left_margin + var->right_margin +
var->hsync_len) / 8 - 10;
hblankstart = hdispend + 1; hblankstart = hdispend + 1;
hblankend = htotal + 5; hblankend = htotal + 5;
vtotal = var->yres + var->upper_margin + var->lower_margin + var->vsync_len - 2;
vdispend = var->yres - 1; vdispend = var->yres - 1;
vsyncstart = var->yres + var->lower_margin; vsyncstart = var->yres + var->lower_margin;
vsyncend = var->vsync_len; vsyncend = var->vsync_len;
vtotal = var->upper_margin + vsyncstart + vsyncend - 2;
vblankstart = var->yres; vblankstart = var->yres;
vblankend = vtotal + 2; vblankend = vtotal + 2;
enable_mmio(); enable_mmio();
crtc_unlock(); crtc_unlock();
write3CE(CyberControl,8); write3CE(CyberControl, 8);
if (flatpanel && var->xres < nativex) { if (flatpanel && var->xres < nativex) {
/* /*
...@@ -814,18 +897,18 @@ static int tridentfb_set_par(struct fb_info *info) ...@@ -814,18 +897,18 @@ static int tridentfb_set_par(struct fb_info *info)
* than requested resolution decide whether * than requested resolution decide whether
* we stretch or center * we stretch or center
*/ */
t_outb(0xEB,0x3C2); t_outb(0xEB, 0x3C2);
shadowmode_on(); shadowmode_on();
if (center) if (center)
screen_center(); screen_center();
else if (stretch) else if (stretch)
screen_stretch(); screen_stretch();
} else { } else {
t_outb(0x2B,0x3C2); t_outb(0x2B, 0x3C2);
write3CE(CyberControl,8); write3CE(CyberControl, 8);
} }
/* vertical timing values */ /* vertical timing values */
...@@ -834,15 +917,15 @@ static int tridentfb_set_par(struct fb_info *info) ...@@ -834,15 +917,15 @@ static int tridentfb_set_par(struct fb_info *info)
write3X4(CRTVSyncStart, vsyncstart & 0xFF); write3X4(CRTVSyncStart, vsyncstart & 0xFF);
write3X4(CRTVSyncEnd, (vsyncend & 0x0F)); write3X4(CRTVSyncEnd, (vsyncend & 0x0F));
write3X4(CRTVBlankStart, vblankstart & 0xFF); write3X4(CRTVBlankStart, vblankstart & 0xFF);
write3X4(CRTVBlankEnd, 0/*p->vblankend & 0xFF*/); write3X4(CRTVBlankEnd, 0 /* p->vblankend & 0xFF */ );
/* horizontal timing values */ /* horizontal timing values */
write3X4(CRTHTotal, htotal & 0xFF); write3X4(CRTHTotal, htotal & 0xFF);
write3X4(CRTHDispEnd, hdispend & 0xFF); write3X4(CRTHDispEnd, hdispend & 0xFF);
write3X4(CRTHSyncStart, hsyncstart & 0xFF); write3X4(CRTHSyncStart, hsyncstart & 0xFF);
write3X4(CRTHSyncEnd, (hsyncend & 0x1F) | ((hblankend & 0x20)<<2)); write3X4(CRTHSyncEnd, (hsyncend & 0x1F) | ((hblankend & 0x20) << 2));
write3X4(CRTHBlankStart, hblankstart & 0xFF); write3X4(CRTHBlankStart, hblankstart & 0xFF);
write3X4(CRTHBlankEnd, 0/*(p->hblankend & 0x1F)*/); write3X4(CRTHBlankEnd, 0 /* (p->hblankend & 0x1F) */ );
/* higher bits of vertical timing values */ /* higher bits of vertical timing values */
tmp = 0x10; tmp = 0x10;
...@@ -856,7 +939,7 @@ static int tridentfb_set_par(struct fb_info *info) ...@@ -856,7 +939,7 @@ static int tridentfb_set_par(struct fb_info *info)
if (vsyncstart & 0x200) tmp |= 0x80; if (vsyncstart & 0x200) tmp |= 0x80;
write3X4(CRTOverflow, tmp); write3X4(CRTOverflow, tmp);
tmp = read3X4(CRTHiOrd) | 0x08; //line compare bit 10 tmp = read3X4(CRTHiOrd) | 0x08; /* line compare bit 10 */
if (vtotal & 0x400) tmp |= 0x80; if (vtotal & 0x400) tmp |= 0x80;
if (vblankstart & 0x400) tmp |= 0x40; if (vblankstart & 0x400) tmp |= 0x40;
if (vsyncstart & 0x400) tmp |= 0x20; if (vsyncstart & 0x400) tmp |= 0x20;
...@@ -867,84 +950,100 @@ static int tridentfb_set_par(struct fb_info *info) ...@@ -867,84 +950,100 @@ static int tridentfb_set_par(struct fb_info *info)
if (htotal & 0x800) tmp |= 0x800 >> 11; if (htotal & 0x800) tmp |= 0x800 >> 11;
if (hblankstart & 0x800) tmp |= 0x800 >> 7; if (hblankstart & 0x800) tmp |= 0x800 >> 7;
write3X4(HorizOverflow, tmp); write3X4(HorizOverflow, tmp);
tmp = 0x40; tmp = 0x40;
if (vblankstart & 0x200) tmp |= 0x20; if (vblankstart & 0x200) tmp |= 0x20;
//FIXME if (info->var.vmode & FB_VMODE_DOUBLE) tmp |= 0x80; //double scan for 200 line modes //FIXME if (info->var.vmode & FB_VMODE_DOUBLE) tmp |= 0x80; /* double scan for 200 line modes */
write3X4(CRTMaxScanLine, tmp); write3X4(CRTMaxScanLine, tmp);
write3X4(CRTLineCompare,0xFF); write3X4(CRTLineCompare, 0xFF);
write3X4(CRTPRowScan,0); write3X4(CRTPRowScan, 0);
write3X4(CRTModeControl,0xC3); write3X4(CRTModeControl, 0xC3);
write3X4(LinearAddReg,0x20); //enable linear addressing write3X4(LinearAddReg, 0x20); /* enable linear addressing */
tmp = (info->var.vmode & FB_VMODE_INTERLACED) ? 0x84:0x80; tmp = (info->var.vmode & FB_VMODE_INTERLACED) ? 0x84 : 0x80;
write3X4(CRTCModuleTest,tmp); //enable access extended memory write3X4(CRTCModuleTest, tmp); /* enable access extended memory */
write3X4(GraphEngReg, 0x80); //enable GE for text acceleration write3X4(GraphEngReg, 0x80); /* enable GE for text acceleration */
#ifdef CONFIG_FB_TRIDENT_ACCEL #ifdef CONFIG_FB_TRIDENT_ACCEL
acc->init_accel(info->var.xres,bpp); acc->init_accel(info->var.xres, bpp);
#endif #endif
switch (bpp) { switch (bpp) {
case 8: tmp = 0x00; break; case 8:
case 16: tmp = 0x05; break; tmp = 0x00;
case 24: tmp = 0x29; break; break;
case 32: tmp = 0x09; case 16:
tmp = 0x05;
break;
case 24:
tmp = 0x29;
break;
case 32:
tmp = 0x09;
break;
} }
write3X4(PixelBusReg, tmp); write3X4(PixelBusReg, tmp);
tmp = 0x10; tmp = 0x10;
if (chipcyber) if (chipcyber)
tmp |= 0x20; tmp |= 0x20;
write3X4(DRAMControl, tmp); //both IO,linear enable write3X4(DRAMControl, tmp); /* both IO, linear enable */
write3X4(InterfaceSel, read3X4(InterfaceSel) | 0x40); write3X4(InterfaceSel, read3X4(InterfaceSel) | 0x40);
write3X4(Performance,0x92); write3X4(Performance, 0x92);
write3X4(PCIReg,0x07); //MMIO & PCI read and write burst enable write3X4(PCIReg, 0x07); /* MMIO & PCI read and write burst enable */
/* convert from picoseconds to MHz */ /* convert from picoseconds to MHz */
par->vclk = 1000000/info->var.pixclock; par->vclk = 1000000 / info->var.pixclock;
if (bpp == 32) if (bpp == 32)
par->vclk *=2; par->vclk *= 2;
set_vclk(par->vclk); set_vclk(par->vclk);
write3C4(0,3); write3C4(0, 3);
write3C4(1,1); //set char clock 8 dots wide write3C4(1, 1); /* set char clock 8 dots wide */
write3C4(2,0x0F); //enable 4 maps because needed in chain4 mode write3C4(2, 0x0F); /* enable 4 maps because needed in chain4 mode */
write3C4(3,0); write3C4(3, 0);
write3C4(4,0x0E); //memory mode enable bitmaps ?? write3C4(4, 0x0E); /* memory mode enable bitmaps ?? */
write3CE(MiscExtFunc,(bpp==32)?0x1A:0x12); //divide clock by 2 if 32bpp write3CE(MiscExtFunc, (bpp == 32) ? 0x1A : 0x12); /* divide clock by 2 if 32bpp */
//chain4 mode display and CPU path /* chain4 mode display and CPU path */
write3CE(0x5,0x40); //no CGA compat,allow 256 col write3CE(0x5, 0x40); /* no CGA compat, allow 256 col */
write3CE(0x6,0x05); //graphics mode write3CE(0x6, 0x05); /* graphics mode */
write3CE(0x7,0x0F); //planes? write3CE(0x7, 0x0F); /* planes? */
if (chip_id == CYBERBLADEXPAi1) { if (chip_id == CYBERBLADEXPAi1) {
/* This fixes snow-effect in 32 bpp */ /* This fixes snow-effect in 32 bpp */
write3X4(CRTHSyncStart,0x84); write3X4(CRTHSyncStart, 0x84);
} }
writeAttr(0x10,0x41); //graphics mode and support 256 color modes writeAttr(0x10, 0x41); /* graphics mode and support 256 color modes */
writeAttr(0x12,0x0F); //planes writeAttr(0x12, 0x0F); /* planes */
writeAttr(0x13,0); //horizontal pel panning writeAttr(0x13, 0); /* horizontal pel panning */
//colors /* colors */
for(tmp = 0;tmp < 0x10;tmp++) for (tmp = 0; tmp < 0x10; tmp++)
writeAttr(tmp,tmp); writeAttr(tmp, tmp);
readb(par->io_virt + CRT + 0x0A); //flip-flop to index readb(par->io_virt + CRT + 0x0A); /* flip-flop to index */
t_outb(0x20, 0x3C0); //enable attr t_outb(0x20, 0x3C0); /* enable attr */
switch (bpp) { switch (bpp) {
case 8: tmp = 0;break; //256 colors case 8:
case 15: tmp = 0x10;break; tmp = 0;
case 16: tmp = 0x30;break; //hicolor break;
case 24: //truecolor case 15:
case 32: tmp = 0xD0;break; tmp = 0x10;
break;
case 16:
tmp = 0x30;
break;
case 24:
case 32:
tmp = 0xD0;
break;
} }
t_inb(0x3C8); t_inb(0x3C8);
...@@ -952,37 +1051,36 @@ static int tridentfb_set_par(struct fb_info *info) ...@@ -952,37 +1051,36 @@ static int tridentfb_set_par(struct fb_info *info)
t_inb(0x3C6); t_inb(0x3C6);
t_inb(0x3C6); t_inb(0x3C6);
t_inb(0x3C6); t_inb(0x3C6);
t_outb(tmp,0x3C6); t_outb(tmp, 0x3C6);
t_inb(0x3C8); t_inb(0x3C8);
if (flatpanel) if (flatpanel)
set_number_of_lines(info->var.yres); set_number_of_lines(info->var.yres);
set_lwidth(info->var.xres * bpp/(4*16)); set_lwidth(info->var.xres * bpp / (4 * 16));
info->fix.visual = (bpp == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; info->fix.visual = (bpp == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
info->fix.line_length = info->var.xres * (bpp >> 3); info->fix.line_length = info->var.xres * (bpp >> 3);
info->cmap.len = (bpp == 8) ? 256: 16; info->cmap.len = (bpp == 8) ? 256 : 16;
debug("exit\n"); debug("exit\n");
return 0; return 0;
} }
/* Set one color register */ /* Set one color register */
static int tridentfb_setcolreg(unsigned regno, unsigned red, unsigned green, static int tridentfb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp, unsigned blue, unsigned transp,
struct fb_info *info) struct fb_info *info)
{ {
int bpp = info->var.bits_per_pixel; int bpp = info->var.bits_per_pixel;
if (regno >= info->cmap.len) if (regno >= info->cmap.len)
return 1; return 1;
if (bpp == 8) { if (bpp == 8) {
t_outb(0xFF,0x3C6); t_outb(0xFF, 0x3C6);
t_outb(regno,0x3C8); t_outb(regno, 0x3C8);
t_outb(red>>10,0x3C9); t_outb(red >> 10, 0x3C9);
t_outb(green>>10,0x3C9); t_outb(green >> 10, 0x3C9);
t_outb(blue>>10,0x3C9); t_outb(blue >> 10, 0x3C9);
} else if (regno < 16) { } else if (regno < 16) {
if (bpp == 16) { /* RGB 565 */ if (bpp == 16) { /* RGB 565 */
...@@ -994,29 +1092,28 @@ static int tridentfb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -994,29 +1092,28 @@ static int tridentfb_setcolreg(unsigned regno, unsigned red, unsigned green,
((u32 *)(info->pseudo_palette))[regno] = col; ((u32 *)(info->pseudo_palette))[regno] = col;
} else if (bpp == 32) /* ARGB 8888 */ } else if (bpp == 32) /* ARGB 8888 */
((u32*)info->pseudo_palette)[regno] = ((u32*)info->pseudo_palette)[regno] =
((transp & 0xFF00) <<16) | ((transp & 0xFF00) << 16) |
((red & 0xFF00) << 8) | ((red & 0xFF00) << 8) |
((green & 0xFF00)) | ((green & 0xFF00)) |
((blue & 0xFF00)>>8); ((blue & 0xFF00) >> 8);
} }
// debug("exit\n"); /* debug("exit\n"); */
return 0; return 0;
} }
/* Try blanking the screen.For flat panels it does nothing */ /* Try blanking the screen.For flat panels it does nothing */
static int tridentfb_blank(int blank_mode, struct fb_info *info) static int tridentfb_blank(int blank_mode, struct fb_info *info)
{ {
unsigned char PMCont,DPMSCont; unsigned char PMCont, DPMSCont;
debug("enter\n"); debug("enter\n");
if (flatpanel) if (flatpanel)
return 0; return 0;
t_outb(0x04,0x83C8); /* Read DPMS Control */ t_outb(0x04, 0x83C8); /* Read DPMS Control */
PMCont = t_inb(0x83C6) & 0xFC; PMCont = t_inb(0x83C6) & 0xFC;
DPMSCont = read3CE(PowerStatus) & 0xFC; DPMSCont = read3CE(PowerStatus) & 0xFC;
switch (blank_mode) switch (blank_mode) {
{
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
/* Screen: On, HSync: On, VSync: On */ /* Screen: On, HSync: On, VSync: On */
case FB_BLANK_NORMAL: case FB_BLANK_NORMAL:
...@@ -1039,11 +1136,11 @@ static int tridentfb_blank(int blank_mode, struct fb_info *info) ...@@ -1039,11 +1136,11 @@ static int tridentfb_blank(int blank_mode, struct fb_info *info)
PMCont |= 0x00; PMCont |= 0x00;
DPMSCont |= 0x03; DPMSCont |= 0x03;
break; break;
} }
write3CE(PowerStatus,DPMSCont); write3CE(PowerStatus, DPMSCont);
t_outb(4,0x83C8); t_outb(4, 0x83C8);
t_outb(PMCont,0x83C6); t_outb(PMCont, 0x83C6);
debug("exit\n"); debug("exit\n");
...@@ -1051,7 +1148,20 @@ static int tridentfb_blank(int blank_mode, struct fb_info *info) ...@@ -1051,7 +1148,20 @@ static int tridentfb_blank(int blank_mode, struct fb_info *info)
return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0; return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;
} }
static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_device_id * id) static struct fb_ops tridentfb_ops = {
.owner = THIS_MODULE,
.fb_setcolreg = tridentfb_setcolreg,
.fb_pan_display = tridentfb_pan_display,
.fb_blank = tridentfb_blank,
.fb_check_var = tridentfb_check_var,
.fb_set_par = tridentfb_set_par,
.fb_fillrect = tridentfb_fillrect,
.fb_copyarea = tridentfb_copyarea,
.fb_imageblit = cfb_imageblit,
};
static int __devinit trident_pci_probe(struct pci_dev * dev,
const struct pci_device_id * id)
{ {
int err; int err;
unsigned char revision; unsigned char revision;
...@@ -1062,31 +1172,42 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1062,31 +1172,42 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
chip_id = id->device; chip_id = id->device;
if(chip_id == CYBERBLADEi1) if (chip_id == CYBERBLADEi1)
output("*** Please do use cyblafb, Cyberblade/i1 support " output("*** Please do use cyblafb, Cyberblade/i1 support "
"will soon be removed from tridentfb!\n"); "will soon be removed from tridentfb!\n");
/* If PCI id is 0x9660 then further detect chip type */ /* If PCI id is 0x9660 then further detect chip type */
if (chip_id == TGUI9660) { if (chip_id == TGUI9660) {
outb(RevisionID,0x3C4); outb(RevisionID, 0x3C4);
revision = inb(0x3C5); revision = inb(0x3C5);
switch (revision) { switch (revision) {
case 0x22: case 0x22:
case 0x23: chip_id = CYBER9397;break; case 0x23:
case 0x2A: chip_id = CYBER9397DVD;break; chip_id = CYBER9397;
case 0x30: break;
case 0x33: case 0x2A:
case 0x34: chip_id = CYBER9397DVD;
case 0x35: break;
case 0x38: case 0x30:
case 0x3A: case 0x33:
case 0xB3: chip_id = CYBER9385;break; case 0x34:
case 0x40 ... 0x43: chip_id = CYBER9382;break; case 0x35:
case 0x4A: chip_id = CYBER9388;break; case 0x38:
default:break; case 0x3A:
case 0xB3:
chip_id = CYBER9385;
break;
case 0x40 ... 0x43:
chip_id = CYBER9382;
break;
case 0x4A:
chip_id = CYBER9388;
break;
default:
break;
} }
} }
...@@ -1095,8 +1216,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1095,8 +1216,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
if (is_xp(chip_id)) { if (is_xp(chip_id)) {
acc = &accel_xp; acc = &accel_xp;
} else } else if (is_blade(chip_id)) {
if (is_blade(chip_id)) {
acc = &accel_blade; acc = &accel_blade;
} else { } else {
acc = &accel_image; acc = &accel_image;
...@@ -1108,8 +1228,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1108,8 +1228,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
fb_info.par = &default_par; fb_info.par = &default_par;
/* setup MMIO region */ /* setup MMIO region */
tridentfb_fix.mmio_start = pci_resource_start(dev,1); tridentfb_fix.mmio_start = pci_resource_start(dev, 1);
tridentfb_fix.mmio_len = chip3D ? 0x20000:0x10000; tridentfb_fix.mmio_len = chip3D ? 0x20000 : 0x10000;
if (!request_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len, "tridentfb")) { if (!request_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len, "tridentfb")) {
debug("request_region failed!\n"); debug("request_region failed!\n");
...@@ -1125,11 +1245,11 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1125,11 +1245,11 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
} }
enable_mmio(); enable_mmio();
/* setup framebuffer memory */ /* setup framebuffer memory */
tridentfb_fix.smem_start = pci_resource_start(dev,0); tridentfb_fix.smem_start = pci_resource_start(dev, 0);
tridentfb_fix.smem_len = get_memsize(); tridentfb_fix.smem_len = get_memsize();
if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) { if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) {
debug("request_mem_region failed!\n"); debug("request_mem_region failed!\n");
err = -1; err = -1;
...@@ -1137,7 +1257,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1137,7 +1257,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
} }
fb_info.screen_base = ioremap_nocache(tridentfb_fix.smem_start, fb_info.screen_base = ioremap_nocache(tridentfb_fix.smem_start,
tridentfb_fix.smem_len); tridentfb_fix.smem_len);
if (!fb_info.screen_base) { if (!fb_info.screen_base) {
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len); release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
...@@ -1147,13 +1267,13 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1147,13 +1267,13 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
} }
output("%s board found\n", pci_name(dev)); output("%s board found\n", pci_name(dev));
#if 0 #if 0
output("Trident board found : mem = %X,io = %X, mem_v = %X, io_v = %X\n", output("Trident board found : mem = %X, io = %X, mem_v = %X, io_v = %X\n",
tridentfb_fix.smem_start, tridentfb_fix.mmio_start, fb_info.screen_base, default_par.io_virt); tridentfb_fix.smem_start, tridentfb_fix.mmio_start, fb_info.screen_base, default_par.io_virt);
#endif #endif
displaytype = get_displaytype(); displaytype = get_displaytype();
if(flatpanel) if (flatpanel)
nativex = get_nativex(); nativex = get_nativex();
fb_info.fix = tridentfb_fix; fb_info.fix = tridentfb_fix;
...@@ -1166,11 +1286,11 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1166,11 +1286,11 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
#endif #endif
fb_info.pseudo_palette = pseudo_pal; fb_info.pseudo_palette = pseudo_pal;
if (!fb_find_mode(&default_var,&fb_info,mode,NULL,0,NULL,bpp)) { if (!fb_find_mode(&default_var, &fb_info, mode, NULL, 0, NULL, bpp)) {
err = -EINVAL; err = -EINVAL;
goto out_unmap; goto out_unmap;
} }
fb_alloc_cmap(&fb_info.cmap,256,0); fb_alloc_cmap(&fb_info.cmap, 256, 0);
if (defaultaccel && acc) if (defaultaccel && acc)
default_var.accel_flags |= FB_ACCELF_TEXT; default_var.accel_flags |= FB_ACCELF_TEXT;
else else
...@@ -1184,8 +1304,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1184,8 +1304,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
goto out_unmap; goto out_unmap;
} }
output("fb%d: %s frame buffer device %dx%d-%dbpp\n", output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
fb_info.node, fb_info.fix.id,default_var.xres, fb_info.node, fb_info.fix.id, default_var.xres,
default_var.yres,default_var.bits_per_pixel); default_var.yres, default_var.bits_per_pixel);
return 0; return 0;
out_unmap: out_unmap:
...@@ -1196,7 +1316,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1196,7 +1316,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
return err; return err;
} }
static void __devexit trident_pci_remove(struct pci_dev * dev) static void __devexit trident_pci_remove(struct pci_dev *dev)
{ {
struct tridentfb_par *par = (struct tridentfb_par*)fb_info.par; struct tridentfb_par *par = (struct tridentfb_par*)fb_info.par;
unregister_framebuffer(&fb_info); unregister_framebuffer(&fb_info);
...@@ -1208,69 +1328,70 @@ static void __devexit trident_pci_remove(struct pci_dev * dev) ...@@ -1208,69 +1328,70 @@ static void __devexit trident_pci_remove(struct pci_dev * dev)
/* List of boards that we are trying to support */ /* List of boards that we are trying to support */
static struct pci_device_id trident_devices[] = { static struct pci_device_id trident_devices[] = {
{PCI_VENDOR_ID_TRIDENT, BLADE3D, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, BLADE3D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7D, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1D, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1D, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEE4, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEE4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, TGUI9660, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, TGUI9660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, IMAGE975, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, IMAGE975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, IMAGE985, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, IMAGE985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBER9320, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBER9320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBER9388, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBER9388, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBER9520, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBER9520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBER9525DVD, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBER9525DVD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBER9397, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBER9397, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBER9397DVD, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBER9397DVD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPAi1, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPAi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPm8, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPm8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPm16, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPm16, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,} {0,}
}; };
MODULE_DEVICE_TABLE(pci,trident_devices); MODULE_DEVICE_TABLE(pci, trident_devices);
static struct pci_driver tridentfb_pci_driver = { static struct pci_driver tridentfb_pci_driver = {
.name = "tridentfb", .name = "tridentfb",
.id_table = trident_devices, .id_table = trident_devices,
.probe = trident_pci_probe, .probe = trident_pci_probe,
.remove = __devexit_p(trident_pci_remove) .remove = __devexit_p(trident_pci_remove)
}; };
/* /*
* Parse user specified options (`video=trident:') * Parse user specified options (`video=trident:')
* example: * example:
* video=trident:800x600,bpp=16,noaccel * video=trident:800x600,bpp=16,noaccel
*/ */
#ifndef MODULE #ifndef MODULE
static int tridentfb_setup(char *options) static int tridentfb_setup(char *options)
{ {
char * opt; char *opt;
if (!options || !*options) if (!options || !*options)
return 0; return 0;
while((opt = strsep(&options,",")) != NULL ) { while ((opt = strsep(&options, ",")) != NULL) {
if (!*opt) continue; if (!*opt)
if (!strncmp(opt,"noaccel",7)) continue;
if (!strncmp(opt, "noaccel", 7))
noaccel = 1; noaccel = 1;
else if (!strncmp(opt,"fp",2)) else if (!strncmp(opt, "fp", 2))
displaytype = DISPLAY_FP; displaytype = DISPLAY_FP;
else if (!strncmp(opt,"crt",3)) else if (!strncmp(opt, "crt", 3))
displaytype = DISPLAY_CRT; displaytype = DISPLAY_CRT;
else if (!strncmp(opt,"bpp=",4)) else if (!strncmp(opt, "bpp=", 4))
bpp = simple_strtoul(opt+4,NULL,0); bpp = simple_strtoul(opt + 4, NULL, 0);
else if (!strncmp(opt,"center",6)) else if (!strncmp(opt, "center", 6))
center = 1; center = 1;
else if (!strncmp(opt,"stretch",7)) else if (!strncmp(opt, "stretch", 7))
stretch = 1; stretch = 1;
else if (!strncmp(opt,"memsize=",8)) else if (!strncmp(opt, "memsize=", 8))
memsize = simple_strtoul(opt+8,NULL,0); memsize = simple_strtoul(opt + 8, NULL, 0);
else if (!strncmp(opt,"memdiff=",8)) else if (!strncmp(opt, "memdiff=", 8))
memdiff = simple_strtoul(opt+8,NULL,0); memdiff = simple_strtoul(opt + 8, NULL, 0);
else if (!strncmp(opt,"nativex=",8)) else if (!strncmp(opt, "nativex=", 8))
nativex = simple_strtoul(opt+8,NULL,0); nativex = simple_strtoul(opt + 8, NULL, 0);
else else
mode = opt; mode = opt;
} }
...@@ -1296,18 +1417,6 @@ static void __exit tridentfb_exit(void) ...@@ -1296,18 +1417,6 @@ static void __exit tridentfb_exit(void)
pci_unregister_driver(&tridentfb_pci_driver); pci_unregister_driver(&tridentfb_pci_driver);
} }
static struct fb_ops tridentfb_ops = {
.owner = THIS_MODULE,
.fb_setcolreg = tridentfb_setcolreg,
.fb_pan_display = tridentfb_pan_display,
.fb_blank = tridentfb_blank,
.fb_check_var = tridentfb_check_var,
.fb_set_par = tridentfb_set_par,
.fb_fillrect = tridentfb_fillrect,
.fb_copyarea= tridentfb_copyarea,
.fb_imageblit = cfb_imageblit,
};
module_init(tridentfb_init); module_init(tridentfb_init);
module_exit(tridentfb_exit); module_exit(tridentfb_exit);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7