xserver-xorg-video-vesa: Changes to 'upstream-unstable'
autogen.sh |4 +++-
configure.ac | 12 ++--
src/vesa.c | 17 ++---
3 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit 3e5d56d94720db7a9b97809f15e2432014d94553
Author: Julien Cristau jcris...@debian.org
Date: Mon Sep 9 21:14:03 2013 +0200
Bump to 2.3.3
Signed-off-by: Julien Cristau jcris...@debian.org
diff --git a/configure.ac b/configure.ac
index b6c0a0e..6ac2333 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vesa],
-[2.3.2],
+[2.3.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vesa])
AC_CONFIG_SRCDIR([Makefile.am])
commit ad0864d4fae1db24d32e95abff8a37d7eebea7ef
Author: Egbert Eich e...@freedesktop.org
Date: Wed May 25 13:35:21 2011 +0200
Make bool option parsing clearer and more consistent
When there's no need to know whether the user has set the value
of a configurable option (for logging for instance) the return
of xf86ReturnOptValBool() can be assigned directly.
Signed-off-by: Egbert Eich e...@freedesktop.org
Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
diff --git a/src/vesa.c b/src/vesa.c
index b73d104..9e3a112 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -838,16 +838,15 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
xf86ProcessOptions(pScrn-scrnIndex, pScrn-options, pVesa-Options);
/* Use shadow by default */
-if (xf86ReturnOptValBool(pVesa-Options, OPTION_SHADOW_FB, TRUE))
- pVesa-shadowFB = TRUE;
+pVesa-shadowFB = xf86ReturnOptValBool(pVesa-Options, OPTION_SHADOW_FB,
+ TRUE);
if (xf86ReturnOptValBool(pVesa-Options, OPTION_DFLT_REFRESH, FALSE))
pVesa-defaultRefresh = TRUE;
-pVesa-ModeSetClearScreen = FALSE;
-if (xf86ReturnOptValBool(pVesa-Options, OPTION_MODESET_CLEAR_SCREEN,
-FALSE))
- pVesa-ModeSetClearScreen = TRUE;
+pVesa-ModeSetClearScreen =
+xf86ReturnOptValBool(pVesa-Options,
+ OPTION_MODESET_CLEAR_SCREEN, FALSE);
if (!pVesa-defaultRefresh !pVesa-strict_validation)
VBESetModeParameters(pScrn, pVesa-pVbe);
commit 29a149544e2120a582043738d5b09dd80e896345
Author: Colin Walters walt...@verbum.org
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode $@
+if test -z $NOCONFIGURE; then
+$srcdir/configure $@
+fi
commit d6042a43b6cedc7bbd7c1cb1b2f7b9df9fce1102
Author: Adam Jackson a...@redhat.com
Date: Wed Jan 16 13:18:23 2013 -0500
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/configure.ac b/configure.ac
index 08e0571..b6c0a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
commit 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc
Author: Adam Jackson a...@redhat.com
Date: Tue Sep 25 08:55:03 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/vesa.c b/src/vesa.c
index 11cd26c..b73d104 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -49,9 +49,6 @@
/* All drivers initialising the SW cursor need this */
#include mipointer.h
-/* All drivers implementing backing store need this */
-#include mibstore.h
-
/* Colormap handling */
#include micmap.h
#include xf86cmap.h
@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
VESADGAInit(pScrn, pScreen);
xf86SetBlackWhitePixels(pScreen);
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* software cursor */
commit 7aafaf56fbca97f36c775462c1ceea3e03700c42
Author: Alexandr Shadchin alexandr.shadc...@gmail.com
Date: Sat Aug 18 20:53:34 2012 +0600
Fix check function in VESASaveRestore
Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/vesa.c b/src/vesa.c
index 8ac77da..11cd26c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction
function)
{
VESAPtr pVesa;
-if (MODE_QUERY 0 || function MODE_RESTORE)
+if (function MODE_QUERY || function MODE_RESTORE)
return (FALSE);
pVesa = VESAGetRec(pScrn);
commit
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
configure.ac |2 -
src/Makefile.am |1
src/compat-api.h | 98 +++
src/vesa.c | 92 ++-
4 files changed, 147 insertions(+), 46 deletions(-)
New commits:
commit 0249d01a2623c4f7769914fc0a7b50657a50560f
Author: Dave Airlie airl...@gmail.com
Date: Wed Jul 18 20:02:49 2012 +1000
vesa: bump to 2.3.2
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index 4288bdd..6317acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vesa],
-[2.3.1],
+[2.3.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vesa])
AC_CONFIG_SRCDIR([Makefile.am])
commit 86f1d894cd3c06a61abbd16e3e73d60db2c98621
Author: Dave Airlie airl...@redhat.com
Date: Fri Jun 1 12:55:19 2012 +0100
vesa: add api 13 compat layer.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/compat-api.h b/src/compat-api.h
index 1bb7724..d4d3882 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -38,4 +38,61 @@
#define xf86ScrnToScreen(s) screenInfo.screens[(s)-scrnIndex]
#endif
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout,
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)-scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)-scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn-scrnIndex, 0
+
+#define SCRN_OR_INDEX_ARG(x) ((x)-scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define SCRN_OR_INDEX_ARG(x) (x)
+
+#endif
+
#endif
diff --git a/src/vesa.c b/src/vesa.c
index ab64060..8ac77da 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -75,17 +75,16 @@ static Bool VESAPciProbe(DriverPtr drv, int entity_num,
struct pci_device *dev, intptr_t match_data);
#endif
static Bool VESAPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool VESAScreenInit(int Index, ScreenPtr pScreen, int argc,
- char **argv);
-static Bool VESAEnterVT(int scrnIndex, int flags);
-static void VESALeaveVT(int scrnIndex, int flags);
-static Bool VESACloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool VESAScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool VESAEnterVT(VT_FUNC_ARGS_DECL);
+static void VESALeaveVT(VT_FUNC_ARGS_DECL);
+static Bool VESACloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool VESASaveScreen(ScreenPtr pScreen, int mode);
-static Bool VESASwitchMode(int scrnIndex, DisplayModePtr pMode, int flags);
+static Bool VESASwitchMode(SWITCH_MODE_ARGS_DECL);
static Bool VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode);
-static void VESAAdjustFrame(int scrnIndex, int x, int y, int flags);
-static void VESAFreeScreen(int scrnIndex, int flags);
+static void VESAAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+static void VESAFreeScreen(FREE_SCREEN_ARGS_DECL);
static void VESAFreeRec(ScrnInfoPtr pScrn);
static VESAPtr VESAGetRec(ScrnInfoPtr pScrn);
@@ -342,11 +341,11 @@ vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr
vbe)
}
static ModeStatus
-VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
+VESAValidMode(SCRN_ARG_TYPE arg, DisplayModePtr p, Bool flag, int pass)
{
+SCRN_INFO_PTR(arg);
static int warned = 0;
int found = 0;
-ScrnInfoPtr pScrn = xf86Screens[scrn];
VESAPtr pVesa = VESAGetRec(pScrn);
MonPtr mon = pScrn-monitor;
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
COPYING |1
configure.ac| 46 +++
man/Makefile.am | 59
man/vesa.man|1
src/Makefile.am |3 +
src/vesa.c | 134 +++-
src/vesa.h |4 -
7 files changed, 131 insertions(+), 117 deletions(-)
New commits:
commit 8cd553551767c0f970912fb73cae3aa733434106
Author: Adam Jackson a...@redhat.com
Date: Thu Mar 22 17:32:22 2012 -0400
vesa 2.3.1
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/configure.ac b/configure.ac
index 5d39bbc..4288bdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vesa],
-[2.3.0],
+[2.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vesa])
AC_CONFIG_SRCDIR([Makefile.am])
commit 4ba7306fd0c9533750d389829e2cbf0522e149b3
Author: Jeremy Huddleston jerem...@apple.com
Date: Wed Oct 19 01:49:38 2011 -0700
configure.ac: Require a newer version of libpciaccess
Signed-off-by: Jeremy Huddleston jerem...@apple.com
diff --git a/configure.ac b/configure.ac
index 2e4f542..5d39bbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CFLAGS=$save_CFLAGS
if test x$XSERVER_LIBPCIACCESS = xyes; then
-PKG_CHECK_MODULES([PCIACCESS], [pciaccess = 0.10])
+PKG_CHECK_MODULES([PCIACCESS], [pciaccess = 0.12.901])
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
commit efe1792818be463dd0367178f0233bc502b7a584
Author: Jeremy Huddleston jerem...@apple.com
Date: Wed Oct 19 01:38:49 2011 -0700
Code style cleanup to make the map and unmap blocks more consistent
Signed-off-by: Jeremy Huddleston jerem...@apple.com
diff --git a/src/vesa.c b/src/vesa.c
index 5a0120c..23d9e14 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1260,27 +1260,28 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
pScrn-fbOffset = pVesa-mapOff;
#ifdef XSERVER_LIBPCIACCESS
-if ((pVesa-mapPhys != 0xa) (pVesa-pciInfo != NULL)) {
- (void) pci_device_map_range(pVesa-pciInfo, pScrn-memPhysBase,
- pVesa-mapSize,
- (PCI_DEV_MAP_FLAG_WRITABLE
-| PCI_DEV_MAP_FLAG_WRITE_COMBINE),
-pVesa-base);
-}
-else
- (void) pci_device_map_legacy(pVesa-pciInfo, pScrn-memPhysBase,
-pVesa-mapSize,
-PCI_DEV_MAP_FLAG_WRITABLE,
- pVesa-base);
-
-if (pVesa-base) {
- if (pVesa-mapPhys != 0xa)
- (void) pci_device_map_legacy(pVesa-pciInfo, 0xa, 0x1,
+if (pVesa-pciInfo != NULL) {
+ if (pVesa-mapPhys != 0xa) {
+ (void) pci_device_map_range(pVesa-pciInfo, pScrn-memPhysBase,
+ pVesa-mapSize,
+ (PCI_DEV_MAP_FLAG_WRITABLE
+| PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+pVesa-base);
+
+ if (pVesa-base)
+ (void) pci_device_map_legacy(pVesa-pciInfo, 0xa, 0x1,
+PCI_DEV_MAP_FLAG_WRITABLE,
+ pVesa-VGAbase);
+ }
+ else {
+ (void) pci_device_map_legacy(pVesa-pciInfo, pScrn-memPhysBase,
+pVesa-mapSize,
PCI_DEV_MAP_FLAG_WRITABLE,
- pVesa-VGAbase);
- else
- pVesa-VGAbase = pVesa-base;
+ pVesa-base);
+ if (pVesa-base)
+ pVesa-VGAbase = pVesa-base;
+ }
}
#else
if (pVesa-mapPhys != 0xa pVesa-pEnt-location.type == BUS_PCI)
commit 1f84310ddf49778f776a39810aa98211c812e8ab
Author: Jeremy Huddleston jerem...@apple.com
Date: Wed Oct 19 01:33:07 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 jerem...@apple.com
diff --git a/src/vesa.c b/src/vesa.c
index 1136ac3..5a0120c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
pVesa-base);
}
else
- pVesa-base = xf86MapDomainMemory(pScrn-scrnIndex, 0, pVesa-pciInfo,
- pScrn-memPhysBase, pVesa-mapSize);
+ (void) pci_device_map_legacy(pVesa-pciInfo, pScrn-memPhysBase,
+
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
.gitignore | 70 ++---
ChangeLog | 68
Makefile.am| 11
configure.ac | 16 +++---
man/.gitignore |2
src/.gitignore |6 --
src/vesa.c | 136 -
src/vesa.h |6 --
8 files changed, 132 insertions(+), 183 deletions(-)
New commits:
commit ba6527d2695574f6f7808ada39f6caed7a688f39
Author: Adam Jackson a...@redhat.com
Date: Mon Jan 4 14:19:13 2010 -0500
vesa 2.3.0
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/configure.ac b/configure.ac
index fe47a60..ff4713d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vesa],
-2.2.1,
+2.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vesa)
commit 1d0e73302d4c4eda56f32e129920ccd263f524ce
Author: Adam Jackson a...@redhat.com
Date: Mon Jan 4 14:16:42 2010 -0500
Make the VBESetVBEMode fallback message slightly clearer
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/vesa.c b/src/vesa.c
index 76a85eb..034a019 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1179,14 +1179,13 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
/* Some cards do not like setting the clock.
* Free it as it will not be any longer useful
*/
- xf86ErrorF(...Tried again without customized values.\n);
+ xf86ErrorF(, mode set without customized refresh.\n);
xfree(data-block);
data-block = NULL;
data-mode = ~(1 11);
}
else {
ErrorF(\n);
- xf86DrvMsg(pScrn-scrnIndex, X_ERROR, Set VBE Mode failed!\n);
return (FALSE);
}
}
commit 4b625d15b2bb3dc337924f0703db7ddd47c08434
Author: Adam Jackson a...@redhat.com
Date: Wed Dec 30 11:48:27 2009 -0500
Remove support for non-shadowfb banked framebuffer
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/vesa.c b/src/vesa.c
index 3b4423c..76a85eb 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1045,22 +1045,9 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
pScreen-CreateScreenResources = vesaCreateScreenResources;
}
else if (pVesa-mapPhys == 0xa) {
- unsigned int bankShift = 0;
- while ((unsigned)(64 bankShift) != mode-WinGranularity)
- bankShift++;
- pVesa-curBank = -1;
- pVesa-bank.SetSourceBank =
- pVesa-bank.SetDestinationBank =
- pVesa-bank.SetSourceAndDestinationBanks = VESABankSwitch;
- pVesa-bank.pBankA = pVesa-bank.pBankB = pVesa-base;
- pVesa-bank.BankSize = (mode-WinSize * 1024) bankShift;
- pVesa-bank.nBankDepth = pScrn-depth;
- if (!miInitializeBanking(pScreen, pScrn-virtualX, pScrn-virtualY,
-pScrn-virtualX, pVesa-bank)) {
- xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
- Bank switch initialization failed!\n);
- return (FALSE);
- }
+xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
+ Banked framebuffer requires ShadowFB\n);
+return FALSE;
}
VESADGAInit(pScrn, pScreen);
diff --git a/src/vesa.h b/src/vesa.h
index d5c69a9..4656e4c 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -64,14 +64,9 @@
/* Int 10 support */
#include xf86int10.h
-/* bank switching */
-#include mibank.h
-
/* Dga definitions */
#include dgaproc.h
-
-
#include fb.h
#ifdef XSERVER_LIBPCIACCESS
@@ -99,7 +94,6 @@ typedef struct _VESARec
pciVideoPtr pciInfo;
PCITAG pciTag;
#endif
-miBankInfoRec bank;
int curBank, bankSwitchWindowB;
CARD16 maxBytesPerScanline;
unsigned long mapPhys, mapOff, mapSize;/* video memory */
commit 1a31829b966ceed444a3b3f7e91c5ae04d82c3ba
Author: Adam Jackson a...@redhat.com
Date: Wed Dec 30 11:27:53 2009 -0500
Use own thunk function instead of shadowUpdatePackedWeak
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/vesa.c b/src/vesa.c
index bfdda65..3b4423c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -137,6 +137,12 @@ VESAWindowWindowed(ScreenPtr pScreen, CARD32 row, CARD32
offset, int mode,
(offset - pVesa-windowAoffset));
}
+static void
+vesaUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
enum GenericTypes
@@ -1025,11 +1031,11 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
if (pVesa-shadowFB) {
if (pVesa-mapPhys == 0xa) {/* Windowed */
- pVesa-update = shadowUpdatePackedWeak();
+ pVesa-update = vesaUpdatePacked;
pVesa-window = VESAWindowWindowed;
}
else { /* Linear */
- pVesa-update = shadowUpdatePackedWeak();
+
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
configure.ac | 14 +-
src/vesa.c | 12
src/vesa.h |7 +--
3 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit fdf653a99f53306efcd48658caf657af48ea916d
Author: Dave Airlie airl...@redhat.com
Date: Thu Jul 30 12:04:30 2009 +1000
vesa: bump for release 2.2.1
diff --git a/configure.ac b/configure.ac
index d63939a..1444d07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vesa],
-2.2.0,
+2.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vesa)
commit 869a9c8058c16734af5c8771a0c32df0be7bba36
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 15:22:42 2009 +1000
vesa: change to using ABI version check
diff --git a/src/vesa.h b/src/vesa.h
index 11933f4..d5c69a9 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -36,7 +36,7 @@
#include xf86.h
#include xf86_OSproc.h
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
#include xf86Resources.h
#include xf86RAC.h
#endif
commit aad538f06852e5bf011597a574785d525ed1b0c4
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 13:32:40 2009 +1000
vesa: update for resources/RAC API removal
diff --git a/src/vesa.h b/src/vesa.h
index 1b8f4e5..11933f4 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -35,7 +35,11 @@
/* All drivers should typically include these */
#include xf86.h
#include xf86_OSproc.h
+
+#ifndef XSERVER_LIBPCIACCESS
#include xf86Resources.h
+#include xf86RAC.h
+#endif
/* All drivers need this */
@@ -66,8 +70,7 @@
/* Dga definitions */
#include dgaproc.h
-#include xf86Resources.h
-#include xf86RAC.h
+
#include fb.h
commit 49f6a2f902473692f6541ee32e018b64d74e7ece
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Jul 16 11:58:39 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.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 674e985..d63939a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,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)
save_CFLAGS=$CFLAGS
diff --git a/src/vesa.c b/src/vesa.c
index 377736b..ff0601c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -59,8 +59,13 @@
#include xf86Modes.h
/* DPMS */
+#ifdef HAVE_XEXTPROTO_71
+#include X11/extensions/dpmsconst.h
+#else
#define DPMS_SERVER
#include X11/extensions/dpms.h
+#endif
+
/* Mandatory functions */
static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid);
commit 69b3eb4f8a9b93f1b2a73e395d4d7c29c6c18b41
Author: Adam Jackson a...@redhat.com
Date: Thu Feb 26 14:33:52 2009 -0500
Attempt VBE PanelID if DDC fails
diff --git a/configure.ac b/configure.ac
index 090be35..674e985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,14 @@ CFLAGS=$save_CFLAGS
save_CFLAGS=$CFLAGS
CFLAGS=$XORG_CFLAGS
+AC_CHECK_DECL(VBEReadPanelID,
+ [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])],
+ [],
+ [#include vbe.h])
+CFLAGS=$save_CFLAGS
+
+save_CFLAGS=$CFLAGS
+CFLAGS=$XORG_CFLAGS
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
[#include xorg-server.h])
diff --git a/src/vesa.c b/src/vesa.c
index aee5018..377736b 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -671,6 +671,13 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
if ((pScrn-monitor-DDC = pVesa-monitor) != NULL)
xf86SetDDCproperties(pScrn, pVesa-monitor);
+#ifdef HAVE_PANELID
+else {
+ void *panelid = VBEReadPanelID(pVesa-pVbe);
+ VBEInterpretPanelID(pScrn-scrnIndex, panelid);
+ xfree(panelid);
+}
+#endif
xf86DrvMsgVerb(pScrn-scrnIndex, X_INFO, DEBUG_VERB,
Searching for matching VESA mode(s):\n);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
README | 20
configure.ac | 10 +++-
man/vesa.man |2
src/vesa.c | 141 +--
src/vesa.h |6 +-
5 files changed, 95 insertions(+), 84 deletions(-)
New commits:
commit 68ca3d10ab33ee2347928b0340198aff4f620144
Author: Adam Jackson a...@redhat.com
Date: Tue Feb 17 18:04:29 2009 -0500
vesa 2.2.0
diff --git a/configure.ac b/configure.ac
index 62e710f..090be35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vesa],
-2.1.0,
+2.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vesa)
commit 817fb65fc3a95d6c34952f241c92ba2d3760968e
Author: Adam Jackson a...@redhat.com
Date: Thu Feb 5 16:09:32 2009 -0500
Add yet another pass to mode validation.
Now it's: exact intersection, range based, optimistic range based. The
final pass tries to stretch out the bottom of the sync ranges to fit
down to 640x480. We'll skip the last pass if the sync range is already
that optimistic though.
diff --git a/src/vesa.c b/src/vesa.c
index 2e1b2f7..aee5018 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -536,6 +536,22 @@ VESAFreeRec(ScrnInfoPtr pScrn)
pScrn-driverPrivate = NULL;
}
+static int
+VESAValidateModes(ScrnInfoPtr pScrn)
+{
+VESAPtr pVesa = VESAGetRec(pScrn);
+DisplayModePtr mode;
+
+for (mode = pScrn-monitor-Modes; mode; mode = mode-next)
+ mode-status = MODE_OK;
+
+return VBEValidateModes(pScrn, NULL, pScrn-display-modes,
+ NULL, NULL, 0, 2048, 1, 0, 2048,
+ pScrn-display-virtualX,
+ pScrn-display-virtualY,
+ pVesa-mapSize, LOOKUP_BEST_REFRESH);
+}
+
/*
* This function is called once for each screen at the start of the first
* server generation to initialise the screen for all server generations.
@@ -682,27 +698,37 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
VBESetModeNames(pScrn-modePool);
pVesa-strict_validation = TRUE;
-i = VBEValidateModes(pScrn, NULL, pScrn-display-modes,
- NULL, NULL, 0, 2048, 1, 0, 2048,
- pScrn-display-virtualX,
- pScrn-display-virtualY,
- pVesa-mapSize, LOOKUP_BEST_REFRESH);
+i = VESAValidateModes(pScrn);
if (i = 0) {
- DisplayModePtr mode;
xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
- No valid modes left. Trying less strict filter...\n);
- for (mode = pScrn-monitor-Modes; mode; mode = mode-next)
- mode-status = MODE_OK;
+ No valid modes left. Trying less strict filter...\n);
pVesa-strict_validation = FALSE;
- i = VBEValidateModes(pScrn, NULL, pScrn-display-modes,
- NULL, NULL, 0, 2048, 1, 0, 2048,
- pScrn-display-virtualX,
- pScrn-display-virtualY,
- pVesa-mapSize, LOOKUP_BEST_REFRESH);
+ i = VESAValidateModes(pScrn);
}
+if (i = 0) do {
+ Bool changed = FALSE;
+ /* maybe there's more modes at the bottom... */
+ if (pScrn-monitor-vrefresh[0].lo 50) {
+ changed = TRUE;
+ pScrn-monitor-vrefresh[0].lo = 50;
+ }
+ if (pScrn-monitor-hsync[0].lo 31.5) {
+ changed = TRUE;
+ pScrn-monitor-hsync[0].lo = 31.5;
+ }
+
+ if (!changed)
+ break;
+
+ xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
+ No valid modes left. Trying aggressive sync range...\n);
+ i = VESAValidateModes(pScrn);
+} while (0);
+
if (i = 0) {
+ /* alright, i'm out of ideas */
xf86DrvMsg(pScrn-scrnIndex, X_ERROR, No valid modes\n);
vbeFree(pVesa-pVbe);
return (FALSE);
commit 5522f06c2305d52b12d6934133f46f7b7927ebf7
Author: Alan Coopersmith alan.coopersm...@sun.com
Date: Fri Jan 30 21:06:38 2009 -0800
Add README with pointers to mailing list, bugzilla git repos
diff --git a/README b/README
new file mode 100644
index 000..03f7dc1
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-vesa - Generic VESA video driver for the Xorg X server
+
+Please submit bugs patches to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+git://anongit.freedesktop.org/git/xorg/driver/xf86-video-vesa
+
+http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa
+
+For more information on the git code manager, see:
+
+http://wiki.x.org/wiki/GitPage
commit 566270b780a3f68b02d39f913372dc558ac931f2
Author: Alan Coopersmith alan.coopersm...@sun.com
Date: Fri Jan 9 16:38:18 2009 -0800
Remove
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
.cvsignore | 19 --
.gitignore | 20 ++
COPYING | 30 ++-
configure.ac| 20 +-
man/.cvsignore |2
man/.gitignore |2
man/Makefile.am |1
src/.cvsignore |6
src/.gitignore |6
src/vesa.c | 486 +---
src/vesa.h | 17 -
11 files changed, 290 insertions(+), 319 deletions(-)
New commits:
commit 3631892e0c53568b9f6b0c4aeacd2354305376e6
Author: Adam Jackson [EMAIL PROTECTED]
Date: Tue Jul 1 13:41:07 2008 -0400
vesa 2.0.0
diff --git a/configure.ac b/configure.ac
index 84d19b0..027a5cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vesa],
-1.99.1,
+2.0.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vesa)
commit eb4216dbb392a78d15cde8232d4d951ad876518e
Author: Adam Jackson [EMAIL PROTECTED]
Date: Tue Jul 1 13:40:16 2008 -0400
Un-duplicate some init code.
diff --git a/src/vesa.c b/src/vesa.c
index fbaad21..f0f2522 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -352,6 +352,23 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int
pass)
return ret;
}
+static void
+VESAInitScrn(ScrnInfoPtr pScrn)
+{
+pScrn-driverVersion = VESA_VERSION;
+pScrn-driverName= VESA_DRIVER_NAME;
+pScrn-name = VESA_NAME;
+pScrn-Probe= VESAProbe;
+pScrn-PreInit = VESAPreInit;
+pScrn-ScreenInit= VESAScreenInit;
+pScrn-SwitchMode= VESASwitchMode;
+pScrn-ValidMode = VESAValidMode;
+pScrn-AdjustFrame = VESAAdjustFrame;
+pScrn-EnterVT = VESAEnterVT;
+pScrn-LeaveVT = VESALeaveVT;
+pScrn-FreeScreen= VESAFreeScreen;
+}
+
/*
* This function is called once, at the start of the first server generation to
* do a minimal probe for supported hardware.
@@ -369,22 +386,10 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct
pci_device *dev,
if (pScrn != NULL) {
VESAPtr pVesa = VESAGetRec(pScrn);
- pScrn-driverVersion = VESA_VERSION;
- pScrn-driverName= VESA_DRIVER_NAME;
- pScrn-name = VESA_NAME;
- pScrn-Probe = VESAProbe;
- pScrn-PreInit = VESAPreInit;
- pScrn-ScreenInit= VESAScreenInit;
- pScrn-SwitchMode= VESASwitchMode;
- pScrn-ValidMode = VESAValidMode;
- pScrn-AdjustFrame = VESAAdjustFrame;
- pScrn-EnterVT = VESAEnterVT;
- pScrn-LeaveVT = VESALeaveVT;
- pScrn-FreeScreen= VESAFreeScreen;
-
+ VESAInitScrn(pScrn);
pVesa-pciInfo = dev;
}
-
+
return (pScrn != NULL);
}
#endif
@@ -423,18 +428,7 @@ VESAProbe(DriverPtr drv, int flags)
if ((pScrn = xf86ConfigPciEntity(pScrn,0,usedChips[i],
VESAPCIchipsets,NULL,
NULL,NULL,NULL,NULL))) {
- pScrn-driverVersion = VESA_VERSION;
- pScrn-driverName= VESA_DRIVER_NAME;
- pScrn-name = VESA_NAME;
- pScrn-Probe = VESAProbe;
- pScrn-PreInit = VESAPreInit;
- pScrn-ScreenInit= VESAScreenInit;
- pScrn-SwitchMode= VESASwitchMode;
- pScrn-ValidMode = VESAValidMode;
- pScrn-AdjustFrame = VESAAdjustFrame;
- pScrn-EnterVT = VESAEnterVT;
- pScrn-LeaveVT = VESALeaveVT;
- pScrn-FreeScreen= VESAFreeScreen;
+ VESAInitScrn(pScrn);
foundScreen = TRUE;
}
}
@@ -457,19 +451,7 @@ VESAProbe(DriverPtr drv, int flags)
if ((pScrn = xf86ConfigIsaEntity(pScrn, 0,usedChips[i],
VESAISAchipsets, NULL,
NULL, NULL, NULL, NULL))) {
-
- pScrn-driverVersion = VESA_VERSION;
- pScrn-driverName= VESA_DRIVER_NAME;
- pScrn-name = VESA_NAME;
- pScrn-Probe = VESAProbe;
- pScrn-PreInit = VESAPreInit;
- pScrn-ScreenInit= VESAScreenInit;
- pScrn-SwitchMode= VESASwitchMode;
- pScrn-ValidMode = VESAValidMode;
- pScrn-AdjustFrame = VESAAdjustFrame;
- pScrn-EnterVT = VESAEnterVT;
- pScrn-LeaveVT = VESALeaveVT;
- pScrn-FreeScreen= VESAFreeScreen;
+ VESAInitScrn(pScrn);
foundScreen = TRUE;
}
}
commit 8ec1f02475bc4267050239c6840fa6738b0caefb
Author: Adam Jackson [EMAIL PROTECTED]
Date: Tue Jul 1 13:23:31 2008
xserver-xorg-video-vesa: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 9bbe1c49b9d22736eded05909e144cc6e03050b4 Author: Ian Romanick [EMAIL PROTECTED] Date: Mon Jan 15 17:31:18 2007 -0800 Correct '#ifdef' to '#ifndef'. Oops. commit 824ccaab986e1c2be6229350731b43f8831ebef7 Author: Ian Romanick [EMAIL PROTECTED] Date: Mon Jan 15 13:16:52 2007 -0800 Add conditional support for pci-rework branch. To build VESA driver for use with pci-rework Xserver, add --enable-pciacces to the configure command line. Otherwise, the traditional VESA driver will be built. commit 7f4f198b21bc1df254912adb9592339b21d121f5 Author: Adam Jackson [EMAIL PROTECTED] Date: Thu Nov 30 16:04:26 2006 -0500 Bump to 1.3.0 commit 730e7749fe6921e76a4a1738e0e2a0b16376 Author: Adam Jackson [EMAIL PROTECTED] Date: Thu Nov 30 16:03:35 2006 -0500 Fix shadow support yet again. commit 7664016db9869d57d4279a9cb32a6ae0086c5b28 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Oct 13 18:48:08 2006 -0400 Bump to 1.2.2 commit 3b07dd7f43be7c1263f80eb279605a89c860dc4b Author: Daniel Stone [EMAIL PROTECTED] Date: Sat Jun 3 09:46:27 2006 + Don't call VBEGetSetDACPaletteFormat when running in direct colour or YUV modes. (David Sterratt) Bump to 1.2.1. commit a7315a314fa647a427805dc51f29558f6c607faa Author: Adam Jackson [EMAIL PROTECTED] Date: Fri May 19 19:10:12 2006 + Bump to 1.2.0 commit 2f586dac58dfa30246c7d404a3b08f6e287e5975 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu May 18 21:14:44 2006 + Fix ShadowFB support to work with recent miext/shadow changes from bug #5460. commit 4129d5a0c0648afcf36b004e7f7b5b2de9b7ac27 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 21:47:15 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. commit fba272fcbedd2c03760646f587144ab4c111c7df Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:30:04 2005 + Update package version for X11R7 release. commit 1bfb30439eccfa39a021cf84b630fe8b2a51bf3c Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:56 2005 + Stub COPYING files commit 6eae0ead000939ee39967e580d9d356fa00bc236 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Dec 19 09:07:51 2005 + Typo fixes, mailing list url updates, and other changes to prepare for X11R6.9 7.0 releases. commit 14a6c4cb9adde5f5f6009bd4eb30f6649eeea540 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:21 2005 + Update package version number for final X11R7 release candidate. commit a7f95952dcc8319051118db938d0341bf5479a6e Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Dec 6 22:48:40 2005 + Change *man_SOURCES == *man_PRE to fix autotools warnings. commit 7ddc236e517ddae2660523a63c3d060029121e3d Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:36 2005 + Update package version number for X11R7 RC3 release. commit 45d73281a9efe09292eab995c9796eb613edd6d1 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:11 2005 + Remove extraneous AC_MSG_RESULT. commit ea8c88acd1cc1962cf8360144d4ea1c4b222ba17 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:30:06 2005 + Only build dlloader modules by default. commit 62a4b6d0ec9b2ace7660cefd7d4aef6162c0d54d Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Nov 28 22:04:14 2005 + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) commit 415fa60ef3a042851e93de5842312a8a695131b8 Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:22 2005 + Add .cvsignores for drivers. commit 10f025468598dafe646013cddafc43d90f6cbf0c Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:31:21 2005 + Bump version numbers for X11R6.9/X11R7 RC2. commit e559685ed6f0e5ab2d947ea02dea11129623a37d Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:22 2005 + Update package version number for X11R7 RC2 release. commit 0eb288746f85c73e7ae21838dfc52f177b963b29 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:57 2005 + Update pkgcheck depedencies to work with separate build roots. commit 4e79cb7dd2d91af9777f4bea952c962c4e6c3a24 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Wed Oct 26 21:36:25 2005 + Don't try to restore savedPal in CloseScreen if savedPal is NULL, to avoid segfault. commit 1ec47d75f37e1ab13145981524fc0c5bd6caae97 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:06 2005 + Update package version number for RC1 release. commit 12cd0de9c963f61347ffde4513d5ed7deced79cc Author: Alan Coopersmith [EMAIL PROTECTED] Date: Tue Oct 18 00:01:55 2005 + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro substitutions to work better
