xserver-xorg-video-openchrome: Changes to 'debian-unstable'
.gitignore | 2
Makefile.am | 2
NEWS | 39
configure.ac | 99
debian/changelog | 8
debian/control | 2
debian/patches/10-Deal-with-xserver-1.12.diff | 29
debian/patches/series | 2
libxvmc/Imakefile | 59
libxvmc/Makefile.am | 46
libxvmc/driDrawable.c | 173 -
libxvmc/driDrawable.h | 64
libxvmc/viaLowLevel.c | 1055 ---------
libxvmc/viaLowLevel.h | 141 -
libxvmc/viaLowLevelPro.c | 1650 --------------
libxvmc/viaXvMC.c | 1947 ----------------
libxvmc/viaXvMCPriv.h | 197 -
libxvmc/vldXvMC.h | 178 -
libxvmc/xf86dri.c | 599 -----
libxvmc/xf86dri.h | 116
libxvmc/xf86dristr.h | 390 ---
src/Imakefile | 231 -
src/Makefile.am | 52
src/compat-api.h | 95
src/via.h | 737 ------
src/via_accel.c | 2806 ------------------------
src/via_bandwidth.c | 2
src/via_bios.h | 296 --
src/via_ch7xxx.c | 112
src/via_ch7xxx.h | 9
src/via_crtc.c | 675 -----
src/via_cursor.c | 592 -----
src/via_dga.c | 321 --
src/via_display.c | 1747 ++++++++++++++
src/via_dmabuffer.h | 7
src/via_dri.c | 443 +--
src/via_dri.h | 7
src/via_driver.c | 3038 ++++++--------------------
src/via_driver.h | 309 +-
src/via_drm.h | 143 -
src/via_eng_regs.h | 741 ++++++
src/via_exa.c | 1020 ++++++++
src/via_exa_h2.c | 559 ++++
src/via_exa_h6.c | 536 ++++
src/via_i2c.c | 75
src/via_id.c | 58
src/via_id.h | 79
src/via_kms.c | 1011 ++++++++
src/via_kms.h | 84
src/via_lvds.c | 1386 +++++++++++
src/via_memcpy.c | 30
src/via_memcpy.h | 31
src/via_memmgr.c | 253 ++
src/via_memmgr.h | 54
src/via_memory.c | 182 -
src/via_mode.c | 1765 ---------------
src/via_mode.h | 49
src/via_outputs.c | 1311 +++++++++++
src/via_panel.c | 492 ----
src/via_priv.h | 27
src/via_regs.h | 595 ++---
src/via_shadow.c | 453 ---
src/via_swov.c | 2497 ---------------------
src/via_swov.h | 87
src/via_timing.c | 398 ---
src/via_timing.h | 51
src/via_ums.c | 817 ++++++
src/via_ums.h | 256 ++
src/via_vbe.c | 78
src/via_vgahw.c | 337 ++
src/via_vgahw.h | 12
src/via_video.c | 1627 -------------
src/via_video.h | 117 -
src/via_vt162x.c | 51
src/via_vt162x.h | 44
src/via_xv.c | 1574 +++++++++++++
src/via_xv.h | 117 +
src/via_xv_overlay.c | 2482 +++++++++++++++++++++
src/via_xv_overlay.h | 87
src/via_xvmc.c | 69
src/via_xvmc.h | 5
src/xvmc/Imakefile | 59
src/xvmc/Makefile.am | 46
src/xvmc/driDrawable.c | 173 +
src/xvmc/driDrawable.h | 64
src/xvmc/viaLowLevel.c | 1055 +++++++++
src/xvmc/viaLowLevel.h | 141 +
src/xvmc/viaLowLevelPro.c | 1650 ++++++++++++++
src/xvmc/viaXvMC.c | 1947 ++++++++++++++++
src/xvmc/viaXvMCPriv.h | 197 +
src/xvmc/vldXvMC.h | 178 +
src/xvmc/xf86dri.c | 599 +++++
src/xvmc/xf86dri.h | 116
src/xvmc/xf86dristr.h | 390 +++
tools/Makefile.am | 2
tools/registers.c | 3
96 files changed, 22931 insertions(+), 23606 deletions(-)
New commits:
commit 140514434271106dc1debb556348219803c3a3fa
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Sep 6 11:31:33 2012 +0300
control: Bump policy to 3.9.3, no changes.
diff --git a/debian/changelog b/debian/changelog
index 15cdc9d..1931931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-openchrome (1:0.3.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
* Remove 10-Deal-with-xserver-1.12.diff, not needed anymore.
+ * control: Bump policy to 3.9.3, no changes.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 19 Jul 2012 10:41:21 +0200
diff --git a/debian/control b/debian/control
index 3249b09..af16659 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
libxvmc-dev,
quilt
Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.openchrome.org
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git
commit 8f73655ab395439fbde2c8fd7ae91967b18ed3b3
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Sep 6 11:31:07 2012 +0300
Remove 10-Deal-with-xserver-1.12.diff, not needed anymore.
diff --git a/debian/changelog b/debian/changelog
index 86d8d01..15cdc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-openchrome (1:0.3.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ * Remove 10-Deal-with-xserver-1.12.diff, not needed anymore.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 19 Jul 2012 10:41:21 +0200
diff --git a/debian/patches/10-Deal-with-xserver-1.12.diff b/debian/patches/10-Deal-with-xserver-1.12.diff
deleted file mode 100644
index ed29772..0000000
--- a/debian/patches/10-Deal-with-xserver-1.12.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Deal with X 1.12 by calling vgaHWSetStdFuncs().
-
-Thanks to Leon Winter for testing the initial patch and proposing a
-working one.
-
-Signed-off-by: Cyril Brulebois <kibi@debian.org>
---- a/src/via_driver.c
-+++ b/src/via_driver.c
-@@ -997,6 +997,11 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- }
-
-+ hwp = VGAHWPTR(pScrn);
-+
-+ /* Needed with X 1.12 */
-+ vgaHWSetStdFuncs(hwp);
-+
- if (pVia->Chipset == VIA_CLE266)
- ViaDoubleCheckCLE266Revision(pScrn);
-
-@@ -1012,8 +1017,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
- struct pci_device *vgaDevice = viaPciDeviceVga();
- #endif
-
-- hwp = VGAHWPTR(pScrn);
--
- switch (pVia->Chipset) {
- case VIA_CLE266:
- #ifdef XSERVER_LIBPCIACCESS
diff --git a/debian/patches/series b/debian/patches/series
index 0ea68a3..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-10-Deal-with-xserver-1.12.diff
+#placeholder
commit a78f2d0dc99c26438628d7b967bb1bfe09ab3787
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Sep 6 11:16:08 2012 +0300
bump the version
diff --git a/debian/changelog b/debian/changelog
index e98d387..86d8d01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xserver-xorg-video-openchrome (1:0.2.906-2) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.3.1-1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* Move to git.
* Remove svn note in README.source
* Remove README.VCS-source
+ [ Timo Aaltonen ]
+ * New upstream release.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 19 Jul 2012 10:41:21 +0200
xserver-xorg-video-openchrome (1:0.2.906-1) unstable; urgency=low
commit eee95bd967f452026bbd1379074c1ee0f83b2df3
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Tue Sep 4 22:43:37 2012 +0200
bump version to 0.3.1
diff --git a/NEWS b/NEWS
index c7a2a76..32acfcd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+openchrome 0.3.1 (04/09/2012)
+-----------------------------
+
+This is a bugfix release. It mainly fixes a crash at startup with X server 1.13.
+
+
openchrome 0.3.0 (20/07/2012)
-----------------------------
diff --git a/configure.ac b/configure.ac
index f98d13a..9eea422 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.3.0],
+ [0.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit a8e7783856c1754e5c4a85045d7d536ceca40994
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Fri Aug 24 18:04:52 2012 +0200
Dell Optiplex FX130 (reported by Maciej Kazulak)
diff --git a/src/via_id.c b/src/via_id.c
index c1a3382..a9de60b 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -243,6 +243,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Fujitsu Futro S100", VIA_VX800, 0xA0A0, 0x0702, VIA_DEVICE_CRT},
/*** VX855 ***/
+ {"Dell Optiplex FX130", VIA_VX855, 0x1028, 0x0509, VIA_DEVICE_CRT},
{"VIA VT8562C", VIA_VX855, 0x1106, 0x5122, VIA_DEVICE_CRT},
{"OLPC XO 1.5", VIA_VX855, 0x152D, 0x0833, VIA_DEVICE_LCD},
commit 131175a7163a9189d70ed3118b45eaceb27898c0
Author: James Simmons <jsimmons@infradead.org>
Date: Sun Aug 5 11:10:27 2012 -0400
SCRN_INFO_PTR no longer works in new xorg servers when used from
inside the i2c layer. The work around is store the VGAHWPtr inside
the I2CBus DriverPrivate Union since the VGAHWPtr is what we really
want.
diff --git a/src/via_i2c.c b/src/via_i2c.c
index 912b87d..967c333 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -44,8 +44,7 @@
static void
ViaI2C1PutBits(I2CBusPtr Bus, int clock, int data)
{
- SCRN_INFO_PTR(Bus->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = Bus->DriverPrivate.ptr;
CARD8 value = 0x01; /* Enable */
if (clock)
@@ -60,8 +59,7 @@ ViaI2C1PutBits(I2CBusPtr Bus, int clock, int data)
static void
ViaI2C1GetBits(I2CBusPtr Bus, int *clock, int *data)
{
- SCRN_INFO_PTR(Bus->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = Bus->DriverPrivate.ptr;
CARD8 value = hwp->readSeq(hwp, 0x26);
*clock = (value & SCL_READ) != 0;
@@ -69,38 +67,36 @@ ViaI2C1GetBits(I2CBusPtr Bus, int *clock, int *data)
}
static I2CBusPtr
-ViaI2CBus1Init(int scrnIndex)
+ViaI2CBus1Init(ScrnInfoPtr pScrn)
{
I2CBusPtr pI2CBus = xf86CreateI2CBusRec();
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
- DEBUG(xf86DrvMsg(scrnIndex, X_INFO, "ViaI2CBus1Init\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaI2CBus1Init\n"));
if (!pI2CBus)
return NULL;
pI2CBus->BusName = "I2C bus 1";
- pI2CBus->scrnIndex = scrnIndex;
+ pI2CBus->scrnIndex = pScrn->scrnIndex;
pI2CBus->I2CPutBits = ViaI2C1PutBits;
pI2CBus->I2CGetBits = ViaI2C1GetBits;
+ pI2CBus->DriverPrivate.ptr = hwp;
if (!xf86I2CBusInit(pI2CBus)) {
xf86DestroyI2CBusRec(pI2CBus, TRUE, FALSE);
return NULL;
}
-
return pI2CBus;
}
-
/*
* First data bus I2C: tends to have TV-encoders.
*/
-
static void
ViaI2C2PutBits(I2CBusPtr Bus, int clock, int data)
{
- SCRN_INFO_PTR(Bus->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = Bus->DriverPrivate.ptr;
CARD8 value = 0x01; /* Enable */
if (clock)
@@ -115,8 +111,7 @@ ViaI2C2PutBits(I2CBusPtr Bus, int clock, int data)
static void
ViaI2C2GetBits(I2CBusPtr Bus, int *clock, int *data)
{
- SCRN_INFO_PTR(Bus->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = Bus->DriverPrivate.ptr;
CARD8 value = hwp->readSeq(hwp, 0x31);
*clock = (value & SCL_READ) != 0;
@@ -124,39 +119,37 @@ ViaI2C2GetBits(I2CBusPtr Bus, int *clock, int *data)
}
static I2CBusPtr
-ViaI2CBus2Init(int scrnIndex)
+ViaI2CBus2Init(ScrnInfoPtr pScrn)
{
I2CBusPtr pI2CBus = xf86CreateI2CBusRec();
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
- DEBUG(xf86DrvMsg(scrnIndex, X_INFO, "ViaI2cBus2Init\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaI2cBus2Init\n"));
if (!pI2CBus)
return NULL;
pI2CBus->BusName = "I2C bus 2";
- pI2CBus->scrnIndex = scrnIndex;
+ pI2CBus->scrnIndex = pScrn->scrnIndex;
pI2CBus->I2CPutBits = ViaI2C2PutBits;
pI2CBus->I2CGetBits = ViaI2C2GetBits;
+ pI2CBus->DriverPrivate.ptr = hwp;
if (!xf86I2CBusInit(pI2CBus)) {
xf86DestroyI2CBusRec(pI2CBus, TRUE, FALSE);
return NULL;
}
-
return pI2CBus;
}
-
/*
* A third I2C bus is implemented by a few IO pins.
* Requires higher level functions to be used properly.
*/
-
static Bool
ViaI2C3Start(I2CBusPtr b, int timeout)
{
- SCRN_INFO_PTR(b->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = b->DriverPrivate.ptr;
ViaSeqMask(hwp, 0x2C, 0xF0, 0xF0);
b->I2CUDelay(b, b->RiseFallTime);
@@ -189,7 +182,6 @@ ViaI2C3Address(I2CDevPtr d, I2CSlaveAddr addr)
b->I2CStop(d);
}
-
return FALSE;
}
@@ -197,8 +189,7 @@ static void
ViaI2C3Stop(I2CDevPtr d)
{
I2CBusPtr b = d->pI2CBus;
- SCRN_INFO_PTR(b->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = b->DriverPrivate.ptr;
ViaSeqMask(hwp, 0x2C, 0xC0, 0xF0);
b->I2CUDelay(b, b->RiseFallTime);
@@ -216,8 +207,7 @@ ViaI2C3Stop(I2CDevPtr d)
static void
ViaI2C3PutBit(I2CBusPtr b, Bool sda, int timeout)
{
- SCRN_INFO_PTR(b->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = b->DriverPrivate.ptr;
if (sda)
ViaSeqMask(hwp, 0x2C, 0x50, 0x50);
@@ -237,8 +227,7 @@ static Bool
ViaI2C3PutByte(I2CDevPtr d, I2CByte data)
{
I2CBusPtr b = d->pI2CBus;
- SCRN_INFO_PTR(b->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = b->DriverPrivate.ptr;
Bool ret;
int i;
@@ -265,8 +254,7 @@ ViaI2C3PutByte(I2CDevPtr d, I2CByte data)
static Bool
ViaI2C3GetBit(I2CBusPtr b, int timeout)
{
- SCRN_INFO_PTR(b->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = b->DriverPrivate.ptr;
Bool ret;
ViaSeqMask(hwp, 0x2c, 0x80, 0xC0);
@@ -291,8 +279,7 @@ static Bool
ViaI2C3GetByte(I2CDevPtr d, I2CByte * data, Bool last)
{
I2CBusPtr b = d->pI2CBus;
- SCRN_INFO_PTR(b->scrnIndex);
- vgaHWPtr hwp = VGAHWPTR(pScrn);
+ vgaHWPtr hwp = b->DriverPrivate.ptr;
int i;
*data = 0x00;
@@ -315,17 +302,18 @@ ViaI2C3GetByte(I2CDevPtr d, I2CByte * data, Bool last)
}
static I2CBusPtr
-ViaI2CBus3Init(int scrnIndex)
+ViaI2CBus3Init(ScrnInfoPtr pScrn)
{
I2CBusPtr pI2CBus = xf86CreateI2CBusRec();
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
- DEBUG(xf86DrvMsg(scrnIndex, X_INFO, "ViaI2CBus3Init\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaI2CBus3Init\n"));
if (!pI2CBus)
return NULL;
pI2CBus->BusName = "I2C bus 3";
- pI2CBus->scrnIndex = scrnIndex;
+ pI2CBus->scrnIndex = pScrn->scrnIndex;
pI2CBus->I2CAddress = ViaI2C3Address;
#ifdef X_NEED_I2CSTART
pI2CBus->I2CStart = ViaI2C3Start;
@@ -333,6 +321,7 @@ ViaI2CBus3Init(int scrnIndex)
pI2CBus->I2CStop = ViaI2C3Stop;
pI2CBus->I2CPutByte = ViaI2C3PutByte;
pI2CBus->I2CGetByte = ViaI2C3GetByte;
+ pI2CBus->DriverPrivate.ptr = hwp;
pI2CBus->HoldTime = 10;
pI2CBus->BitTimeout = 10;
@@ -343,11 +332,9 @@ ViaI2CBus3Init(int scrnIndex)
xf86DestroyI2CBusRec(pI2CBus, TRUE, FALSE);
return NULL;
}
-
return pI2CBus;
}
-
#ifdef HAVE_DEBUG
static void
ViaI2CScan(I2CBusPtr Bus)
@@ -372,11 +359,11 @@ ViaI2CInit(ScrnInfoPtr pScrn)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaI2CInit\n"));
if (pVia->I2CDevices & VIA_I2C_BUS1)
- pVia->pI2CBus1 = ViaI2CBus1Init(pScrn->scrnIndex);
+ pVia->pI2CBus1 = ViaI2CBus1Init(pScrn);
if (pVia->I2CDevices & VIA_I2C_BUS2)
- pVia->pI2CBus2 = ViaI2CBus2Init(pScrn->scrnIndex);
+ pVia->pI2CBus2 = ViaI2CBus2Init(pScrn);
if (pVia->I2CDevices & VIA_I2C_BUS3)
- pVia->pI2CBus3 = ViaI2CBus3Init(pScrn->scrnIndex);
+ pVia->pI2CBus3 = ViaI2CBus3Init(pScrn);
#ifdef HAVE_DEBUG
if (pVia->I2CScan) {
commit 592fbd189bd0052b542eb6a351690042bcbee39e
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Mon Jul 30 21:05:23 2012 +0200
Remove --(enable|disable)-dri configure option, it depends on whether the X server was built with or w/o DRI support.
diff --git a/configure.ac b/configure.ac
index 9f4cf3b..f98d13a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,11 +64,6 @@ AC_ARG_WITH(xorg-module-dir,
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
- [Disable DRI support [[default=auto]]]),
- [DRI="$enableval"],
- [DRI=auto])
-
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
[Enable debugging support [[default=no]]]),
[DEBUG="$enableval"],
@@ -115,33 +110,29 @@ if test x$XSERVER_LIBPCIACCESS = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
fi
-if test "$DRI" != no; then
- PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS"
- AC_CHECK_HEADER([dri.h],
- [have_dri_h="yes"], [have_dri_h="no"],[-])
- AC_CHECK_HEADER([sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"],[-])
+PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS"
+AC_CHECK_HEADER([dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"],[-])
+AC_CHECK_HEADER([sarea.h],
+ [have_sarea_h="yes"], [have_sarea_h="no"],[-])
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
#include <xorg-server.h>
#include <dristruct.h>
- ]])],
- [have_dristruct_h="yes"], [have_dristruct_h="no"],[-])
- AC_CHECK_HEADER([damage.h],
- [have_damage_h="yes"], [have_damage_h="no"],[-])
- CPPFLAGS="$save_CPPFLAGS"
-fi
+ ]])],
+ [have_dristruct_h="yes"], [have_dristruct_h="no"],[-])
+AC_CHECK_HEADER([damage.h],
+ [have_damage_h="yes"], [have_damage_h="no"],[-])
+CPPFLAGS="$save_CPPFLAGS"
AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
- if test "$have_dri_h" = yes -a \
- "$have_sarea_h" = yes -a \
- "$have_dristruct_h" = yes; then
- DRI="yes"
- else
- DRI="no"
- fi
+if test "$have_dri_h" = yes -a \
+ "$have_sarea_h" = yes -a \
+ "$have_dristruct_h" = yes; then
+ DRI="yes"
+else
+ DRI="no"
fi
AC_MSG_RESULT([$DRI])
commit f5c1627ff0cbac097173e509f96f62b6021397ca
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Mon Jul 30 21:03:42 2012 +0200
Lower libdrm requirement to 2.0
diff --git a/configure.ac b/configure.ac
index 9a324b7..9f4cf3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@ if test x$XSERVER_LIBPCIACCESS = xyes; then
fi
if test "$DRI" != no; then
- PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
+ PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS"
AC_CHECK_HEADER([dri.h],
commit b48ba7268e57bc65066d3a5b0d0e2d8f7a1c3999
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Mon Jul 23 23:35:31 2012 +0200
Simmtronics SIMM-PC VX900i (reported by Sagar Sawant)
diff --git a/src/via_id.c b/src/via_id.c
index 153ace9..c1a3382 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -247,6 +247,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"OLPC XO 1.5", VIA_VX855, 0x152D, 0x0833, VIA_DEVICE_LCD},
/*** VX900 ***/
+ {"Simmtronics SIMM-PC VX900i", VIA_VX900, 0x1019, 0x3126, VIA_DEVICE_CRT},
{"Foxconn L740", VIA_VX900, 0x105B, 0x0CFD, VIA_DEVICE_LCD | VIA_DEVICE_CRT},
{"HP T5550 Thin Client", VIA_VX900, 0x1106, 0x7122, VIA_DEVICE_CRT},
{"ASRock PV530", VIA_VX900, 0x1849, 0x7122, VIA_DEVICE_CRT},
commit 1da9cf117cdc8ffb616da331a3e25f86ef40086a
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Fri Jul 20 23:50:46 2012 +0200
Tweak release date again
diff --git a/NEWS b/NEWS
index bc080c7..c7a2a76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-openchrome 0.3.0 (17/07/2012)
+openchrome 0.3.0 (20/07/2012)
-----------------------------
The 0.3.0 release is a major step forward for the openchrome X.org
commit fe33d114ec24465eeedcd35925586c65b8ef0af7
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Fri Jul 20 20:42:56 2012 +0200
Remove a couple unused variables
diff --git a/src/via_display.c b/src/via_display.c
index 4472778..5b1b2fb 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -475,7 +475,6 @@ ViaFirstCRTCSetStartingAddress(ScrnInfoPtr pScrn, int x, int y)
VIAPtr pVia = VIAPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
CARD32 Base;
- CARD32 tmp;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaFirstCRTCSetStartingAddress\n"));
@@ -989,10 +988,9 @@ iga1_crtc_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
ScrnInfoPtr pScrn = crtc->scrn;
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
int SR1A, SR1B, CR67, CR6A;
LOCO colors[size];
- int i, index;
+ int i;
for (i = 0; i < size; i++) {
colors[i].red = red[i] >> 8;
@@ -1391,10 +1389,9 @@ iga2_crtc_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
ScrnInfoPtr pScrn = crtc->scrn;
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
int SR1A, SR1B, CR67, CR6A;
LOCO colors[size];
- int i, index;
+ int i;
for (i = 0; i < size; i++) {
colors[i].red = red[i] >> 8;
diff --git a/src/via_dri.c b/src/via_dri.c
index 3907785..1351bce 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -899,7 +899,6 @@ viaDRIOffscreenSave(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
unsigned long srcSize = pVia->driOffScreenMem->size;
- VIADRIPtr pVIADRI = pVia->pDRIInfo->devPrivate;
int err;
if (pVia->driOffScreenSave)
@@ -933,7 +932,6 @@ void
viaDRIOffscreenRestore(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
- VIADRIPtr pVIADRI = pVia->pDRIInfo->devPrivate;
if (pVia->driOffScreenSave) {
void *src, *dst = drm_bo_map(pScrn, pVia->driOffScreenMem);
diff --git a/src/via_driver.c b/src/via_driver.c
index 51cc93d..d9e940f 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1762,7 +1762,6 @@ static Bool
VIAScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
int pitch;
diff --git a/src/via_exa.c b/src/via_exa.c
index ffedae1..1b44add 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -920,7 +920,7 @@ viaFinishInitAccel(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VIAPtr pVia = VIAPTR(pScrn);
#ifdef XF86DRI
- int size, ret;
+ int size;
if (pVia->directRenderingType && pVia->useEXA) {
diff --git a/src/via_kms.c b/src/via_kms.c
index c0847d6..1890e75 100644
--- a/src/via_kms.c
+++ b/src/via_kms.c
@@ -322,7 +322,6 @@ drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
uint32_t handle = drmmode_crtc->cursor_bo->handle, *ptr;
- int i;
/* cursor should be mapped already */
ptr = drm_bo_map(crtc->scrn, drmmode_crtc->cursor_bo);
@@ -927,7 +926,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
Bool KMSCrtcInit(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{
- int ret, i;
+ int i;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "KMSCrtcInit\n"));
xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
diff --git a/src/via_lvds.c b/src/via_lvds.c
index bcb83e7..b71129a 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -479,7 +479,6 @@ static Bool
ViaPanelGetSizeFromDDCv1(xf86OutputPtr output, int *width, int *height)
{
ScrnInfoPtr pScrn = output->scrn;
- vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
xf86MonPtr pMon;
@@ -612,7 +611,6 @@ ViaPanelGetNativeModeFromScratchPad(xf86OutputPtr output)
{
ViaPanelInfoPtr panel = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
CARD8 index;
@@ -636,9 +634,6 @@ VIAGetPanelSize(xf86OutputPtr output)
xf86OutputStatus status = XF86OutputStatusDisconnected;
ViaPanelInfoPtr Panel = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
char *PanelSizeString[7] = { "640x480", "800x480", "800x600", "1024x768", "1280x768"
"1280x1024", "1400x1050", "1600x1200" };
int width = 0;
@@ -709,7 +704,6 @@ static Bool
ViaPanelGetIndex(xf86OutputPtr output, DisplayModePtr mode)
{
ScrnInfoPtr pScrn = output->scrn;
- VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
ViaPanelInfoPtr Panel = output->driver_private;
int i;
@@ -846,8 +840,6 @@ via_lvds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
DisplayModePtr adjusted_mode)
{
ViaPanelInfoPtr Panel = output->driver_private;
- ScrnInfoPtr pScrn = output->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
xf86SetModeCrtc(adjusted_mode, 0);
if (!Panel->Center && (mode->HDisplay < Panel->NativeWidth ||
@@ -1231,8 +1223,6 @@ via_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
*/
if (pVia->pVbe) {
if (!pVia->useLegacyVBE) {
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-
/*
* FIXME: Should we always set the panel expansion?
* Does it depend on the resolution?
@@ -1257,8 +1247,6 @@ via_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
break;
}
} else {
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-
if (!pVia->UseLegacyModeSwitch) {
if (Panel->Scale) {
ViaPanelScale(pScrn, mode->HDisplay, mode->VDisplay,
@@ -1309,7 +1297,6 @@ via_lvds_detect(xf86OutputPtr output)
ViaPanelInfoPtr panel = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
vgaHWPtr hwp = VGAHWPTR(pScrn);
if (!pVia->UseLegacyModeSwitch) {
@@ -1495,7 +1482,6 @@ void
via_lvds_init(ScrnInfoPtr pScrn)
{
ViaPanelInfoPtr Panel = (ViaPanelInfoPtr) xnfcalloc(sizeof(ViaPanelInfoRec), 1);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
OptionInfoPtr Options = xnfalloc(sizeof(ViaPanelOptions));
MessageType from = X_DEFAULT;
VIAPtr pVia = VIAPTR(pScrn);
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 3123eac..93e8804 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -53,7 +53,6 @@ viaOffScreenLinear(struct buffer_object *obj, ScrnInfoPtr pScrn,
unsigned long size)
{
int depth = pScrn->bitsPerPixel >> 3;
- VIAPtr pVia = VIAPTR(pScrn);
FBLinearPtr linear;
linear = xf86AllocateOffscreenLinear(pScrn->pScreen,
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 56b6825..45827ac 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -382,7 +382,6 @@ static const xf86OutputFuncsRec via_tv_funcs = {
static Bool
via_tv_init(ScrnInfoPtr pScrn)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
xf86OutputPtr output = NULL;
@@ -612,9 +611,7 @@ static const xf86OutputFuncsRec via_dp_funcs = {
void
via_dp_init(ScrnInfoPtr pScrn)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
xf86OutputPtr output = NULL;
if (pVia->pI2CBus2)
@@ -788,7 +785,6 @@ static const xf86OutputFuncsRec via_analog_funcs = {
void
via_analog_init(ScrnInfoPtr pScrn)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
xf86OutputPtr output = NULL;
diff --git a/src/via_vbe.c b/src/via_vbe.c
index a13c464..d2e19d0 100644
--- a/src/via_vbe.c
+++ b/src/via_vbe.c
@@ -190,7 +190,6 @@ ViaVbeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
VbeModeInfoData *data;
pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
int mode;
int refreshRate;
diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index 4823991..f23fa0b 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -1132,7 +1132,6 @@ static long
AddHQVSurface(ScrnInfoPtr pScrn, unsigned int numbuf, CARD32 fourcc)
{
unsigned int i, width, height, pitch, fbsize, addr;
- unsigned long retCode;
BOOL isplanar;
void *buf;
@@ -1180,7 +1179,6 @@ CreateSurface(ScrnInfoPtr pScrn, CARD32 FourCC, CARD16 Width,
{
VIAPtr pVia = VIAPTR(pScrn);
unsigned long pitch, fbsize, addr;
- unsigned long retCode;
BOOL isplanar;
void *buf;
@@ -1743,7 +1741,6 @@ SetVideoWindow(ScrnInfoPtr pScrn, unsigned long videoFlag,
LPDDUPDATEOVERLAY pUpdate)
{
VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
CARD32 left = pUpdate->DstLeft;
CARD32 top = pUpdate->DstTop;
CARD32 right = pUpdate->DstRight - 1;
@@ -1812,7 +1809,6 @@ Upd_Video(xf86CrtcPtr crtc, unsigned long videoFlag,
drmmode_crtc_private_ptr iga = crtc->driver_private;
ScrnInfoPtr pScrn = crtc->scrn;
VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAHWDiff *hwDiff = &pVia->HWDiff;
unsigned long vidCtl = 0, compose;
diff --git a/tools/registers.c b/tools/registers.c
index 25d7c76..b4b842d 100644
--- a/tools/registers.c
+++ b/tools/registers.c
@@ -1071,7 +1071,6 @@ static int parse_ioreg(u_int16_t *reg, u_int8_t *index, char *str)
{
char *dot;
char buf[255];
- unsigned long ul;
memset(buf, 0, sizeof(*buf));
strncpy(buf, str, sizeof(buf)-1);
commit ec885b6f4b8b19327c0e9834e4fb556eee691a3c
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Fri Jul 20 20:29:23 2012 +0200
Use bits description for Software Reset Control register
diff --git a/tools/registers.c b/tools/registers.c
index 33c6445..25d7c76 100644
--- a/tools/registers.c
+++ b/tools/registers.c
@@ -518,7 +518,7 @@ struct io_reg sequencer_regs = {
[0x4b] = { "LDCK Clock Synthesizer Value 1", },
[0x4c] = { "LDCK Clock Synthesizer Value 2", },
[0x4d] = { "Preemptive Arbiter Control", },
- [0x4e] = { "Software Reset Control", },
+ [0x4e] = { "Software Reset Control", seq_4e_desc, },
[0x4f] = { "CR Gating Clock Control", },
[0x50] = { "AGP Control", },
[0x51] = { "Display FIFO Control 1", },
commit 3b97a3f93388774f5dc38028e9939c04bd3b9f3d
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Fri Jul 20 12:17:01 2012 +0200
Install registers dumper tool in sbin rather than bin
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6292e32..c2ef5c5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,5 @@
if TOOLS
-bin_PROGRAMS = via_regs_dump
+sbin_PROGRAMS = via_regs_dump
via_regs_dump_SOURCES = registers.c
else
EXTRA_DIST = registers.c
commit d2d898041e6c4bbc7c43d808d9a68b69afe2acc7
Author: Xavier Bachelot <xavier@bachelot.org>
Date: Fri Jul 20 11:35:57 2012 +0200
Fix typo in bug tracker link
diff --git a/configure.ac b/configure.ac
index 063ffaa..9a324b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
[0.3.0],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchromep],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
Reply to: