xserver-xorg-video-i128: Changes to 'debian-unstable'
ChangeLog | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 7 +++++
man/i128.man | 1
src/i128_driver.c | 37 +++++++++++++++++--------------
src/i128dga.c | 6 ++---
src/i128reg.h | 2 -
7 files changed, 97 insertions(+), 22 deletions(-)
New commits:
commit d58d69be4a81852b20573382b4eeeb7c261b855f
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 2 02:21:11 2012 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 955e31e..36bc0d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-i128 (1:1.3.5-1) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.5-1) unstable; urgency=low
* New upstream release:
- Add support for Xserver 1.12.
- -- Cyril Brulebois <kibi@debian.org> Mon, 02 Apr 2012 02:19:42 +0000
+ -- Cyril Brulebois <kibi@debian.org> Mon, 02 Apr 2012 02:21:09 +0000
xserver-xorg-video-i128 (1:1.3.4-2) unstable; urgency=low
commit a19c22ef0eb68a537eba014a38ef61511b885d69
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 2 02:20:03 2012 +0000
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 9b61adc..123a424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+commit 2228b7f80cc2f2a13dc00fd659b592407f1bbef1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 23 18:51:51 2012 -0700
+
+ xf86-video-i128 1.3.5
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3b23ca1d037b9d70f8e3a1ce5b5af0cba05f45cc
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:48:13 2011 -0500
+
+ Fix for new vgaHW ABI
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 0a46285e074dded359c859b8ffa2a0c9c437b21b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 16:29:49 2011 -0500
+
+ Make failure to XAA non-fatal
+
+ No shadowfb support in this driver yet.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 0e357623bc3d68e6eaf9bb755f44cca2d5321f8b
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 00:24:00 2011 -0700
+
+ Build fix for ABI Version 12
+
+ ABI Version 12 removes support for multiple PCI domains. If you need to
+ use this driver on a system with more than one PCI domain, you should
+ either port this driver to using libpciaccess directly or stick with an
+ older server.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c3eb2c3f05902be4e4e5b929663753276cde3611
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 00:23:12 2011 -0700
+
+ Use unsigned long rather than deprecated IOADDRESS
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit f5c6593c9309541eedd374431dbd72151b8fb3ab
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 00:22:09 2011 -0700
+
+ Use malloc/calloc/realloc/free directly
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b9e0edbd4ab23c811714a648cb729b5c11356795
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:51 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit d7c1073cf42e3486b49f5a55f2c5f2929b18417f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:51:59 2010 -0400
diff --git a/debian/changelog b/debian/changelog
index 4bd927a..955e31e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-i128 (1:1.3.5-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Add support for Xserver 1.12.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 02 Apr 2012 02:19:42 +0000
+
xserver-xorg-video-i128 (1:1.3.4-2) unstable; urgency=low
* Switch to dh:
commit 2228b7f80cc2f2a13dc00fd659b592407f1bbef1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 23 18:51:51 2012 -0700
xf86-video-i128 1.3.5
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5ae48b0..76571d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
- [1.3.4],
+ [1.3.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
commit 3b23ca1d037b9d70f8e3a1ce5b5af0cba05f45cc
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:48:13 2011 -0500
Fix for new vgaHW ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 7990c9b..bdb999e 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -492,6 +492,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
hwp = VGAHWPTR(pScrn);
+ vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
/* Set pScrn->monitor */
commit 0a46285e074dded359c859b8ffa2a0c9c437b21b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 16:29:49 2011 -0500
Make failure to XAA non-fatal
No shadowfb support in this driver yet.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 92f9d58..7990c9b 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -1117,8 +1117,9 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
}
} else {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- I128FreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "No acceleration available\n");
+ pI128->NoAccel = 1;
}
}
}
commit 0e357623bc3d68e6eaf9bb755f44cca2d5321f8b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:24:00 2011 -0700
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 26c06df..92f9d58 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n",
PCI_SUB_VENDOR_ID(pI128->PciInfo));
- iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset;
+ iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ iobase += hwp->PIOOffset;
+#endif
pI128->RegRec.iobase = iobase;
pI128->io.rbase_g = inl(iobase) & 0xFFFFFF00;
commit c3eb2c3f05902be4e4e5b929663753276cde3611
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:23:12 2011 -0700
Use unsigned long rather than deprecated IOADDRESS
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 40f1e4d..26c06df 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
int i;
ClockRangePtr clockRanges;
MessageType from;
- IOADDRESS iobase;
+ unsigned long iobase;
char *ramdac = NULL;
CARD32 tmpl, tmph, tmp;
unsigned char n, m, p, mdc, df;
@@ -1804,7 +1804,7 @@ I128DDC1Read(ScrnInfoPtr pScrn)
I128Ptr pI128 = I128PTR(pScrn);
unsigned char val;
unsigned long tmp, ddc;
- IOADDRESS iobase;
+ unsigned long iobase;
iobase = pI128->RegRec.iobase;
ddc = inl(iobase + 0x2C);
@@ -1839,7 +1839,7 @@ I128I2CGetBits(I2CBusPtr b, int *clock, int *data)
{
I128Ptr pI128 = I128PTR(xf86Screens[b->scrnIndex]);
unsigned long ddc;
- IOADDRESS iobase;
+ unsigned long iobase;
#if 0
static int lastclock = -1, lastdata = -1;
#endif
@@ -1867,7 +1867,7 @@ I128I2CPutBits(I2CBusPtr b, int clock, int data)
unsigned char drv, val;
unsigned long ddc;
unsigned long tmp;
- IOADDRESS iobase;
+ unsigned long iobase;
iobase = pI128->RegRec.iobase;
ddc = inl(iobase + 0x2C);
@@ -1889,7 +1889,7 @@ I128I2CInit(ScrnInfoPtr pScrn)
{
I128Ptr pI128 = I128PTR(pScrn);
I2CBusPtr I2CPtr;
- IOADDRESS iobase;
+ unsigned long iobase;
unsigned long soft_sw, ddc;
I2CPtr = xf86CreateI2CBusRec();
@@ -2102,7 +2102,7 @@ void
I128DumpActiveRegisters(ScrnInfoPtr pScrn)
{
I128Ptr pI128 = I128PTR(pScrn);
- IOADDRESS iobase;
+ unsigned long iobase;
unsigned long rbase_g, rbase_w, rbase_a, rbase_b, rbase_i, rbase_e;
unsigned long id, config1, config2, sgram, soft_sw, ddc, vga_ctl;
volatile CARD32 *vrba, *vrbg, *vrbw;
diff --git a/src/i128reg.h b/src/i128reg.h
index 56b9c33..a72b525 100644
--- a/src/i128reg.h
+++ b/src/i128reg.h
@@ -75,7 +75,7 @@ struct i128mem {
/* save the registers needed for restoration in this structure */
typedef struct {
- IOADDRESS iobase; /* saved only for iobase indexing */
+ unsigned long iobase; /* saved only for iobase indexing */
CARD32 config1; /* iobase+0x1C register */
CARD32 config2; /* iobase+0x20 register */
CARD32 sgram; /* iobase+0x24 register */
commit f5c6593c9309541eedd374431dbd72151b8fb3ab
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:22:09 2011 -0700
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 903a3a8..40f1e4d 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
numDevSections, drv, &usedChips);
/* Free it since we don't need that list after this */
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
if (flags & PROBE_DETECT) {
- xfree(usedChips);
+ free(usedChips);
return FALSE;
}
@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
- xfree(usedChips);
+ free(usedChips);
return foundScreen;
}
@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pI128->Options = xalloc(sizeof(I128Options))))
+ if (!(pI128->Options = malloc(sizeof(I128Options))))
return FALSE;
memcpy(pI128->Options, I128Options, sizeof(I128Options));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI128->Options);
@@ -1157,7 +1157,7 @@ I128FreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -1704,12 +1704,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen)
XAADestroyInfoRec(pI128->XaaInfoRec);
if (pI128->ExaDriver) {
exaDriverFini(pScreen);
- xfree(pI128->ExaDriver);
+ free(pI128->ExaDriver);
}
if (pI128->CursorInfoRec)
xf86DestroyCursorInfoRec(pI128->CursorInfoRec);
if (pI128->DGAModes)
- xfree(pI128->DGAModes);
+ free(pI128->DGAModes);
pScrn->vtSema = FALSE;
pScreen->CloseScreen = pI128->CloseScreen;
diff --git a/src/i128dga.c b/src/i128dga.c
index 48823aa..8bc2fcb 100644
--- a/src/i128dga.c
+++ b/src/i128dga.c
@@ -59,15 +59,15 @@ I128DGAInit(ScreenPtr pScreen)
while(pMode) {
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
commit b9e0edbd4ab23c811714a648cb729b5c11356795
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:51 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/i128.man b/man/i128.man
index 920d2ab..a8e2e54 100644
--- a/man/i128.man
+++ b/man/i128.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH I128 __drivermansuffix__ __vendorversion__
Reply to: