xserver-xorg-video-sis: Changes to 'upstream-unstable'
configure.ac | 3 +--
src/sis_driver.c | 20 +++++++++-----------
src/sis_driver.h | 4 ----
src/sis_utility.c | 18 ------------------
4 files changed, 10 insertions(+), 35 deletions(-)
New commits:
commit 6ab99d8d66ccd77314760edcb6110db924be3dcf
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 14:38:17 2008 +1000
sis 0.10.1
diff --git a/configure.ac b/configure.ac
index 071bcda..089c5fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
- 0.10.0,
+ 0.10.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
commit 7ae731c269a13613eed5ee8bef6cb9b6e82b74c6
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Nov 6 23:40:34 2008 +0100
Fix build on alpha.
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 1f03227..5d0f51f 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -7331,11 +7331,12 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
"Unable to map IO dense aperture. %s (%d)\n",
strerror (err), err);
-#endif
+ }
+#endif /* XSERVER_LIBPCIACCESS */
}
pSiS->IOBaseDense = pSiSEnt->IOBaseDense;
- } else
-#endif
+ } else {
+#endif /* SISDUALHEAD */
#ifndef XSERVER_LIBPCIACCESS
pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
@@ -7351,8 +7352,11 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
"Unable to map IO dense aperture. %s (%d)\n",
strerror (err), err);
+ }
+#endif /* XSERVER_LIBPCIACCESS */
+#ifdef SISDUALHEAD
+ }
#endif
-
if(pSiS->IOBaseDense == NULL) {
SISErrorLog(pScrn, "Could not map MMIO dense area\n");
return FALSE;
commit 31509152757643b32f42fe0a21d3b00137540e40
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 20 04:15:52 2008 +0300
Remove XFree86-Misc (PassMessage) support
The driver used PassMessage/HandleMessage from XFree86-Misc to ... just
return BadMatch. So how about we drop this bit of code, including an
additional dependency?
diff --git a/configure.ac b/configure.ac
index 796269a..071bcda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 96fd52d..1f03227 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -57,8 +57,6 @@
#include "mibank.h"
#include "mipointer.h"
#include "mibstore.h"
-#define _XF86MISC_SERVER_
-#include <X11/extensions/xf86misc.h>
#include "edid.h"
#define SIS_NEED_inSISREG
@@ -669,11 +667,7 @@ SISProbe(DriverPtr drv, int flags)
pScrn->LeaveVT = SISLeaveVT;
pScrn->FreeScreen = SISFreeScreen;
pScrn->ValidMode = SISValidMode;
-#ifdef X_XF86MiscPassMessage
- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
- pScrn->HandleMessage = SISHandleMessage;
- }
-#endif
+
foundScreen = TRUE;
}
diff --git a/src/sis_driver.h b/src/sis_driver.h
index 2105ca2..5c90383 100644
--- a/src/sis_driver.h
+++ b/src/sis_driver.h
@@ -1577,10 +1577,6 @@ void SISAdjustFrame(int scrnIndex, int x, int y, int flags);
#ifdef SISDUALHEAD
static Bool SISSaveScreenDH(ScreenPtr pScreen, int mode);
#endif
-#ifdef X_XF86MiscPassMessage
-extern int SISHandleMessage(int scrnIndex, const char *msgtype,
- const char *msgval, char **retmsg);
-#endif
static void SISFreeScreen(int scrnIndex, int flags);
static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags);
diff --git a/src/sis_utility.c b/src/sis_utility.c
index bbc7629..a9bcd2b 100644
--- a/src/sis_utility.c
+++ b/src/sis_utility.c
@@ -38,8 +38,6 @@
#define NEED_EVENTS
#include <X11/X.h>
#include "dixstruct.h"
-#define _XF86MISC_SERVER_
-#include <X11/extensions/xf86misc.h>
#include "sis_videostr.h"
@@ -255,9 +253,6 @@ typedef struct {
int (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *);
} xSiSCtrlScreenTable;
-#ifdef X_XF86MiscPassMessage
-int SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg);
-#endif
void SiSCtrlExtInit(ScrnInfoPtr pScrn);
void SiSCtrlExtUnregister(SISPtr pSiS, int index);
@@ -853,19 +848,6 @@ SISGetMergedModeDetails(ScrnInfoPtr pScrn,
#endif
/***********************************
- * MessageHandler interface *
- * (unused now; use extension) *
- ***********************************/
-
-#ifdef X_XF86MiscPassMessage
-int
-SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg)
-{
- return BadMatch;
-}
-#endif
-
-/***********************************
* SiSCtrl extension interface *
***********************************/
Reply to: