README | 20 ++++++++++++++++++++
man/Makefile.am | 1 -
man/r128.man | 2 +-
src/r128_driver.c | 11 +++++------
src/r128_probe.c | 2 +-
5 files changed, 27 insertions(+), 9 deletions(-)
New commits:
commit 08d56c886c6f5cb848e4f5079a66da781ef6da21
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 30 20:58:51 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..cb61870
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-r128
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-r128
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 23a502faeae838010061269184082348a5c43b39
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:32:13 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/r128.man b/man/r128.man
index 709c2fe..5c7c4fe 100644
--- a/man/r128.man
+++ b/man/r128.man
@@ -149,7 +149,7 @@ output switch (e.g., fn-f7, etc.) prior to starting X or
switch to
another VT and back.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
.nf
Rickard E. (Rik) Faith \fifa...@precisioninsight.com\fp
commit ba8cdda0c8c1151e528d5cd432612ab664abf4f3
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Sun Sep 21 19:55:55 2008 +0200
Kill bare RCS id.
diff --git a/man/Makefile.am b/man/Makefile.am
index 422794f..858ba62 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit e65e95c8c44f47ef044980f59a2549684e6c9403
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Apr 28 10:24:50 2008 +1000
r128: fix bios size setting for pciaccess
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 2eb9d26..8f360a1 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -488,7 +488,8 @@ static Bool R128GetBIOSParameters(ScrnInfoPtr pScrn,
xf86Int10InfoPtr pInt10)
(info->VBIOS[(v) + 3] << 24))
#ifdef XSERVER_LIBPCIACCESS
- info->VBIOS = xalloc(info->PciInfo->rom_size);
+ int size = info->PciInfo->rom_size > R128_VBIOS_SIZE ?
info->PciInfo->rom_size : R128_VBIOS_SIZE;
+ info->VBIOS = xalloc(size);
#else
info->VBIOS = xalloc(R128_VBIOS_SIZE);
#endif
commit a4fafa97b31bb7da01dd92236b42a418ca482992
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Sun Mar 2 14:59:30 2008 -0500
[PATCH] Avoid usage of LoaderSymbol.
It can be dangerous. This patch is based on the previous one when r128
was in xf86-video-ati. The problem is that if gR128EntityIndex is not
explicitly marked as a public symbol, and weird things may happen when
compiling with hidden symbols.
Since the symbol is in the same shared binary of its callers, just use
it, instead of using LoaderSymbol. Could also just replace calls
getR128EntityIndex() to direct access to gR128EntityIndex.
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 0e693e0..2eb9d26 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -192,13 +192,11 @@ R128RAMRec R128RAM[] = { /* Memory Specifications
{ 4, 4, 3, 3, 2, 3, 1, 16, 12, "64-bit DDR SGRAM" },
};
+extern _X_EXPORT int gR128EntityIndex;
+
int getR128EntityIndex(void)
{
- int *r128_entity_index = LoaderSymbol("gR128EntityIndex");
- if (!r128_entity_index)
- return -1;
- else
- return *r128_entity_index;
+ return gR128EntityIndex;
}
R128EntPtr R128EntPriv(ScrnInfoPtr pScrn)
diff --git a/src/r128_probe.c b/src/r128_probe.c
index b1f427a..bfec1eb 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -208,7 +208,7 @@ static const struct pci_id_match r128_device_match[] = {
#endif /* XSERVER_LIBPCIACCESS */
-int gR128EntityIndex = -1;
+_X_EXPORT int gR128EntityIndex = -1;
/* Return the options for supported chipset 'n'; NULL otherwise */
static const OptionInfoRec *
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
