From 127d756473c1fd6855772383e3248ba25ec0d1da Mon Sep 17 00:00:00 2001
From: James Simmons <jsimmons@heisenberg.transvirtual.com>
Date: Tue, 18 Jun 2002 23:20:02 -0700
Subject: Added VBI support to VESA

---
 include/linux/tty.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/linux')

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 389c32372e2b..3474a7dba9c2 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -89,7 +89,8 @@ struct screen_info {
 	unsigned short vesapm_seg;		/* 0x2e */
 	unsigned short vesapm_off;		/* 0x30 */
 	unsigned short pages;			/* 0x32 */
-						/* 0x34 -- 0x3f reserved for future expansion */
+	unsigned short vesa_attributes;		/* 0x34 */
+						/* 0x36 -- 0x3f reserved for future expansion */
 };
 
 extern struct screen_info screen_info;
-- 
cgit v1.2.3


From 73a324ba175a077be91e80979baa019780f576e4 Mon Sep 17 00:00:00 2001
From: James Simmons <jsimmons@heisenberg.transvirtual.com>
Date: Wed, 19 Jun 2002 02:01:02 -0700
Subject: Cleanusp for the 3Dfx driver.

---
 drivers/video/tdfxfb.c  | 50 ++++++++++++++++++++++++++++---------------------
 include/linux/pci_ids.h |  1 +
 2 files changed, 30 insertions(+), 21 deletions(-)

(limited to 'include/linux')

diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index e275750efc93..6726bb00dd5c 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -79,10 +79,6 @@
 #include <video/tdfx.h>
 #include <video/fbcon.h>
 
-#ifndef PCI_DEVICE_ID_3DFX_VOODOO5
-#define PCI_DEVICE_ID_3DFX_VOODOO5      0x0009
-#endif
-
 #undef TDFXFB_DEBUG 
 #ifdef TDFXFB_DEBUG
 #define DPRINTK(a,b...) printk(KERN_DEBUG "fb: %s: " a, __FUNCTION__ , ## b)
@@ -995,7 +991,7 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 	info = kmalloc(sizeof(struct fb_info) + sizeof(struct display) +
 			sizeof(u32) * 16, GFP_KERNEL);
 
-	if (!info)	return -ENXIO;
+	if (!info)	return -ENOMEM;
 		
 	memset(info, 0, sizeof(info) + sizeof(struct display) + sizeof(u32) * 16);
      
@@ -1016,25 +1012,25 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 	}
 
 	tdfx_fix.mmio_start = pci_resource_start(pdev, 0);
-	tdfx_fix.mmio_len = 1 << 24;
-	default_par.regbase_virt = ioremap_nocache(tdfx_fix.mmio_start, 1<<24);
+	tdfx_fix.mmio_len = pci_resource_len(pdev, 0);
+	default_par.regbase_virt = ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
 	if (!default_par.regbase_virt) {
 		printk("fb: Can't remap %s register area.\n", tdfx_fix.id);
-		return -ENXIO;
+		goto out_err;
 	}
     
 	if (!request_mem_region(pci_resource_start(pdev, 0),
 	    pci_resource_len(pdev, 0), "tdfx regbase")) {
 		printk(KERN_WARNING "tdfxfb: Can't reserve regbase\n");
-		iounmap(default_par.regbase_virt);
-		return -ENXIO;
+		goto out_err;
 	} 
 
 	tdfx_fix.smem_start = pci_resource_start(pdev, 1);
 	if (!(tdfx_fix.smem_len = do_lfb_size(pdev->device))) {
-		iounmap(default_par.regbase_virt);
 		printk("fb: Can't count %s memory.\n", tdfx_fix.id);
-		return -ENXIO;
+		release_mem_region(pci_resource_start(pdev, 0),
+				   pci_resource_len(pdev, 0));
+		goto out_err;	
 	}
 
 	if (!request_mem_region(pci_resource_start(pdev, 1),
@@ -1042,16 +1038,18 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 		printk(KERN_WARNING "tdfxfb: Can't reserve smem\n");
 		release_mem_region(pci_resource_start(pdev, 0),
 				   pci_resource_len(pdev, 0));
-		iounmap(default_par.regbase_virt);
-		return -ENXIO;
+		goto out_err;
 	}
 
 	info->screen_base = ioremap_nocache(tdfx_fix.smem_start, 
-	tdfx_fix.smem_len);
+					    tdfx_fix.smem_len);
 	if (!info->screen_base) {
 		printk("fb: Can't remap %s framebuffer.\n", tdfx_fix.id);
-		iounmap(default_par.regbase_virt);
-		return -ENXIO;
+		release_mem_region(pci_resource_start(pdev, 1),
+				   pci_resource_len(pdev, 1));
+		release_mem_region(pci_resource_start(pdev, 0),
+				   pci_resource_len(pdev, 0));
+		goto out_err;
 	}
 
 	default_par.iobase = pci_resource_start(pdev, 2);
@@ -1063,9 +1061,7 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 				   pci_resource_len(pdev, 1));
 		release_mem_region(pci_resource_start(pdev, 0),
 				   pci_resource_len(pdev, 0));
-		iounmap(default_par.regbase_virt);
-		iounmap(info->screen_base);
-		return -ENXIO;
+		goto out_err;
 	}
 
 	printk("fb: %s memory = %dK\n", tdfx_fix.id, tdfx_fix.smem_len >> 10);
@@ -1104,13 +1100,24 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 
 	if (register_framebuffer(info) < 0) {
 		printk("tdfxfb: can't register framebuffer\n");
-		return -ENXIO;
+		goto out_err;
 	}
 	/*
 	 * Our driver data
 	 */
 	pci_set_drvdata(pdev, info);
 	return 0; 
+
+out_err:
+	/*
+	 * Cleanup after anything that was remapped/allocated.
+	 */
+	if (default_par.regbase_virt)
+		iounmap(default_par.regbase_virt);
+	if (info->screen_base)
+		iounmap(info->screen_base);
+	kfree(info);
+	return -ENXIO;
 }
 
 /**
@@ -1139,6 +1146,7 @@ static void __devexit tdfxfb_remove(struct pci_dev *pdev)
 	release_mem_region(pci_resource_start(pdev, 0),
 			   pci_resource_len(pdev, 0));
 	pci_set_drvdata(pdev, NULL);
+	kfree(info);
 }
 
 int __init tdfxfb_init(void)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 6758bf742e0c..b1911e2d7ce2 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1258,6 +1258,7 @@
 #define PCI_DEVICE_ID_3DFX_VOODOO2	0x0002
 #define PCI_DEVICE_ID_3DFX_BANSHEE	0x0003
 #define PCI_DEVICE_ID_3DFX_VOODOO3	0x0005
+#define PCI_DEVICE_ID_3DFX_VOODOO5	0x0009
 
 #define PCI_VENDOR_ID_SIGMADES		0x1236
 #define PCI_DEVICE_ID_SIGMADES_6425	0x6401
-- 
cgit v1.2.3