pm2 driver

[Peter 'p2' De Schrijver <p2@mind.be>]

[-- Attachment #1.1: Type: text/plain, Size: 302 bytes --]

Hi,

Attached is a small patch which configures the correct memory clock and
timings on the Elsa Winner 2000 Office pm2 based card. This is necessary
when the card is used on a platform which does not support PC style BIOS
initialization.

Thanks,

Peter (p2).

-- 
goa is a state of mind

[-- Attachment #1.2: patch-sb1-pm2 --]
[-- Type: text/plain, Size: 1388 bytes --]

diff -urN -x asm -x scripts -x config linux/drivers/video/pm2fb.c linux-my/drivers/video/pm2fb.c
--- linux/drivers/video/pm2fb.c	2005-08-01 20:24:38.000000000 +0200
+++ linux-my/drivers/video/pm2fb.c	2005-09-22 16:40:11.000000000 +0200
@@ -52,7 +52,7 @@
 #error "Only generic PCI cards supported."
 #endif
 
-#undef PM2FB_MASTER_DEBUG
+#define PM2FB_MASTER_DEBUG 1
 #ifdef PM2FB_MASTER_DEBUG
 #define DPRINTK(a,b...)	printk(KERN_DEBUG "pm2fb: %s: " a, __FUNCTION__ , ## b)
 #else
@@ -1121,6 +1121,22 @@
 		default_par->mem_control, default_par->boot_address,
 		default_par->mem_config);
 
+	if(default_par->mem_control == 0 &&
+		default_par->boot_address == 0x31 &&
+		default_par->mem_config == 0x259fffff &&
+		pdev->subsystem_vendor == 0x1048 &&
+		pdev->subsystem_device == 0x0a31) {
+		DPRINTK("subsystem_vendor: %04x, subsystem_device: %04x\n",
+			pdev->subsystem_vendor, pdev->subsystem_device);
+		DPRINTK("We have not been initialized by VGA BIOS "
+			"and are running on an Elsa Winner 2000 Office\n");
+		DPRINTK("Initializing card timings manually...\n");
+		default_par->mem_control=0;
+		default_par->boot_address=0x20;
+		default_par->mem_config=0xe6002021;
+		default_par->memclock=100000;
+	}
+
 	/* Now work out how big lfb is going to be. */
 	switch(default_par->mem_config & PM2F_MEM_CONFIG_RAM_MASK) {
 	case PM2F_MEM_BANKS_1:

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]