changeset 75:e1cd3bdbea86

ramsize detection updated, test again\!
author arpi_esp
date Sat, 10 Mar 2001 23:53:27 +0000
parents 471cca69826a
children d95acdc18f38
files drivers/mga_vid.c
diffstat 1 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/drivers/mga_vid.c	Sat Mar 10 23:13:48 2001 +0000
+++ b/drivers/mga_vid.c	Sat Mar 10 23:53:27 2001 +0000
@@ -732,15 +732,33 @@
 
 #else
 	if (is_g400){
+		switch((card_option>>10)&0x17){
+		    // SDRAM:
+		    case 0x00:
+		    case 0x04:  mga_ram_size = 16; break;
+		    case 0x03:
+		    case 0x05:  mga_ram_size = 64; break;
+		    // SGRAM:
+		    case 0x10:
+		    case 0x14:  mga_ram_size = 32; break;
+		    case 0x11:
+		    case 0x12:  mga_ram_size = 16; break;
+		    default:
+			mga_ram_size = 16;
+			printk(KERN_INFO "mga_vid: Couldn't detect RAMSIZE, assuming 16MB!");
+		}
+#if 0
 		switch((card_option>>10)&7){
-		    case 0:  mga_ram_size = ((card_option>>14)&1)? 32:16; break;
+		    case 0:
+		    case 4:  mga_ram_size = ((card_option>>14)&1)? 32:16; break;
 		    case 1:
 		    case 2:  mga_ram_size = 16; break;	// SGRAM
 		    case 3:
 		    case 5:  mga_ram_size = 64; break;	// SDRAM
-		    case 4:  mga_ram_size = 32; break;	// SGRAM
+//		    case 4:  mga_ram_size = 32; break;	// SGRAM
 		    default: mga_ram_size = 16;
 		}
+#endif
 	}else{
 		switch((card_option>>11)&3){
 		    case 0:  mga_ram_size = 8; break;