* [PATCH] Add tdfx palette hack to offb driver
@ 2003-03-19 4:47 Richard Drummond
2004-01-06 18:24 ` James Simmons
0 siblings, 1 reply; 3+ messages in thread
From: Richard Drummond @ 2003-03-19 4:47 UTC (permalink / raw)
To: linux-fbdev-devel
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi All
Attached is a patch (against 2.4.20) which adds a palette hack for Voodoo3/4/5
cards to the offb driver. It's tested and working here on a Voodoo3 and a
Voodoo4. I'd welcome comments, though. Particularly, I think the probing for
a Voodoo card may be a bit shaky. Basically I'm match the OF name with the
pattern "3Dfx,Voodoo*". This may cause problems if there are Voodoo1 or 2
cards available with OF drivers, and so need tightening up.
Cheers,
Rich
[-- Attachment #2: offb-tdfx_hack.diff --]
[-- Type: text/x-diff, Size: 2252 bytes --]
--- drivers/video/offb.orig 2003-03-14 13:49:21.000000000 -0500
+++ drivers/video/offb.c 2003-03-18 23:37:35.000000000 -0500
@@ -53,7 +53,8 @@
cmap_M3A, /* ATI Rage Mobility M3 Head A */
cmap_M3B, /* ATI Rage Mobility M3 Head B */
cmap_radeon, /* ATI Radeon */
- cmap_gxt2000 /* IBM GXT2000 */
+ cmap_gxt2000, /* IBM GXT2000 */
+ cmap_3dfx /* 3Dfx Voodoo3/4/5 */
};
struct fb_info_offb {
@@ -462,6 +463,10 @@
unsigned long regbase = dp->addrs[0].address;
info->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
info->cmap_type = cmap_gxt2000;
+ } else if (!strncmp( name, "3Dfx,Voodoo", 11)) {
+ unsigned long regbase = dp->addrs[2].address;
+ info->cmap_adr = ioremap( regbase, 0xFF );
+ info->cmap_type = cmap_3dfx;
}
fix->visual = info->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
: FB_VISUAL_STATIC_PSEUDOCOLOR;
@@ -679,6 +684,7 @@
if (blank)
for (i = 0; i < 256; i++) {
switch(info2->cmap_type) {
+ int regno;
case cmap_m64:
*info2->cmap_adr = i;
mach_eieio();
@@ -711,6 +717,16 @@
case cmap_gxt2000:
out_le32((unsigned *)info2->cmap_adr + i, 0);
break;
+ case cmap_3dfx:
+ /* Wait for three slots in the FIFO (is this necessary?) */
+ while((in_le32((unsigned *)info2->cmap_adr) & 0x1F) < 3 );
+ /* Is the desktop using the upper 256 entries of the CLUT? */
+ regno = (in_le32((unsigned *)info2->cmap_adr + 0x5C) & 1<<12) ?
+ i+256 : i;
+ /* Stuff the palette index and data */
+ out_le32((unsigned *)(info2->cmap_adr + 0x50), regno);
+ out_le32((unsigned *)(info2->cmap_adr + 0x54), 0);
+ break;
}
}
else
@@ -800,6 +816,17 @@
out_le32((unsigned *)info2->cmap_adr + regno,
(red << 16 | green << 8 | blue));
break;
+ case cmap_3dfx:
+ /* Wait for three slots in the FIFO (is this necessary?) */
+ while((in_le32((unsigned *)info2->cmap_adr) & 0x1F) < 3 );
+ /* Is the desktop using the upper 256 entries of the CLUT */
+ if((in_le32((unsigned *)info2->cmap_adr + 0x5C) & 1<<12))
+ regno += 256;
+ /* Stuff the palette index and data */
+ out_le32((unsigned *)(info2->cmap_adr + 0x50), regno);
+ out_le32((unsigned *)(info2->cmap_adr + 0x54),
+ (red << 16 | green << 8 | blue));
+ break;
}
if (regno < 16)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Linux-fbdev-devel] [PATCH] Add tdfx palette hack to offb driver
2003-03-19 4:47 [PATCH] Add tdfx palette hack to offb driver Richard Drummond
@ 2004-01-06 18:24 ` James Simmons
0 siblings, 0 replies; 3+ messages in thread
From: James Simmons @ 2004-01-06 18:24 UTC (permalink / raw)
To: Richard Drummond; +Cc: Linux Fbdev development list, Linux Kernel Mailing List
> Attached is a patch (against 2.4.20) which adds a palette hack for Voodoo3/4/5
> cards to the offb driver. It's tested and working here on a Voodoo3 and a
> Voodoo4. I'd welcome comments, though. Particularly, I think the probing for
> a Voodoo card may be a bit shaky. Basically I'm match the OF name with the
> pattern "3Dfx,Voodoo*". This may cause problems if there are Voodoo1 or 2
> cards available with OF drivers, and so need tightening up.
I have updated the patch against 2.6.0. Could you test it before I commit
it to my tree.
--- /usr/src/linus-2.6/drivers/video/offb.c 2004-01-05 14:54:57.000000000 -0800
+++ offb.c 2004-01-06 13:21:32.000000000 -0800
@@ -43,6 +43,7 @@
cmap_M3B, /* ATI Rage Mobility M3 Head B */
cmap_radeon, /* ATI Radeon */
cmap_gxt2000, /* IBM GXT2000 */
+ cmap_3dfx, /* 3Dfx Voodoo3/4/5 */
};
struct offb_par {
@@ -149,6 +150,18 @@
out_le32((unsigned *) par->cmap_adr + regno,
(red << 16 | green << 8 | blue));
break;
+ case cmap_3dfx:
+ /* Wait for 3 slots in the FIFO */
+ while((in_le32((unsigned *) par->cmap_adr) & 0x1F) < 3);
+ /* Is the desktop using the upper 256 entries of
+ * the CLUT ? */
+ if ((in_le32((unsigned *) par->cmap_adr + 0x5C) & 1 << 12))
+ regno += 256;
+ /* Stuff the palette index and data */
+ out_le32((unsigned *)(par->cmap_adr + 0x50), regno);
+ out_le32((unsigned *)(par->cmap_adr + 0x54),
+ (red << 16 | green << 8 | blue));
+ break;
}
if (regno < 16)
@@ -175,7 +188,7 @@
static int offb_blank(int blank, struct fb_info *info)
{
struct offb_par *par = (struct offb_par *) info->par;
- int i, j;
+ int i, j, regno;
if (!par->cmap_adr)
return 0;
@@ -233,6 +246,20 @@
out_le32((unsigned *) par->cmap_adr + i,
0);
break;
+ case cmap_3dfx:
+ /* Wait for 3 slots in the FIFO */
+ while((in_le32((unsigned *) par->cmap_adr) & 0x1F) < 3);
+ /* Is the desktop using the upper 256
+ * entries of the CLUT ? */
+ regno = (in_le32((unsigned *) par->cmap_adr +
+ 0x5C) & 1 << 12) ?
+ i+256 : i;
+ /* Stuff the palette index and data */
+ out_le32((unsigned *)(par->cmap_adr + 0x50),
+ regno);
+ out_le32((unsigned *)(par->cmap_adr + 0x54),
+ 0);
+ break;
}
} else
fb_set_cmap(&info->cmap, 1, info);
@@ -466,6 +493,10 @@
unsigned long regbase = dp->addrs[0].address;
par->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
par->cmap_type = cmap_gxt2000;
+ } else if (!strncmp(name, "3Dfx,Voodoo", 11)) {
+ unsigned long regbase = dp->addrs[2].address;
+ par->cmap_adr = ioremap(regbase, 0xff);
+ par->cmap_type = cmap_3dfx;
}
fix->visual = par->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
: FB_VISUAL_STATIC_PSEUDOCOLOR;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add tdfx palette hack to offb driver
@ 2004-01-06 18:24 ` James Simmons
0 siblings, 0 replies; 3+ messages in thread
From: James Simmons @ 2004-01-06 18:24 UTC (permalink / raw)
To: Richard Drummond; +Cc: Linux Fbdev development list, Linux Kernel Mailing List
> Attached is a patch (against 2.4.20) which adds a palette hack for Voodoo3/4/5
> cards to the offb driver. It's tested and working here on a Voodoo3 and a
> Voodoo4. I'd welcome comments, though. Particularly, I think the probing for
> a Voodoo card may be a bit shaky. Basically I'm match the OF name with the
> pattern "3Dfx,Voodoo*". This may cause problems if there are Voodoo1 or 2
> cards available with OF drivers, and so need tightening up.
I have updated the patch against 2.6.0. Could you test it before I commit
it to my tree.
--- /usr/src/linus-2.6/drivers/video/offb.c 2004-01-05 14:54:57.000000000 -0800
+++ offb.c 2004-01-06 13:21:32.000000000 -0800
@@ -43,6 +43,7 @@
cmap_M3B, /* ATI Rage Mobility M3 Head B */
cmap_radeon, /* ATI Radeon */
cmap_gxt2000, /* IBM GXT2000 */
+ cmap_3dfx, /* 3Dfx Voodoo3/4/5 */
};
struct offb_par {
@@ -149,6 +150,18 @@
out_le32((unsigned *) par->cmap_adr + regno,
(red << 16 | green << 8 | blue));
break;
+ case cmap_3dfx:
+ /* Wait for 3 slots in the FIFO */
+ while((in_le32((unsigned *) par->cmap_adr) & 0x1F) < 3);
+ /* Is the desktop using the upper 256 entries of
+ * the CLUT ? */
+ if ((in_le32((unsigned *) par->cmap_adr + 0x5C) & 1 << 12))
+ regno += 256;
+ /* Stuff the palette index and data */
+ out_le32((unsigned *)(par->cmap_adr + 0x50), regno);
+ out_le32((unsigned *)(par->cmap_adr + 0x54),
+ (red << 16 | green << 8 | blue));
+ break;
}
if (regno < 16)
@@ -175,7 +188,7 @@
static int offb_blank(int blank, struct fb_info *info)
{
struct offb_par *par = (struct offb_par *) info->par;
- int i, j;
+ int i, j, regno;
if (!par->cmap_adr)
return 0;
@@ -233,6 +246,20 @@
out_le32((unsigned *) par->cmap_adr + i,
0);
break;
+ case cmap_3dfx:
+ /* Wait for 3 slots in the FIFO */
+ while((in_le32((unsigned *) par->cmap_adr) & 0x1F) < 3);
+ /* Is the desktop using the upper 256
+ * entries of the CLUT ? */
+ regno = (in_le32((unsigned *) par->cmap_adr +
+ 0x5C) & 1 << 12) ?
+ i+256 : i;
+ /* Stuff the palette index and data */
+ out_le32((unsigned *)(par->cmap_adr + 0x50),
+ regno);
+ out_le32((unsigned *)(par->cmap_adr + 0x54),
+ 0);
+ break;
}
} else
fb_set_cmap(&info->cmap, 1, info);
@@ -466,6 +493,10 @@
unsigned long regbase = dp->addrs[0].address;
par->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
par->cmap_type = cmap_gxt2000;
+ } else if (!strncmp(name, "3Dfx,Voodoo", 11)) {
+ unsigned long regbase = dp->addrs[2].address;
+ par->cmap_adr = ioremap(regbase, 0xff);
+ par->cmap_type = cmap_3dfx;
}
fix->visual = par->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
: FB_VISUAL_STATIC_PSEUDOCOLOR;
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-01-06 18:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-03-19 4:47 [PATCH] Add tdfx palette hack to offb driver Richard Drummond
2004-01-06 18:24 ` [Linux-fbdev-devel] " James Simmons
2004-01-06 18:24 ` James Simmons
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.