diff options
Diffstat (limited to 'drivers/video/matrox/matroxfb_DAC1064.c')
-rw-r--r-- | drivers/video/matrox/matroxfb_DAC1064.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c index 149680f8bcf0..0fbd9b5149f1 100644 --- a/drivers/video/matrox/matroxfb_DAC1064.c +++ b/drivers/video/matrox/matroxfb_DAC1064.c | |||
@@ -657,7 +657,6 @@ static int MGA1064_preinit(WPMINFO2) { | |||
657 | /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */ | 657 | /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */ |
658 | ACCESS_FBINFO(capable.text) = 1; | 658 | ACCESS_FBINFO(capable.text) = 1; |
659 | ACCESS_FBINFO(capable.vxres) = vxres_mystique; | 659 | ACCESS_FBINFO(capable.vxres) = vxres_mystique; |
660 | ACCESS_FBINFO(features.accel.has_cacheflush) = 1; | ||
661 | 660 | ||
662 | ACCESS_FBINFO(outputs[0]).output = &m1064; | 661 | ACCESS_FBINFO(outputs[0]).output = &m1064; |
663 | ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src; | 662 | ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src; |
@@ -842,7 +841,6 @@ static int MGAG100_preinit(WPMINFO2) { | |||
842 | /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */ | 841 | /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */ |
843 | ACCESS_FBINFO(capable.text) = 1; | 842 | ACCESS_FBINFO(capable.text) = 1; |
844 | ACCESS_FBINFO(capable.vxres) = vxres_g100; | 843 | ACCESS_FBINFO(capable.vxres) = vxres_g100; |
845 | ACCESS_FBINFO(features.accel.has_cacheflush) = 1; | ||
846 | ACCESS_FBINFO(capable.plnwt) = ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG100 | 844 | ACCESS_FBINFO(capable.plnwt) = ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG100 |
847 | ? ACCESS_FBINFO(devflags.sgram) : 1; | 845 | ? ACCESS_FBINFO(devflags.sgram) : 1; |
848 | 846 | ||
@@ -980,7 +978,7 @@ static void MGAG100_reset(WPMINFO2) { | |||
980 | hw->MXoptionReg |= 0x40; /* FIXME... */ | 978 | hw->MXoptionReg |= 0x40; /* FIXME... */ |
981 | pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg); | 979 | pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg); |
982 | } | 980 | } |
983 | mga_setr(M_EXTVGA_INDEX, 0x06, 0x50); | 981 | mga_setr(M_EXTVGA_INDEX, 0x06, 0x00); |
984 | } | 982 | } |
985 | } | 983 | } |
986 | if (ACCESS_FBINFO(devflags.g450dac)) { | 984 | if (ACCESS_FBINFO(devflags.g450dac)) { |