xserver-xorg-video-savage: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/savage_dri.c | 3 ---
src/savage_driver.c | 11 +++++++++--
src/savage_driver.h | 1 +
4 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit f8f24e6856e2627f6620a8fd0474366d057496d2
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:08:50 2015 +0200
Bump to 2.3.8
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index a34e624..7fe8293 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-savage],
- [2.3.7],
+ [2.3.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-savage])
AC_CONFIG_SRCDIR([Makefile.am])
commit 1b58f8ab061f52d8aab9758b4dfa7e48e76b847a
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:07:42 2015 +0200
Fix compiler warnings with recent X servers
savage_driver.c:1228:12: warning: assignment discards 'const' qualifier from pointer target type
if ((s = xf86GetOptValString(psav->Options, OPTION_ROTATE))) {
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/savage_driver.c b/src/savage_driver.c
index e82794f..d278345 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1082,7 +1082,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
MessageType from = X_DEFAULT;
int i;
ClockRangePtr clockRanges;
- char *s = NULL;
+ const char *s = NULL;
unsigned char config1, m, n, n1, n2, sr8, cr66 = 0, tmp;
int mclk;
vgaHWPtr hwp;
commit d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 29 09:15:26 2014 -0400
dri: Stop (uselessly) initializing the ValidateTree hooks
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/savage_dri.c b/src/savage_dri.c
index bdb78e4..0842821 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
- pDRIInfo->wrap.ValidateTree = NULL;
- pDRIInfo->wrap.PostValidateTree = NULL;
-
pDRIInfo->createDummyCtx = TRUE;
pDRIInfo->createDummyCtxPriv = FALSE;
commit 16a672d1ba183601d513c4cdca32b47e926a6d1e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:11:46 2014 -0400
Use own thunk function instead of vgaHW*Weak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/savage_driver.c b/src/savage_driver.c
index bca2c60..e82794f 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
return ((unsigned int) (tmp & 0x08));
}
+static void
+SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
static Bool
SavageDDC1(ScrnInfoPtr pScrn)
{
@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
InI2CREG(byte,psav->I2CPort);
OutI2CREG(byte | 0x12,psav->I2CPort);
- pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
+ pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
+ SavageDDC1Read);
if (!pMon)
return FALSE;
commit 2e9217bb88b76cebfcd2b65b76c8733f80da77ea
Author: Jeremy White <jwhite@codeweavers.com>
Date: Thu Mar 21 10:59:13 2013 -0500
Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
diff --git a/src/savage_driver.h b/src/savage_driver.h
index ec4b1ea..de042af 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -54,6 +54,7 @@
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
+#include "xf86Modes.h"
#include "xf86Pci.h"
#include "xf86_OSproc.h"
#include "xf86Cursor.h"
Reply to: