summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-03-10 23:53:27 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-03-10 23:53:27 +0000
commit2af01d483906e926301aa748c6c3a84c74ad6f5a (patch)
tree77e7bbf7842e5c2730cba0591011c369b2b1bafd /drivers
parent0a70b4b6e74c0d09037f046667d6538110e434d8 (diff)
downloadmpv-2af01d483906e926301aa748c6c3a84c74ad6f5a.tar.bz2
mpv-2af01d483906e926301aa748c6c3a84c74ad6f5a.tar.xz
ramsize detection updated, test again\!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@76 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mga_vid.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c
index f3f5b901e8..ee958d018e 100644
--- a/drivers/mga_vid.c
+++ b/drivers/mga_vid.c
@@ -732,15 +732,33 @@ static int mga_vid_find_card(void)
#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;