aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/savage/savagefb_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/savage/savagefb_driver.c')
-rw-r--r--drivers/video/savage/savagefb_driver.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index a2dc1a7ec758..7a35ceb2f8a0 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -328,7 +328,9 @@ SavageSetup2DEngine(struct savagefb_par *par)
328 savage_out32(0x48C18, savage_in32(0x48C18, par) | 0x0C, par); 328 savage_out32(0x48C18, savage_in32(0x48C18, par) | 0x0C, par);
329 break; 329 break;
330 case S3_SAVAGE4: 330 case S3_SAVAGE4:
331 case S3_TWISTER:
331 case S3_PROSAVAGE: 332 case S3_PROSAVAGE:
333 case S3_PROSAVAGEDDR:
332 case S3_SUPERSAVAGE: 334 case S3_SUPERSAVAGE:
333 /* Disable BCI */ 335 /* Disable BCI */
334 savage_out32(0x48C18, savage_in32(0x48C18, par) & 0x3FF0, par); 336 savage_out32(0x48C18, savage_in32(0x48C18, par) & 0x3FF0, par);
@@ -1886,6 +1888,8 @@ static int savage_init_hw(struct savagefb_par *par)
1886 break; 1888 break;
1887 1889
1888 case S3_PROSAVAGE: 1890 case S3_PROSAVAGE:
1891 case S3_PROSAVAGEDDR:
1892 case S3_TWISTER:
1889 videoRam = RamSavageNB[(config1 & 0xE0) >> 5] * 1024; 1893 videoRam = RamSavageNB[(config1 & 0xE0) >> 5] * 1024;
1890 break; 1894 break;
1891 1895
@@ -2111,19 +2115,19 @@ static int __devinit savage_init_fb_info(struct fb_info *info,
2111 snprintf(info->fix.id, 16, "ProSavageKM"); 2115 snprintf(info->fix.id, 16, "ProSavageKM");
2112 break; 2116 break;
2113 case FB_ACCEL_S3TWISTER_P: 2117 case FB_ACCEL_S3TWISTER_P:
2114 par->chip = S3_PROSAVAGE; 2118 par->chip = S3_TWISTER;
2115 snprintf(info->fix.id, 16, "TwisterP"); 2119 snprintf(info->fix.id, 16, "TwisterP");
2116 break; 2120 break;
2117 case FB_ACCEL_S3TWISTER_K: 2121 case FB_ACCEL_S3TWISTER_K:
2118 par->chip = S3_PROSAVAGE; 2122 par->chip = S3_TWISTER;
2119 snprintf(info->fix.id, 16, "TwisterK"); 2123 snprintf(info->fix.id, 16, "TwisterK");
2120 break; 2124 break;
2121 case FB_ACCEL_PROSAVAGE_DDR: 2125 case FB_ACCEL_PROSAVAGE_DDR:
2122 par->chip = S3_PROSAVAGE; 2126 par->chip = S3_PROSAVAGEDDR;
2123 snprintf(info->fix.id, 16, "ProSavageDDR"); 2127 snprintf(info->fix.id, 16, "ProSavageDDR");
2124 break; 2128 break;
2125 case FB_ACCEL_PROSAVAGE_DDRK: 2129 case FB_ACCEL_PROSAVAGE_DDRK:
2126 par->chip = S3_PROSAVAGE; 2130 par->chip = S3_PROSAVAGEDDR;
2127 snprintf(info->fix.id, 16, "ProSavage8"); 2131 snprintf(info->fix.id, 16, "ProSavage8");
2128 break; 2132 break;
2129 } 2133 }