diff options
Diffstat (limited to 'drivers/video/savage/savagefb_driver.c')
-rw-r--r-- | drivers/video/savage/savagefb_driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index cee7803a0a1c..0d0f52c18fd8 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
@@ -662,7 +662,7 @@ static void savage_get_default_par(struct savagefb_par *par, struct savage_reg * | |||
662 | vga_out8(0x3c4, 0x18, par); | 662 | vga_out8(0x3c4, 0x18, par); |
663 | reg->SR18 = vga_in8(0x3c5, par); | 663 | reg->SR18 = vga_in8(0x3c5, par); |
664 | 664 | ||
665 | /* Save flat panel expansion regsters. */ | 665 | /* Save flat panel expansion registers. */ |
666 | if (par->chip == S3_SAVAGE_MX) { | 666 | if (par->chip == S3_SAVAGE_MX) { |
667 | int i; | 667 | int i; |
668 | 668 | ||
@@ -815,7 +815,7 @@ static void savage_set_default_par(struct savagefb_par *par, | |||
815 | vga_out8(0x3c4, 0x18, par); | 815 | vga_out8(0x3c4, 0x18, par); |
816 | vga_out8(0x3c5, reg->SR18, par); | 816 | vga_out8(0x3c5, reg->SR18, par); |
817 | 817 | ||
818 | /* Save flat panel expansion regsters. */ | 818 | /* Save flat panel expansion registers. */ |
819 | if (par->chip == S3_SAVAGE_MX) { | 819 | if (par->chip == S3_SAVAGE_MX) { |
820 | int i; | 820 | int i; |
821 | 821 | ||
@@ -1318,7 +1318,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r | |||
1318 | vga_out8(0x3c4, 0x15, par); | 1318 | vga_out8(0x3c4, 0x15, par); |
1319 | vga_out8(0x3c5, reg->SR15, par); | 1319 | vga_out8(0x3c5, reg->SR15, par); |
1320 | 1320 | ||
1321 | /* Restore flat panel expansion regsters. */ | 1321 | /* Restore flat panel expansion registers. */ |
1322 | if (par->chip == S3_SAVAGE_MX) { | 1322 | if (par->chip == S3_SAVAGE_MX) { |
1323 | int i; | 1323 | int i; |
1324 | 1324 | ||
@@ -1351,7 +1351,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r | |||
1351 | /* following part not present in X11 driver */ | 1351 | /* following part not present in X11 driver */ |
1352 | cr67 = vga_in8(0x3d5, par) & 0xf; | 1352 | cr67 = vga_in8(0x3d5, par) & 0xf; |
1353 | vga_out8(0x3d5, 0x50 | cr67, par); | 1353 | vga_out8(0x3d5, 0x50 | cr67, par); |
1354 | udelay(10000); | 1354 | mdelay(10); |
1355 | vga_out8(0x3d4, 0x67, par); | 1355 | vga_out8(0x3d4, 0x67, par); |
1356 | /* end of part */ | 1356 | /* end of part */ |
1357 | vga_out8(0x3d5, reg->CR67 & ~0x0c, par); | 1357 | vga_out8(0x3d5, reg->CR67 & ~0x0c, par); |
@@ -1904,11 +1904,11 @@ static int savage_init_hw(struct savagefb_par *par) | |||
1904 | vga_out8(0x3d4, 0x66, par); | 1904 | vga_out8(0x3d4, 0x66, par); |
1905 | cr66 = vga_in8(0x3d5, par); | 1905 | cr66 = vga_in8(0x3d5, par); |
1906 | vga_out8(0x3d5, cr66 | 0x02, par); | 1906 | vga_out8(0x3d5, cr66 | 0x02, par); |
1907 | udelay(10000); | 1907 | mdelay(10); |
1908 | 1908 | ||
1909 | vga_out8(0x3d4, 0x66, par); | 1909 | vga_out8(0x3d4, 0x66, par); |
1910 | vga_out8(0x3d5, cr66 & ~0x02, par); /* clear reset flag */ | 1910 | vga_out8(0x3d5, cr66 & ~0x02, par); /* clear reset flag */ |
1911 | udelay(10000); | 1911 | mdelay(10); |
1912 | 1912 | ||
1913 | 1913 | ||
1914 | /* | 1914 | /* |
@@ -1918,11 +1918,11 @@ static int savage_init_hw(struct savagefb_par *par) | |||
1918 | vga_out8(0x3d4, 0x3f, par); | 1918 | vga_out8(0x3d4, 0x3f, par); |
1919 | cr3f = vga_in8(0x3d5, par); | 1919 | cr3f = vga_in8(0x3d5, par); |
1920 | vga_out8(0x3d5, cr3f | 0x08, par); | 1920 | vga_out8(0x3d5, cr3f | 0x08, par); |
1921 | udelay(10000); | 1921 | mdelay(10); |
1922 | 1922 | ||
1923 | vga_out8(0x3d4, 0x3f, par); | 1923 | vga_out8(0x3d4, 0x3f, par); |
1924 | vga_out8(0x3d5, cr3f & ~0x08, par); /* clear reset flags */ | 1924 | vga_out8(0x3d5, cr3f & ~0x08, par); /* clear reset flags */ |
1925 | udelay(10000); | 1925 | mdelay(10); |
1926 | 1926 | ||
1927 | /* Savage ramdac speeds */ | 1927 | /* Savage ramdac speeds */ |
1928 | par->numClocks = 4; | 1928 | par->numClocks = 4; |