Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Sat Oct 28 17:03:49 CEST 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-14 06:00:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-28 13:57:04.000000000 +0200 @@ -1,0 +2,19 @@ +Sat Oct 28 13:56:25 CEST 2006 - sndirsch@suse.de + +- updated mga driver to release 1.4.4: + * Fix initialization issues that led to DRI lock-ups on some G400 + configurations. Minor code refactoring. + +------------------------------------------------------------------- +Wed Oct 25 14:30:55 CEST 2006 - sndirsch@suse.de + +- reverted latest change; i82875p_edac should be blacklisted in + global blacklist instead (Bug #213840) + +------------------------------------------------------------------- +Tue Oct 24 14:40:47 CEST 2006 - sndirsch@suse.de + +- make sure that intel-agp is loaded before i82875p_edac kernel + module (Bug #213840) + +------------------------------------------------------------------- Old: ---- xf86-video-mga-1.4.3.tar.bz2 New: ---- xf86-video-mga-1.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.ugxP8t/_old 2006-10-28 17:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ugxP8t/_new 2006-10-28 17:03:27.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 1 +Release: 6 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -35,7 +35,7 @@ Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2 Source12: xf86-video-i810-1.7.2.tar.bz2 Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 -Source14: xf86-video-mga-1.4.3.tar.bz2 +Source14: xf86-video-mga-1.4.4.tar.bz2 Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 Source16: xf86-video-newport-0.2.1.tar.bz2 Source17: xf86-video-nsc-2.8.2.tar.bz2 @@ -180,6 +180,16 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Sat Oct 28 2006 - sndirsch@suse.de +- updated mga driver to release 1.4.4: + * Fix initialization issues that led to DRI lock-ups on some G400 + configurations. Minor code refactoring. +* Wed Oct 25 2006 - sndirsch@suse.de +- reverted latest change; i82875p_edac should be blacklisted in + global blacklist instead (Bug #213840) +* Tue Oct 24 2006 - sndirsch@suse.de +- make sure that intel-agp is loaded before i82875p_edac kernel + module (Bug #213840) * Sat Oct 14 2006 - sndirsch@suse.de - X.Org 7.2RC1 package update: * xf86-video-i128-1.1.0.6 ++++++ xf86-video-mga-1.4.3.tar.bz2 -> xf86-video-mga-1.4.4.tar.bz2 ++++++ ++++ 3778 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.3/ChangeLog new/xf86-video-mga-1.4.4/ChangeLog --- old/xf86-video-mga-1.4.3/ChangeLog 2006-10-14 00:33:17.000000000 +0200 +++ new/xf86-video-mga-1.4.4/ChangeLog 2006-10-27 21:28:50.000000000 +0200 @@ -1,3 +1,38 @@ +commit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d +Author: Ian Romanick <idr@us.ibm.com> +Date: Fri Oct 27 11:53:40 2006 -0700 + + Bump version to 1.4.4. + +commit 19d950e61b2b33052e52c33add8e70c29ac9d766 +Author: Ian Romanick <idr@us.ibm.com> +Date: Fri Oct 27 11:48:35 2006 -0700 + + Convert tests of pMga->Chipset to tests of single bit flags. + + Several places in the driver contain if-statements that test Chipset against + several different values to determine what functionality to use. Some of + these tests, HALCHIPSETS in particular, test as many as 6 different values. + This bloats the code size unnecessarilly. Instead we cache the results of + some of those tests in single bit flags stored in pMga. + + These changes are similar to some changes in the pci-rework branch. + +commit d28c4a3307984b86e0f3cc68fa48cdc01e307a7c +Author: Ian Romanick <idr@us.ibm.com> +Date: Thu Oct 26 19:52:54 2006 -0700 + + Fix bug #8666. git-bisect for the win! + + Since && takes precedence over ||, put parenthesis around the || block to + make all the operations associate in the intended manner. + +commit 041910d3b9f6284b4b8a7df10f284528a7e79d12 +Author: Adam Jackson <ajax@benzedrine.nwnk.net> +Date: Fri Oct 13 18:33:39 2006 -0400 + + Bump to 1.4.3 + commit 2fc0ebfbe850c138e840b6653ed1476623aa04a4 Author: Tilman Sauerbeck <tilman@code-monkey.de> Date: Thu Sep 28 18:39:20 2006 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.3/configure.ac new/xf86-video-mga-1.4.4/configure.ac --- old/xf86-video-mga-1.4.3/configure.ac 2006-10-14 00:32:57.000000000 +0200 +++ new/xf86-video-mga-1.4.4/configure.ac 2006-10-27 20:50:02.000000000 +0200 @@ -21,8 +21,10 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.57) + +# When the version number is modified here, also modify it in src/mga.h. AC_INIT([xf86-video-mga], - 1.4.3, + 1.4.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.3/src/mga.h new/xf86-video-mga-1.4.4/src/mga.h --- old/xf86-video-mga-1.4.3/src/mga.h 2006-10-12 00:26:27.000000000 +0200 +++ new/xf86-video-mga-1.4.4/src/mga.h 2006-10-27 20:49:03.000000000 +0200 @@ -156,7 +156,7 @@ #define MGA_DRIVER_NAME "mga" #define MGA_MAJOR_VERSION 1 #define MGA_MINOR_VERSION 4 -#define MGA_PATCHLEVEL 1 +#define MGA_PATCHLEVEL 4 typedef struct { unsigned char ExtVga[6]; @@ -391,6 +391,11 @@ xf86AccessRec Access; int Chipset; int ChipRev; + + int is_Gx50:1; + int is_G200SE:1; + int is_HAL_chipset:1; + Bool Primary; Bool Interleave; int HwBpp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.3/src/mga_dacG.c new/xf86-video-mga-1.4.4/src/mga_dacG.c --- old/xf86-video-mga-1.4.3/src/mga_dacG.c 2006-10-12 00:26:27.000000000 +0200 +++ new/xf86-video-mga-1.4.4/src/mga_dacG.c 2006-10-27 20:27:13.000000000 +0200 @@ -242,8 +242,7 @@ return; } - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { MGAG200SEComputePLLParam(pScrn, f_out, &m, &n, &p); pReg->DacRegs[ MGA1064_PIX_PLLC_M ] = m; @@ -761,9 +760,8 @@ ((i == 0x2c) || (i == 0x2d) || (i == 0x2e) || (i == 0x4c) || (i == 0x4d) || (i == 0x4e)))) continue; - if (((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) && - (i == 0x2C) || (i == 0x2D) || (i == 0x2E)) + if (pMga->is_G200SE + && ((i == 0x2C) || (i == 0x2D) || (i == 0x2E))) continue; outMGAdac(i, mgaReg->DacRegs[i]); } @@ -800,8 +798,7 @@ OUTREG16(0x1FDE, (mgaReg->ExtVga[i] << 8) | i); /* This handles restoring the generic VGA registers. */ - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE); if (restoreFonts) MGAG200SERestoreFonts(pScrn, vgaReg); @@ -901,8 +898,7 @@ * This function will handle creating the data structure and filling * in the generic VGA portion. */ - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { vgaHWSave(pScrn, vgaReg, VGA_SR_MODE); if (saveFonts) MGAG200SESaveFonts(pScrn, vgaReg); @@ -1114,8 +1110,7 @@ outMGAdacmsk(MGA1064_GEN_IO_CTL, ~(DDC_P1_SCL_MASK | DDC_P1_SDA_MASK), 0); /* wait for Vsync */ - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { usleep(4); } else { while( INREG( MGAREG_Status ) & 0x08 ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.3/src/mga_driver.c new/xf86-video-mga-1.4.4/src/mga_driver.c --- old/xf86-video-mga-1.4.3/src/mga_driver.c 2006-10-12 00:26:27.000000000 +0200 +++ new/xf86-video-mga-1.4.4/src/mga_driver.c 2006-10-27 20:29:50.000000000 +0200 @@ -827,9 +827,7 @@ OUTREG8(MGAREG_CRTCEXT_DATA, tmp | 0x80); /* apparently the G200SE doesn't have a BIOS to read */ - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { - + if (pMga->is_G200SE) { CARD32 MemoryAt0, MemoryAt1, Offset; CARD32 FirstMemoryVal1, FirstMemoryVal2; CARD32 SecondMemoryVal1, SecondMemoryVal2; @@ -1283,6 +1281,18 @@ } else { xf86ErrorF("\n"); } + + pMga->is_Gx50 = ((pMga->Chipset == PCI_CHIP_MGAG400) && (pMga->ChipRev >= 0x80)) + || (pMga->Chipset == PCI_CHIP_MGAG550); + pMga->is_G200SE = (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) + || (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI); + pMga->is_HAL_chipset = ((pMga->Chipset == PCI_CHIP_MGAG200_PCI) || + (pMga->Chipset == PCI_CHIP_MGAG200) || + (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || + (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI) || + (pMga->Chipset == PCI_CHIP_MGAG400) || + (pMga->Chipset == PCI_CHIP_MGAG550)); + #ifdef USEMGAHAL if (HAL_CHIPSETS) { Bool loadHal = TRUE; @@ -3067,8 +3077,7 @@ pMga = MGAPTR(pScrn); MGAdac = &pMga->Dac; - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { VRTemp = pScrn->videoRam; FBTemp = pMga->FbMapSize; pScrn->videoRam = 4096; @@ -3152,8 +3161,7 @@ ); /* MGA_HAL */ #endif } - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { pScrn->videoRam = VRTemp; pMga->FbMapSize = FBTemp; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.3/src/mga_macros.h new/xf86-video-mga-1.4.4/src/mga_macros.h --- old/xf86-video-mga-1.4.3/src/mga_macros.h 2006-10-12 00:26:27.000000000 +0200 +++ new/xf86-video-mga-1.4.4/src/mga_macros.h 2006-10-27 20:25:17.000000000 +0200 @@ -63,12 +63,7 @@ #endif #ifdef USEMGAHAL -#define HAL_CHIPSETS ((pMga->Chipset == PCI_CHIP_MGAG200_PCI) || \ - (pMga->Chipset == PCI_CHIP_MGAG200) || \ - (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || \ - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI) || \ - (pMga->Chipset == PCI_CHIP_MGAG400) || \ - (pMga->Chipset == PCI_CHIP_MGAG550)) +#define HAL_CHIPSETS (pMga->is_HAL_chipset) #define MGA_HAL(x) { \ MGAPtr pMga = MGAPTR(pScrn); \ @@ -82,8 +77,7 @@ #define MGA_NOT_HAL(x) { x; } #endif -#define MGAISGx50(x) ( (((x)->Chipset == PCI_CHIP_MGAG400) && ((x)->ChipRev >= 0x80)) || \ - ((x)->Chipset == PCI_CHIP_MGAG550) ) +#define MGAISGx50(x) ((x)->is_Gx50) #define MGA_DH_NEEDS_HAL(x) (((x)->Chipset == PCI_CHIP_MGAG400) && \ ((x)->ChipRev < 0x80)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de