Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Fri Jun 2 02:12:08 CEST 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-05-30 11:11:04.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-06-01 16:27:03.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 16:24:01 CEST 2006 - sndirsch@suse.de + +- mga-g200se_pci-fix.diff: + * hopefully remaining issues for G200_SE fixed (Bug #159815) + +------------------------------------------------------------------- New: ---- mga-g200se_pci-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.mUqgbW/_old 2006-06-02 02:11:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mUqgbW/_new 2006-06-02 02:11:45.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 6.9.0 -Release: 48 +Release: 49 Summary: Various X.Org video drivers Requires: xorg-x11-server Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o @@ -61,6 +61,7 @@ Patch21: radeon_bios.diff Patch22: rn50_disable-render-accel.diff Patch23: xf86-video-i810-X11R7.1-1.6.0.diff +Patch24: mga-g200se_pci-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define BUILD_ALL 1 %define ATI_SUSE100 1 @@ -190,6 +191,7 @@ %patch15 %patch18 %patch19 +%patch24 %patch21 -p6 pushd ati %patch22 @@ -321,6 +323,9 @@ %endif %changelog -n xorg-x11-driver-video +* Thu Jun 01 2006 - sndirsch@suse.de +- mga-g200se_pci-fix.diff: + * hopefully remaining issues for G200_SE fixed (Bug #159815) * Tue May 30 2006 - sndirsch@suse.de - added alternative i810 driver (Bug #179773) * Tue May 23 2006 - sndirsch@suse.de ++++++ mga-g200se_pci-fix.diff ++++++ diff -u -r mga.orig/mga_dacG.c mga/mga_dacG.c --- mga.orig/mga_dacG.c 2006-06-01 15:57:34.000000000 +0200 +++ mga/mga_dacG.c 2006-06-01 15:59:19.000000000 +0200 @@ -415,10 +415,7 @@ pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03; pReg->DacRegs[ MGA1064_PIX_CLK_CTL ] = 0x01; pReg->DacRegs[ MGA1064_MISC_CTL ] = 0x19; - if(pMga->HasSDRAM) - pReg->Option = 0x40499121; - else - pReg->Option = 0x4049cd21; + pReg->Option = 0x40049120; pReg->Option2 = 0x00008000; break; case PCI_CHIP_MGAG200: diff -u -r mga.orig/mga_driver.c mga/mga_driver.c --- mga.orig/mga_driver.c 2006-06-01 15:57:34.000000000 +0200 +++ mga/mga_driver.c 2006-06-01 16:07:06.000000000 +0200 @@ -813,6 +813,12 @@ CARD32 TestMemoryLocA, TestMemoryLocB; CARD32 TestMemoryLoc0, TestMemoryLoc1; CARD32 TestA, TestB; + CARD8 seq1; + + OUTREG8(MGAREG_SEQ_INDEX, 0x01); + seq1 = INREG8(MGAREG_SEQ_DATA); + seq1 |= 0x20; + OUTREG8(MGAREG_SEQ_DATA, seq1); MemoryAt0 = base[0]; MemoryAt1 = base[1]; @@ -855,6 +861,11 @@ base[1] = MemoryAt1; SizeFound = (Offset / 1024) - 64; + + OUTREG8(MGAREG_SEQ_INDEX, 0x01); + seq1 = INREG8(MGAREG_SEQ_DATA); + seq1 &= ~0x20; + OUTREG8(MGAREG_SEQ_DATA, seq1); } else { /* write, read and compare method split into two loops to make it more reliable on RS/6k -ReneR */ @@ -2852,6 +2863,14 @@ outb(0xfac, 0x02); } + MGA_NOT_HAL( + if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || + (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + OUTREG8(0x1FDE, 0x06); + OUTREG8(0x1FDF, 0x14); + } + ); + pMga->CurrentLayout.mode = mode; if(pMga->MergedFB && mode->Private && (mode->PrivSize == 0)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org