patch-2.1.79 linux/drivers/macintosh/ati-vt.h

• Lines: 250
• Date: Mon Jan 12 15:18:13 1998
• Orig file: v2.1.78/linux/drivers/macintosh/ati-vt.h
• Orig date: Mon Aug 18 18:19:45 1997

diff -u --recursive --new-file v2.1.78/linux/drivers/macintosh/ati-vt.h linux/drivers/macintosh/ati-vt.h
@@ -1,147 +1,147 @@
-#if 0		/* not filled inaty_vt_reg_init yet */
-/* Register values for 640x870, 75Hz Full Page Display (7) */
-static struct aty_regvals aty_vt_reg_init_7 = {
-	{ 0x10, 0x30, 0x68 },
-	{ },
-	{ }	/* pixel clock = 57.29MHz for V=75.01Hz */
-};
-
-/* Register values for 1024x768, 72Hz mode (15) */
-static struct aty_regvals aty_vt_reg_init_15 = {
-	{ 0x10, 0x28, 0x50 },
-	{ },
-	{ }	/* pixel clock = 78.12MHz for V=72.12Hz */
-};
-
-#endif
-
 /* Register values for 1280x1024, 60Hz mode (20) */
 static struct aty_regvals aty_vt_reg_init_20 = {
-	{ 0, 0, 0 },
-	{ 0x2e02a7, 0x2e02a7, 0x2e02a7},
-	{ 0x3070200, 0x3070200, 0x3070200},
-	{ 0xa00cb22, 0xb00cb23, 0xe00cb24 },
-	
-	0x9f00d2, 0x3ff0429, 0x30400, 0x28000000,
-	{ 0x00, 0xaa }
+  { 0, 0, 0 },
+     
+  { 0x002e02a7, 0x002e02a7, 0 },
+  { 0x03070200, 0x03070200, 0 },
+  { 0x0a00cb22, 0x0b00cb23, 0 },
+     
+    0x009f00d2, 0x03ff0429, 0x00030400, 0x28000000,
+  { 0x00, 0xaa }
+};
+
+/* Register values for 1280x960, 75Hz mode (19) */
+static struct aty_regvals aty_vt_reg_init_19 = {
+  { 0, 0, 0 },
+  { 0x003202a3, 0x003201a2, 0 },
+  { 0x030b0200, 0x030b0300, 0 },
+  { 0x0a00cb22, 0x0b00cb23, 0 },
+
+    0x009f00d1, 0x03bf03e7, 0x000303c0, 0x28000000,
+  { 0x00, 0xc6 }
 };
 
 /* Register values for 1152x870, 75Hz mode (18) */
 static struct aty_regvals aty_vt_reg_init_18 = {
-	{ 0, 0, 0 },
-	{ 0x300295, 0x300194, 0x300194 },
-	{ 0x3060200, 0x30e0300, 0x30e0300 },
-	{ 0xa00cb21, 0xb00cb22, 0xe00cb23 },
-    
-    0x8f00b5, 0x3650392, 0x230368, 0x24000000,
-    { 0x00, 0x9d }
-	/* pixel clock = 100.33MHz for V=75.31Hz */
+  { 0, 0, 0 },
+     
+  { 0x00300295, 0x00300194, 0 },
+  { 0x03080200, 0x03080300, 0 },
+  { 0x0a00cb21, 0x0b00cb22, 0 },
+     
+    0x008f00b5, 0x03650392, 0x00230368, 0x24000000,
+  { 0x00, 0x9d }
 };
 
 /* Register values for 1024x768, 75Hz mode (17) */
 static struct aty_regvals aty_vt_reg_init_17 = {
-    { 0, 0, 0 },
+  { 0, 0, 0 },
 
-    { 0x2c0283, 0x2c0182, 0x2c0182 },
-    { 0x3060200, 0x30a0300, 0x30a0300 },
-    { 0xa00cb21, 0xb00cb22, 0xe00cb23 },
-    
-    0x7f00a3, 0x2ff031f, 0x30300, 0x20000000,
-    { 0x01, 0xf7 }
+  { 0x002c0283, 0x002c0182, 0 },
+  { 0x03080200, 0x03080300, 0 },
+  { 0x0a00cb21, 0x0b00cb22, 0 },
+     
+    0x007f00a3, 0x02ff031f, 0x00030300, 0x20000000,
+  { 0x01, 0xf7 }
 };
 
-/* Register values for 1024x768, 72Hz mode (15) */
+/* Register values for 1024x768, 70Hz mode (15) */
 static struct aty_regvals aty_vt_reg_init_15 = {
-    { 0, 0, 0 },
+  { 0, 0, 0 },
+  { 0x00310284, 0x00310183, 0 },
+  { 0x03080200, 0x03080300, 0 },
+  { 0x0a00cb21, 0x0b00cb22, 0 },
 
-    { 0x310284, 0x310183, 0x310183 },
-    { 0x3060200, 0x3090300, 0x3090600 },
-    { 0xa00cb21, 0xb00cb22, 0xe00cb23 },
-    
-    0x7f00a5, 0x2ff0325, 0x260302, 0x20000000,
-    { 0x01, 0xeb }
+    0x007f00a5, 0x02ff0325, 0x00260302, 0x20000000,
+  { 0x01, 0xeb }
 };    
 
 /* Register values for 1024x768, 60Hz mode (14) */
 static struct aty_regvals aty_vt_reg_init_14 = {
-	{ 0, 0, 0 },
-    { 0x310284, 0x310183, 0x310183 },
-    { 0x3060200, 0x3080300, 0x30f0600 },
-    { 0xa00cb21, 0xb00cb22, 0xe00cb23 },
+  { 0, 0, 0 },
+     
+  { 0x00310284, 0x00310183, 0x00310582 }, /* 32 bit 0x00310582 */
+  { 0x03080200, 0x03080300, 0x03070600 }, /* 32 bit 0x03070600 */
+  { 0x0a00cb21, 0x0b00cb22, 0x0e00cb23 },
     
-    0x7f00a7, 0x2ff0325, 0x260302, 0x20000000,
-    { 0x01, 0xcc }
+    0x007f00a7, 0x02ff0325, 0x00260302, 0x20000000,
+  { 0x01, 0xcc }
 };  
 
 /* Register values for 832x624, 75Hz mode (13) */
 static struct aty_regvals aty_vt_reg_init_13 = {
-	{ 0, 0, 0 },
+  { 0, 0, 0 },
 
-    { 0x28026d, 0x28016c, 0x28016c },
-    { 0x3060200, 0x3080300, 0x30f0600 },
-    { 0xa00cb21, 0xb00cb21, 0xe00cb22 },
-    
-    0x67008f, 0x26f029a, 0x230270, 0x1a000000,
-    { 0x01, 0xb4 }
+  { 0x0028026d, 0x0028016c, 0x0028056b },
+  { 0x03080200, 0x03070300, 0x03090600 },
+  { 0x0a00cb21, 0x0b00cb21, 0x0e00cb22 },
+
+    0x0067008f, 0x026f029a, 0x00230270, 0x1a000000,
+  { 0x01, 0xb4 }
 };
 
 /* Register values for 800x600, 75Hz mode (12) */
 static struct aty_regvals aty_vt_reg_init_12 = {
-	{ 0, 0, 0 },
-    { 0x2a0267, 0x2a0166, 0x2a0565 },
-    { 0x3040200, 0x3060300, 0x30d0600 },
-    { 0xa00cb21, 0xb00cb21, 0xe00cb22 },
-    
-    0x630083, 0x2570270, 0x30258, 0x19000000,
-    { 0x01, 0x9c }
-	/* pixel clock = 49.11MHz for V=74.40Hz */
+  { 0, 0, 0 },
+     
+  { 0x002a0267, 0x002a0166, 0x002a0565 },
+  { 0x03040200, 0x03060300, 0x03070600 },
+  { 0x0a00cb21, 0x0b00cb21, 0x0e00cb22 },
+     
+    0x00630083, 0x02570270, 0x00030258, 0x19000000,
+  { 0x01, 0x9c }
 };
 
 /* Register values for 800x600, 72Hz mode (11) */
 static struct aty_regvals aty_vt_reg_init_11 = {
-	{ 0, 0, 0 },
-    
-    { 0x2f026c, 0x2f016b, 0x2f056a },
-    { 0x3040200, 0x3060300, 0x30d0600 },
-    { 0xa00cb21, 0xb00cb21, 0xe00cb22 },
-    
-    0x630081, 0x257029b, 0x6027c, 0x19000000,
-    { 0x01, 0x9d }
-	/* pixel clock = 49.63MHz for V=71.66Hz */
+  { 0, 0, 0 },
+     
+  { 0x002f026c, 0x002f016b, 0x002f056a },
+  { 0x03050200, 0x03070300, 0x03090600 },
+  { 0x0a00cb21, 0x0b00cb21, 0x0e00cb22 },
+
+    0x00630081, 0x02570299, 0x0006027c, 0x19000000,
+  { 0x01, 0x9d }
 };
 
 /* Register values for 800x600, 60Hz mode (10) */
 static struct aty_regvals aty_vt_reg_init_10 = {
-	{ 0, 0, 0 },
-    { 0x30026a, 0x300169, 0x300568 },
-    { 0x3030200, 0x3050300, 0x30b0600 },
-    { 0xa00cb21, 0xb00cb21, 0xe00cb22 },
-    
-    0x630083, 0x2570273, 0x40258, 0x19000000,
-    { 0x02, 0xfb }
-/* pixel clock = 41.41MHz for V=59.78Hz */
+  { 0, 0, 0 },
+     
+  { 0x0030026a, 0x00300169, 0x00300568 },
+  { 0x03050200, 0x03070300, 0x03090600 },
+  { 0x0a00cb21, 0x0b00cb21, 0x0e00cb22 },
+     
+    0x00630083, 0x02570273, 0x00040258, 0x19000000,
+  { 0x02, 0xfb }
 };
 
 /* Register values for 640x480, 67Hz mode (6) */
 static struct aty_regvals aty_vt_reg_init_6 = {
-	{ 0, 0, 0 },
-
-    { 0x280259, 0x280158, 0x280557 },
-    { 0x3030200, 0x3040300, 0x3080600 },
-    { 0xa00cb21, 0xb00cb21, 0xe00cb22 },
-    
-    0x4f006b, 0x1df020c, 0x2301e2, 0x14000000,
-    { 0x02, 0xbe }
+  { 0, 0, 0 },
+      
+  { 0x00280259, 0x00280158, 0x00280557 },
+  { 0x03050200, 0x03070300, 0x030a0600 },
+  { 0x0a00cb21, 0x0b00cb21, 0x0e00cb22 },
+      
+    0x004f006b, 0x01df020c, 0x002301e2, 0x14000000,
+  { 0x02, 0xbe }
 };
 
 /* Register values for 640x480, 60Hz mode (5) */
 static struct aty_regvals aty_vt_reg_init_5 = {
-	{ 0, 0, 0 },
-	
-    { 0x2c0253, 0x2c0152, 0x2c0551 },
-    { 0x3030200, 0x3040300, 0x3060600 },
-    { 0xa00cb21, 0xb00cb21, 0xe00cb22 },
-    
-    0x4f0063, 0x1df020c, 0x2201e9, 0x14000000,
-    { 0x02, 0x9e }
-};
+  { 0, 0, 0 },
+      
+  { 0x002c0253, 0x002c0152, 0x002c0551 },
+  { 0x03050200, 0x03070300, 0x03090600 },
+  { 0x0a00cb21, 0x0b00cb21, 0x0e00cb22 },
+
+    0x004f0063, 0x01df020c, 0x002201e9, 0x14000000,
+  { 0x02, 0x9e }
+};
+                               /*     8 bit       15 bit      32 bit   */
+static int vt_mem_cntl[3][3] = { { 0x0A00CB21, 0x0B00CB21, 0x0E00CB21 },  /* 1 MB VRAM */
+                                 { 0x0A00CB22, 0x0B00CB22, 0x0E00CB22 },  /* 2 MB VRAM */
+                                { 0x0200053B, 0x0300053B, 0x0600053B }   /* 4 M B VRAM */
+ };
+