Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Thu May 8 02:22:09 CEST 2008.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-04-30 10:45:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-05-07 23:13:55.604335000 +0200
@@ -1,0 +2,20 @@
+Wed May 7 23:09:50 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-geode 2.9.0
+ * Add "native" DDC parsing to the Geode driver
+ * Making libDDC support the 2.9.0 release.
+
+-------------------------------------------------------------------
+Wed May 7 15:18:03 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-ati-renderaccel-fix.diff
+ * radeon: fix openoffice/render bug on r100 chips (bnc #361606)
+
+-------------------------------------------------------------------
+Wed May 7 10:44:17 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-ati-mergedfb-disable.diff:
+ * disable MergedFB by default also for radeon 6.6.3 driver
+ (bnc #387574)
+
+-------------------------------------------------------------------
Old:
----
xf86-video-geode-2.8.0.tar.bz2
New:
----
xf86-video-ati-renderaccel-fix.diff
xf86-video-geode-2.9.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.S21784/_old 2008-05-08 02:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.S21784/_new 2008-05-08 02:21:02.000000000 +0200
@@ -15,7 +15,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 121
+Release: 124
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -65,7 +65,7 @@
Source46: xf86-video-ati-6.8.0.tar.bz2
Source48: xf86-video-mga-1.9.100.tar.bz2
Source50: xf86-video-xgi-1.5.0.tar.bz2
-Source51: xf86-video-geode-2.8.0.tar.bz2
+Source51: xf86-video-geode-2.9.0.tar.bz2
Source52: xf86-video-ati-6.6.3.tar.bz2
Source53: xf86-video-xgixp-7945371.tar.bz2
Source100: sax2-hwinfo-data.tar.gz
@@ -94,6 +94,7 @@
Patch47: xf86-video-vmware-10.15.2.diff
Patch51: xf86-video-s3virge.diff
Patch52: xf86-video-intel-default2xaa.diff
+Patch53: xf86-video-ati-renderaccel-fix.diff
Patch100: xf86-video-ati-6.6.3-r128-xvideo.patch
Patch101: xf86-video-ati-6.6.3-compile-cfb.patch
Patch102: xf86-video-ati-6.6.3-if0.patch
@@ -125,7 +126,9 @@
#ln -snf r128.man xf86-video-ati-6.6.3/man/r128old.man
#ln -snf radeon.man xf86-video-ati-6.6.3/man/radeonold.man
pushd xf86-video-ati-6.6.3
+%patch31 -p0
#%patch44 -p1
+%patch53 -p1
%ifnarch ppc ppc64
%patch100 -p1
%patch101 -p1
@@ -283,6 +286,17 @@
/var/lib/hardware/ids/20.%{name}
%changelog
+* Thu May 08 2008 sndirsch@suse.de
+- xf86-video-geode 2.9.0
+ * Add "native" DDC parsing to the Geode driver
+ * Making libDDC support the 2.9.0 release.
+* Wed May 07 2008 sndirsch@suse.de
+- xf86-video-ati-renderaccel-fix.diff
+ * radeon: fix openoffice/render bug on r100 chips (bnc #361606)
+* Wed May 07 2008 sndirsch@suse.de
+- xf86-video-ati-mergedfb-disable.diff:
+ * disable MergedFB by default also for radeon 6.6.3 driver
+ (bnc #387574)
* Wed Apr 30 2008 sndirsch@suse.de
- xf86-video-intel-default2xaa.diff
* make XAA the default for intel driver (bnc #384141/#384022)
++++++ xf86-video-ati-renderaccel-fix.diff ++++++
commit 197a62704742a4a19736c2637ac92d1dc5ab34ed
Author: Adam Jackson
Date: Thu Nov 22 20:26:23 2007 +1000
radeon: fix openoffice/render bug on r100 chips
diff --git a/src/radeon_render.c b/src/radeon_render.c
index 5074fe1..490dec1 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -392,7 +392,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
#endif
ACCEL_PREAMBLE();
- if ((width > 2048) || (height > 2048))
+ if ((width > 2047) || (height > 2047))
return FALSE;
txformat = RadeonGetTextureFormat(format);
@@ -424,7 +424,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
txformat |= ATILog2(width) << RADEON_TXFORMAT_WIDTH_SHIFT;
txformat |= ATILog2(height) << RADEON_TXFORMAT_HEIGHT_SHIFT;
} else {
- tex_size = ((height - 1) << 16) | (width - 1);
+ tex_size = (height << 16) | width;
txformat |= RADEON_TXFORMAT_NON_POWER2;
}
++++++ xf86-video-geode-2.8.0.tar.bz2 -> xf86-video-geode-2.9.0.tar.bz2 ++++++
++++ 3530 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-geode-2.8.0/ChangeLog new/xf86-video-geode-2.9.0/ChangeLog
--- old/xf86-video-geode-2.8.0/ChangeLog 2008-04-01 21:53:45.000000000 +0200
+++ new/xf86-video-geode-2.9.0/ChangeLog 2008-05-07 21:39:34.000000000 +0200
@@ -1,3 +1,18 @@
+commit 94b9029e335ddbe7c22a8fe4bf69858b75179219
+Author: Martin-Éric Racine
+Date: Wed May 7 22:35:23 2008 +0300
+
+ Making libDDC support the 2.9.0 release.
+
+commit 61663593475f61567466c105ca19d5009a4e9c41
+Author: Jordan Crouse
+Date: Tue Apr 15 14:54:57 2008 -0600
+
+ geode: Add "native" DDC parsing to the Geode driver
+
+ Teach libDDC to access the DDC pins on the Geode natively, instead
+ of using the BIOS which has proven to be broken time and time again.
+
commit 401a7ed390beca4d37121575e64b72969d55fa7c
Author: Jordan Crouse
Date: Tue Apr 1 13:41:48 2008 -0600
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-geode-2.8.0/configure.ac new/xf86-video-geode-2.9.0/configure.ac
--- old/xf86-video-geode-2.8.0/configure.ac 2008-04-01 21:36:15.000000000 +0200
+++ new/xf86-video-geode-2.9.0/configure.ac 2008-05-07 21:34:49.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-geode],
- 2.8.0,
+ 2.9.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode],
xf86-video-geode)
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-geode-2.8.0/src/geode_ddc.c new/xf86-video-geode-2.9.0/src/geode_ddc.c
--- old/xf86-video-geode-2.8.0/src/geode_ddc.c 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-geode-2.9.0/src/geode_ddc.c 2008-05-07 21:29:06.000000000 +0200
@@ -0,0 +1,188 @@
+/* Copyright (c) 2003-2007 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Neither the name of the Advanced Micro Devices, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xf86.h"
+#include "xf86Modes.h"
+#include "compiler.h"
+#include "geode.h"
+
+#ifdef XSERVER_LIBPCIACCESS
+#include
+#endif
+
+/* GPIO Register defines from the CS5536 datasheet */
+
+#define GPIO_OUT 0x00
+#define GPIO_OUT_ENABLE 0x04
+#define GPIO_OUT_AUX1 0x10
+#define GPIO_IN_ENABLE 0x20
+#define GPIO_IN 0x30
+#define GPIO_IN_AUX1 0x34
+
+/* The DDC pins are defined to be on GPIO pins 3 and 4 */
+#define DDC_SCL_PIN (1 << 3)
+#define DDC_SDA_PIN (1 << 4)
+
+#define DDC_DATA_HIGH DDC_SDA_PIN
+#define DDC_DATA_LOW (DDC_SDA_PIN << 16)
+
+#define DDC_CLK_HIGH DDC_SCL_PIN
+#define DDC_CLK_LOW (DDC_SCL_PIN << 16)
+
+#define CS5536_ISA_DEVICE 0x20901022
+
+static unsigned short
+geode_gpio_iobase(void)
+{
+#ifdef XSERVER_LIBPCIACCESS
+ struct pci_device *pci;
+
+ /* The CS5536 GPIO device is always in the same slot: 00:0f.0 */
+ pci = pci_device_find_by_slot(0, 0, 0xF, 0x0);
+
+ if (pci == NULL)
+ return 0;
+
+ /* The GPIO I/O address is in resource 1 */
+ return (unsigned short)pci->regions[1].base_addr;
+#else
+ PCITAG Tag;
+
+ Tag = pciFindFirst(CS5536_ISA_DEVICE, 0xFFFFFFFF);
+
+ if (Tag == PCI_NOT_FOUND)
+ return 0;
+
+ /* The GPIO I/O address is in resource 1 */
+ return (unsigned short)(pciReadLong(Tag, 0x14) & ~1);
+#endif
+}
+
+static void
+geode_ddc_putbits(I2CBusPtr b, int scl, int sda)
+{
+ unsigned long iobase = (unsigned long)b->DriverPrivate.ptr;
+ unsigned long dat;
+
+ dat = scl ? DDC_CLK_HIGH : DDC_CLK_LOW;
+ dat |= sda ? DDC_DATA_HIGH : DDC_DATA_LOW;
+
+ outl(iobase + GPIO_OUT, dat);
+}
+
+static void
+geode_ddc_getbits(I2CBusPtr b, int *scl, int *sda)
+{
+ unsigned long iobase = (unsigned long)b->DriverPrivate.ptr;
+ unsigned long dat = inl(iobase + GPIO_IN);
+
+ *scl = (dat & DDC_CLK_HIGH) ? 1 : 0;
+ *sda = (dat & DDC_DATA_HIGH) ? 1 : 0;
+}
+
+static xf86MonPtr
+GeodeGetDDC(ScrnInfoPtr pScrni)
+{
+ xf86MonPtr mon = NULL;
+ I2CBusPtr bus;
+ unsigned long ddciobase;
+
+ ddciobase = geode_gpio_iobase();
+
+ if (ddciobase == 0) {
+ xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
+ "Could not find the GPIO I/O base\n");
+ return NULL;
+ }
+
+ /* The GPIO pins for DDC are multiplexed with a
+ * serial port. If that serial port is enabled, then
+ * assume that there is no DDC on the board
+ */
+
+ if ((inl(ddciobase + GPIO_IN_AUX1) & DDC_CLK_HIGH) ||
+ (inl(ddciobase + GPIO_OUT_AUX1) & DDC_DATA_HIGH)) {
+ xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
+ "GPIO pins are in serial mode. Assuming no DDC\n");
+ return NULL;
+ }
+
+ /* Set up the pins */
+
+ outl(ddciobase + GPIO_OUT_ENABLE, DDC_DATA_HIGH | DDC_CLK_HIGH);
+ outl(ddciobase + GPIO_IN_ENABLE, DDC_DATA_HIGH | DDC_CLK_HIGH);
+
+ bus = xf86CreateI2CBusRec();
+
+ if (bus == NULL) {
+ xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
+ "Could not create the I2C structre\n");
+ goto err;
+ }
+
+ bus->BusName = "CS5536 DDC BUS";
+ bus->scrnIndex = pScrni->scrnIndex;
+ bus->I2CGetBits = geode_ddc_getbits;
+ bus->I2CPutBits = geode_ddc_putbits;
+ bus->DriverPrivate.ptr = (void *)(ddciobase);
+
+ if (xf86I2CBusInit(bus)) {
+ mon = xf86DoEDID_DDC2(pScrni->scrnIndex, bus);
+
+#if (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,4,99,0,0))
+ if (mon)
+ xf86DDCApplyQuirks(pScrni->scrnIndex, mon);
+#endif
+ }
+
+ xf86DestroyI2CBusRec(bus, FALSE, FALSE);
+
+ err:
+ outl(ddciobase + GPIO_OUT_ENABLE, DDC_DATA_LOW | DDC_CLK_LOW);
+ outl(ddciobase + GPIO_IN_ENABLE, DDC_DATA_LOW | DDC_CLK_LOW);
+
+ return mon;
+}
+
+void
+GeodeProbeDDC(ScrnInfoPtr pScrni, int index)
+{
+ ConfiguredMonitor = GeodeGetDDC(pScrni);
+}
+
+xf86MonPtr
+GeodeDoDDC(ScrnInfoPtr pScrni, int index)
+{
+ xf86MonPtr info = NULL;
+
+ info = GeodeGetDDC(pScrni);
+ xf86PrintEDID(info);
+ xf86SetDDCproperties(pScrni, info);
+ return info;
+}
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-geode-2.8.0/src/gx_driver.c new/xf86-video-geode-2.9.0/src/gx_driver.c
--- old/xf86-video-geode-2.8.0/src/gx_driver.c 2008-04-01 21:27:38.000000000 +0200
+++ new/xf86-video-geode-2.9.0/src/gx_driver.c 2008-05-07 21:29:06.000000000 +0200
@@ -436,8 +436,7 @@
useVGA = GXCheckVGA(pScrni);
if (flags & PROBE_DETECT) {
- if (useVGA)
- GeodeProbeDDC(pScrni, pEnt->index);
+ GeodeProbeDDC(pScrni, pEnt->index);
return TRUE;
}
@@ -664,10 +663,7 @@
GeodeClockRange->interlaceAllowed = TRUE;
GeodeClockRange->doubleScanAllowed = FALSE;
- if (pGeode->useVGA)
- pScrni->monitor->DDC = GeodeDoDDC(pScrni, pGeode->pEnt->index);
- else
- pScrni->monitor->DDC = NULL;
+ pScrni->monitor->DDC = GeodeDoDDC(pScrni, pGeode->pEnt->index);
/* I'm still not 100% sure this uses the right values */
@@ -1540,37 +1536,6 @@
(*pGeode->PointerMoved) (index, newX, newY);
}
-void
-GeodeProbeDDC(ScrnInfoPtr pScrni, int index)
-{
- vbeInfoPtr pVbe;
-
- if (xf86LoadSubModule(pScrni, "vbe")) {
- pVbe = VBEInit(NULL, index);
- ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
- vbeFree(pVbe);
- }
-}
-
-xf86MonPtr
-GeodeDoDDC(ScrnInfoPtr pScrni, int index)
-{
- vbeInfoPtr pVbe;
- xf86MonPtr info = NULL;
-
- if (xf86LoadSubModule(pScrni, "vbe") && (pVbe = VBEInit(NULL, index))) {
- xf86LoaderReqSymLists(amdVbeSymbols, NULL);
- info = vbeDoEDID(pVbe, NULL);
- xf86PrintEDID(info);
- xf86SetDDCproperties(pScrni, info);
- vbeFree(pVbe);
- } else
- xf86DrvMsg(pScrni->scrnIndex, X_INFO,
- "We cannot do DDC without VBE.\n");
-
- return info;
-}
-
int
GeodeGetFPGeometry(const char *str, int *width, int *height)
{
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-geode-2.8.0/src/lx_driver.c new/xf86-video-geode-2.9.0/src/lx_driver.c
--- old/xf86-video-geode-2.8.0/src/lx_driver.c 2008-04-01 21:27:38.000000000 +0200
+++ new/xf86-video-geode-2.9.0/src/lx_driver.c 2008-05-07 21:29:06.000000000 +0200
@@ -519,7 +519,6 @@
rgb defaultWeight = { 0, 0, 0 };
int modecnt;
char *s, *panelgeo = NULL;
- Bool useVGA;
if (pScrni->numEntities != 1)
return FALSE;
@@ -529,12 +528,8 @@
if (pEnt->resources)
return FALSE;
- useVGA = LXCheckVGA(pScrni);
-
if (flags & PROBE_DETECT) {
- if (useVGA)
- GeodeProbeDDC(pScrni, pEnt->index);
-
+ GeodeProbeDDC(pScrni, pEnt->index);
return TRUE;
}
@@ -543,7 +538,7 @@
if (pGeode == NULL)
return FALSE;
- pGeode->useVGA = useVGA;
+ pGeode->useVGA = LXCheckVGA(pScrni);
pGeode->VGAActive = FALSE;
pGeode->pEnt = pEnt;
@@ -769,7 +764,7 @@
GeodeClockRange->interlaceAllowed = TRUE;
GeodeClockRange->doubleScanAllowed = FALSE;
- if (pGeode->useVGA && (pGeode->Output & OUTPUT_CRT))
+ if (pGeode->Output & OUTPUT_CRT)
pScrni->monitor->DDC = GeodeDoDDC(pScrni, pGeode->pEnt->index);
else
pScrni->monitor->DDC = NULL;
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-geode-2.8.0/src/Makefile.am new/xf86-video-geode-2.9.0/src/Makefile.am
--- old/xf86-video-geode-2.8.0/src/Makefile.am 2008-04-01 21:27:38.000000000 +0200
+++ new/xf86-video-geode-2.9.0/src/Makefile.am 2008-05-07 21:29:06.000000000 +0200
@@ -46,6 +46,7 @@
geode_driver.c \
geode_common.c \
geode_dcon.c \
+ geode_ddc.c \
geode_msr.c \
gx_driver.c\
gx_accel.c \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org