xserver-xorg-video-siliconmotion: Changes to 'upstream-unstable'
configure.ac | 6 +++++-
src/smi_501.c | 5 +++++
src/smi_driver.c | 20 ++++++++++++++------
3 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit 52f40e7569bbcc9bce8f5d885b0de2868398e8df
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Aug 5 11:09:26 2009 +1000
fix build after headers moved
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 39448c4..391efbc 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,7 +31,7 @@ authorization from The XFree86 Project or Silicon Motion.
#include "config.h"
#endif
-
+#include "xf86.h"
#include "xf86DDC.h"
#include "xf86int10.h"
#include "vbe.h"
commit 9d9bfe0349693b283e5dc1ced6fa882f10619253
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Aug 5 11:08:15 2009 +1000
update for 1.7.3
diff --git a/configure.ac b/configure.ac
index e38433e..e461861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.7.2,
+ 1.7.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
commit 115b564f78b038baef2d14c037785850efb4e9ca
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
siliconmotion: change to using ABI version check
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 9c07f61..39448c4 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -36,7 +36,7 @@ authorization from The XFree86 Project or Silicon Motion.
#include "xf86int10.h"
#include "vbe.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit 70f2463faa6d21517d97aa460871e1b5f3fa6505
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:36 2009 +1000
siliconmotion: update for resources/RAC API removal
diff --git a/src/smi_driver.c b/src/smi_driver.c
index b9b7b18..9c07f61 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,12 +31,16 @@ authorization from The XFree86 Project or Silicon Motion.
#include "config.h"
#endif
-#include "xf86Resources.h"
-#include "xf86RAC.h"
+
#include "xf86DDC.h"
#include "xf86int10.h"
#include "vbe.h"
+#ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
+
#include "smi.h"
#include "smi_501.h"
#include "smilynx.h"
@@ -416,7 +420,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
LEAVE(TRUE);
}
- if (pEnt->location.type != BUS_PCI || pEnt->resources) {
+ if (pEnt->location.type != BUS_PCI) {
xfree(pEnt);
SMI_FreeRec(pScrn);
LEAVE(FALSE);
@@ -626,10 +630,9 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
}
}
+#ifndef XSERVER_LIBPCIACCESS
xf86RegisterResources(pEnt->index, NULL, ResExclusive);
-/* xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); */
-/* xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); */
-
+#endif
/*
* Set the Chipset and ChipRev, allowing config file entries to
* override.
commit 841df790b5b6700e9a1d6d41ee04b0b913329084
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:55:05 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ec0e99e..e38433e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/smi_501.c b/src/smi_501.c
index a392eb0..a605e0d 100644
--- a/src/smi_501.c
+++ b/src/smi_501.c
@@ -35,8 +35,13 @@ authorization from The XFree86 Project or Silicon Motion.
#include "smi_501.h"
#include "regsmi.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/* Want to see register dumps for now */
#undef VERBLEV
diff --git a/src/smi_driver.c b/src/smi_driver.c
index b47f774..b9b7b18 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -43,8 +43,13 @@ authorization from The XFree86 Project or Silicon Motion.
#include "smi_crtc.h"
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/*
* Internals
Reply to: