Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit xorg-x11-driver-video
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 12 Jan 2008 02:36:35 +0100
  • Message-id: <20080112013635.6A2EC6781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xorg-x11-driver-video
checked in at Sat Jan 12 02:36:35 CET 2008.

--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-01-01
23:49:06.000000000 +0100
+++
/mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes
2008-01-10 21:18:43.138539000 +0100
@@ -1,0 +2,8 @@
+Thu Jan 10 21:28:07 CET 2008 - sndirsch@xxxxxxx
+
+- xf86-video-amd 2.7.7.4
+ * [LX] Re-arrange PreInit to avoid segfaults in Xorg -configure
+ * [GX] Fix the autoconfigure segfault for GX too
+ * [GX][LX] Push PreInit fixes to avoid segfauls on X -configure.
+
+-------------------------------------------------------------------

Old:
----
xf86-video-amd-2.7.7.3.tar.bz2

New:
----
xf86-video-amd-2.7.7.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.j15518/_old 2008-01-12 02:36:09.000000000 +0100
+++ /var/tmp/diff_new_pack.j15518/_new 2008-01-12 02:36:09.000000000 +0100
@@ -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.3
-Release: 54
+Release: 57
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -64,7 +64,7 @@
Source46: xf86-video-ati-6.7.197.tar.bz2
Source48: xf86-video-mga-1.9.100.tar.bz2
Source50: xf86-video-xgi-1.5.0.tar.bz2
-Source51: xf86-video-amd-2.7.7.3.tar.bz2
+Source51: xf86-video-amd-2.7.7.4.tar.bz2
Source52: xf86-video-ati-6.6.3.tar.bz2
Source53: xf86-video-xgixp-7945371.tar.bz2
Patch: xf86-video-intel.diff
@@ -255,6 +255,11 @@
%{_mandir}/man4/*

%changelog
+* Thu Jan 10 2008 - sndirsch@xxxxxxx
+- xf86-video-amd 2.7.7.4
+ * [LX] Re-arrange PreInit to avoid segfaults in Xorg -configure
+ * [GX] Fix the autoconfigure segfault for GX too
+ * [GX][LX] Push PreInit fixes to avoid segfauls on X -configure.
* Tue Jan 01 2008 - crrodriguez@xxxxxxx
- fix library-without-ldconfig-* error
* Fri Dec 21 2007 - sndirsch@xxxxxxx

++++++ xf86-video-amd-2.7.7.3.tar.bz2 -> xf86-video-amd-2.7.7.4.tar.bz2 ++++++
++++ 4507 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-amd-2.7.7.3/ChangeLog new/xf86-video-amd-2.7.7.4/ChangeLog
--- old/xf86-video-amd-2.7.7.3/ChangeLog 2007-10-15 16:03:44.000000000
+0200
+++ new/xf86-video-amd-2.7.7.4/ChangeLog 2008-01-05 05:32:31.000000000
+0100
@@ -1,3 +1,34 @@
+commit 407f403583f901bbb38d267b9194835d5255d41c
+Author: Martin-Éric Racine <q-funk@xxxxxx>
+Date: Sat Jan 5 06:29:59 2008 +0200
+
+ [GX][LX] Push PreInit fixes to avoid segfauls on X -configure.
+
+ This is known to work on products with GeodeROM and Insyde BIOSes.
+
+ On products with a General Software BIOS, a freeze occurs while X
+ is probing VBE. The same issue occurs with LinuxBIOS and VGAROM,
+ but not with LinuxBIOS omitting VGAROM.
+
+ Both issues appear to be caused by X server core upgrading from
+ vm86 to x86emu since X server release 1.3, which requires fixing
+ x86emu, or the concerned BIOSes, or both.
+
+commit cc570675d97af7b0f4f6a70af0e7e01c89690aa1
+Author: Jordan Crouse <jordan.crouse@xxxxxxx>
+Date: Mon Dec 24 13:00:48 2007 -0700
+
+ [GX] Fix the autoconfigure segfault for GX too
+
+commit f1482feb5b210095c564e2cad5bfd6d6e4e2cd78
+Author: Jordan Crouse <jordan.crouse@xxxxxxx>
+Date: Mon Dec 24 11:56:19 2007 -0700
+
+ [LX] Re-arrange PreInit to avoid segfaults in Xorg -configure
+
+ Re-arrange the early part of PreInit so that Xorg -configure can run
+ cleanly.
+
commit d4cd5d91a015088d548736831edd31760bcda88d
Author: Martin-Éric Racine <q-funk@xxxxxx>
Date: Mon Oct 15 16:32:56 2007 +0300
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-amd-2.7.7.3/config.h.in new/xf86-video-amd-2.7.7.4/config.h.in
--- old/xf86-video-amd-2.7.7.3/config.h.in 2007-10-15 16:03:44.000000000
+0200
+++ new/xf86-video-amd-2.7.7.4/config.h.in 2008-01-05 05:32:31.000000000
+0100
@@ -62,6 +62,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION

+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

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-amd-2.7.7.3/configure.ac new/xf86-video-amd-2.7.7.4/configure.ac
--- old/xf86-video-amd-2.7.7.3/configure.ac 2007-10-15 15:31:50.000000000
+0200
+++ new/xf86-video-amd-2.7.7.4/configure.ac 2008-01-05 05:15:52.000000000
+0100
@@ -22,7 +22,7 @@

AC_PREREQ(2.57)
AC_INIT([xf86-video-amd],
- 2.7.7.3,
+ 2.7.7.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-amd)

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-amd-2.7.7.3/src/amd_gx_driver.c
new/xf86-video-amd-2.7.7.4/src/amd_gx_driver.c
--- old/xf86-video-amd-2.7.7.3/src/amd_gx_driver.c 2007-10-15
15:11:01.000000000 +0200
+++ new/xf86-video-amd-2.7.7.4/src/amd_gx_driver.c 2008-01-05
05:08:39.000000000 +0100
@@ -368,17 +368,19 @@
static Bool
GXCheckVGA(ScrnInfoPtr pScrni) {

- const char *vgasig = "IBM VGA Compatible";
- vgaHWPtr pvgaHW = VGAHWPTR(pScrni);
- int ret;
+ unsigned char *ptr;
+ const char *vgasig = "IBM VGA Compatible";
+ int ret;

- if (!vgaHWMapMem(pScrni))
- return FALSE;
+ ptr = xf86MapVidMem(pScrni->scrnIndex, VIDMEM_FRAMEBUFFER, 0xC001E,
strlen(vgasig));
+
+ if (ptr == NULL)
+ return FALSE;

- ret = memcmp(pvgaHW->Base + 0x1E, vgasig, strlen(vgasig));
- vgaHWUnmapMem(pScrni);
+ ret = memcmp(ptr, vgasig, strlen(vgasig));
+ xf86UnMapVidMem(pScrni->scrnIndex, (pointer) ptr, strlen(vgasig));

- return ret ? FALSE : TRUE;
+ return ret ? FALSE : TRUE;
}

static Bool
@@ -389,42 +391,43 @@
OptionInfoRec *GeodeOptions = &GX_GeodeOptions[0];
int ret;
QQ_WORD msrValue;
+ EntityInfoPtr pEnt;
rgb defaultWeight = { 0, 0, 0 };
int modecnt;
char *s, *panelgeo;
+ Bool useVGA;
+
+ if (pScrni->numEntities != 1)
+ return FALSE;
+
+ pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
+ if (pEnt->resources)
+ return FALSE;

pGeode = pScrni->driverPrivate = xnfcalloc(sizeof(GeodeRec), 1);

if (pGeode == NULL)
return FALSE;

- /* Probe for VGA */
- pGeode->useVGA = FALSE;
+ useVGA = GXCheckVGA(pScrni);

- if (xf86LoadSubModule(pScrni, "vgahw")) {
- if (vgaHWGetHWRec(pScrni)) {
- pGeode->useVGA = GXCheckVGA(pScrni);
- }
+ if (flags & PROBE_DETECT) {
+ if (useVGA)
+ GeodeProbeDDC(pScrni, pEnt->index);
+ return TRUE;
}

-#if INT10_SUPPORT
- if (pGeode->useVGA)
- pGeode->vesa = xcalloc(sizeof(VESARec), 1);
-#endif
-
- if (pScrni->numEntities != 1)
- return FALSE;
-
- pGeode->pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
-
- if (pGeode->pEnt->resources)
- return FALSE;
+ /* Probe for VGA */
+ pGeode->useVGA = useVGA;
+ pGeode->pEnt = pEnt;

- /* ISSUE - this won't work without VGA, but its too early to know if we can
use VGA or not */
+ if (pGeode->useVGA) {
+ if (!xf86LoadSubModule(pScrni, "vgahw") || !vgaHWGetHWRec(pScrni))
+ pGeode->useVGA = FALSE;

- if (pGeode->useVGA && (flags & PROBE_DETECT)) {
- GeodeProbeDDC(pScrni, pGeode->pEnt->index);
- return TRUE;
+#if INT10_SUPPORT
+ pGeode->vesa = xcalloc(sizeof(VESARec), 1);
+#endif
}

gfx_msr_init();
@@ -593,9 +596,6 @@
pGeode->useVGA = FALSE;
}
#endif
-
- xf86LoaderReqSymLists(amdVgahwSymbols, NULL);
- pGeode->FBVGAActive = gu2_get_vga_active();
}

if (pGeode->FBAvail == 0)
@@ -969,6 +969,9 @@
if (!GXMapMem(pScrni))
return FALSE;

+ if (pGeode->useVGA)
+ pGeode->FBVGAActive = gu2_get_vga_active();
+
gfx_wait_until_idle();

/* Save off the current state (should this be somewhere else)? */
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-amd-2.7.7.3/src/amd_lx_driver.c
new/xf86-video-amd-2.7.7.4/src/amd_lx_driver.c
--- old/xf86-video-amd-2.7.7.3/src/amd_lx_driver.c 2007-10-15
15:11:01.000000000 +0200
+++ new/xf86-video-amd-2.7.7.4/src/amd_lx_driver.c 2008-01-05
05:08:39.000000000 +0100
@@ -470,39 +470,45 @@
{
GeodePtr pGeode;
ClockRangePtr GeodeClockRange;
+ EntityInfoPtr pEnt;
OptionInfoRec *GeodeOptions = &LX_GeodeOptions[0];
rgb defaultWeight = { 0, 0, 0 };
int modecnt;
char *s, *panelgeo = NULL;
+ Bool useVGA;

- pGeode = pScrni->driverPrivate = xnfcalloc(sizeof(GeodeRec), 1);
+ if (pScrni->numEntities != 1)
+ return FALSE;

- if (pGeode == NULL)
- return FALSE;
+ pEnt = xf86GetEntityInfo(pScrni->entityList[0]);

- /* Probe for VGA */
- pGeode->useVGA = TRUE;
- pGeode->VGAActive = FALSE;
+ if (pEnt->resources)
+ return FALSE;
+
+ useVGA = LXCheckVGA(pScrni);
+
+ if (flags & PROBE_DETECT) {
+ if (useVGA)
+ GeodeProbeDDC(pScrni, pEnt->index);

- if (xf86LoadSubModule(pScrni, "vgahw")) {
- if (vgaHWGetHWRec(pScrni))
- pGeode->useVGA = LXCheckVGA(pScrni);
+ return TRUE;
}

- if (pGeode->useVGA)
- pGeode->vesa = xcalloc(sizeof(VESARec), 1);
+ pGeode = pScrni->driverPrivate = xnfcalloc(sizeof(GeodeRec), 1);

- if (pScrni->numEntities != 1)
- return FALSE;
+ if (pGeode == NULL)
+ return FALSE;

- pGeode->pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
+ pGeode->useVGA = useVGA;
+ pGeode->VGAActive = FALSE;
+ pGeode->pEnt = pEnt;

- if (pGeode->pEnt->resources)
- return FALSE;
+ if (pGeode->useVGA) {
+ if (!xf86LoadSubModule(pScrni, "vgahw") ||
+ !vgaHWGetHWRec(pScrni))
+ pGeode->useVGA = FALSE;

- if (pGeode->useVGA && (flags & PROBE_DETECT)) {
- GeodeProbeDDC(pScrni, pGeode->pEnt->index);
- return TRUE;
+ pGeode->vesa = xcalloc(sizeof(VESARec), 1);
}

cim_rdmsr = LXReadMSR;


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >