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 <ajax@redhat.com>
Date: Mon Jan 4 14:19:13 2010 -0500
vesa 2.3.0
Signed-off-by: Adam Jackson <ajax@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 <ajax@redhat.com>
Date: Mon Jan 4 14:16:42 2010 -0500
Make the VBESetVBEMode fallback message slightly clearer
Signed-off-by: Adam Jackson <ajax@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 <ajax@redhat.com>
Date: Wed Dec 30 11:48:27 2009 -0500
Remove support for non-shadowfb banked framebuffer
Signed-off-by: Adam Jackson <ajax@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 == 0xa0000) {
- 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 <ajax@redhat.com>
Date: Wed Dec 30 11:27:53 2009 -0500
Use own thunk function instead of shadowUpdatePackedWeak
Signed-off-by: Adam Jackson <ajax@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 == 0xa0000) { /* Windowed */
- pVesa->update = shadowUpdatePackedWeak();
+ pVesa->update = vesaUpdatePacked;
pVesa->window = VESAWindowWindowed;
}
else { /* Linear */
- pVesa->update = shadowUpdatePackedWeak();
+ pVesa->update = vesaUpdatePacked;
pVesa->window = VESAWindowLinear;
}
commit ad1e7b4a4cacc1a157eb533e2a55a54b386949da
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 30 11:24:37 2009 -0500
Warning fix when !HAVE_ISA
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index ecf228d..bfdda65 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -94,7 +94,9 @@ VESADisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode,
int flags);
/* locally used functions */
+#ifdef HAVE_ISA
static int VESAFindIsaDevice(GDevPtr dev);
+#endif
static Bool VESAMapVidMem(ScrnInfoPtr pScrn);
static void VESAUnmapVidMem(ScrnInfoPtr pScrn);
static int VESABankSwitch(ScreenPtr pScreen, unsigned int iBank);
commit 3c73bfc96817348449e5ab6a7f7b03ac6c85bd47
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 30 11:23:16 2009 -0500
Code motion
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index df73152..ecf228d 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -105,10 +105,35 @@ static void RestoreFonts(ScrnInfoPtr pScrn);
static Bool
VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function);
-static void *VESAWindowLinear(ScreenPtr pScrn, CARD32 row, CARD32 offset,
- int mode, CARD32 *size, void *closure);
-static void *VESAWindowWindowed(ScreenPtr pScrn, CARD32 row, CARD32 offset,
- int mode, CARD32 *size, void *closure);
+static void *
+VESAWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
+ CARD32 *size, void *closure)
+{
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ VESAPtr pVesa = VESAGetRec(pScrn);
+
+ *size = pVesa->maxBytesPerScanline;
+ return ((CARD8 *)pVesa->base + row * pVesa->maxBytesPerScanline + offset);
+}
+
+static void *
+VESAWindowWindowed(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
+ CARD32 *size, void *closure)
+{
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ VESAPtr pVesa = VESAGetRec(pScrn);
+ VbeModeInfoBlock *data = ((VbeModeInfoData*)(pScrn->currentMode->Private))->data;
+ int window;
+
+ offset += pVesa->maxBytesPerScanline * row;
+ window = offset / (data->WinGranularity * 1024);
+ pVesa->windowAoffset = window * data->WinGranularity * 1024;
+ VESABankSwitch(pScreen, window);
+ *size = data->WinSize * 1024 - (offset - pVesa->windowAoffset);
+
+ return (void *)((unsigned long)pVesa->base +
+ (offset - pVesa->windowAoffset));
+}
static Bool VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
@@ -1286,36 +1311,6 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
pVesa->base = NULL;
}
-static void *
-VESAWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
- CARD32 *size, void *closure)
-{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- VESAPtr pVesa = VESAGetRec(pScrn);
-
- *size = pVesa->maxBytesPerScanline;
- return ((CARD8 *)pVesa->base + row * pVesa->maxBytesPerScanline + offset);
-}
-
-static void *
-VESAWindowWindowed(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
- CARD32 *size, void *closure)
-{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- VESAPtr pVesa = VESAGetRec(pScrn);
- VbeModeInfoBlock *data = ((VbeModeInfoData*)(pScrn->currentMode->Private))->data;
- int window;
-
- offset += pVesa->maxBytesPerScanline * row;
- window = offset / (data->WinGranularity * 1024);
- pVesa->windowAoffset = window * data->WinGranularity * 1024;
- VESABankSwitch(pScreen, window);
- *size = data->WinSize * 1024 - (offset - pVesa->windowAoffset);
-
- return (void *)((unsigned long)pVesa->base +
- (offset - pVesa->windowAoffset));
-}
-
/* This code works, but is very slow for programs that use it intensively */
static void
VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
commit 2c8da9b4e703678b0f0f16edb1c48a523c8442fd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 21:00:15 2009 -0500
configure.ac: sdkdir usage duplicates the sdk include dir
The sdkdir variable provides a duplicate copy of the include/xorg
directory. The statement is removed as this was it's only used.
In the Makefile, there is now only one instance of the -I sdkdir
The sdkdir is provided in XORG_CFLAGS.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 548810a..fe47a60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,6 @@ 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"
CFLAGS="$XORG_CFLAGS"
@@ -95,7 +94,7 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit 5833d01faac576016ac90a06ccb4af2fac23b718
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 8 17:51:00 2009 -0500
configure.ac: remove -I$(prefix)/include from INCLUDES #24676
Using $prefix for any purpose will yield incorrect results
as not all modules uses the same prefix and that modules can use
different directory which is configurable.
The main include dir comes from XORG_CFLAGS
Reported-By: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9353694..548810a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit 4509305138d04d1e2e670b6d21b54b28b69405ba
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 1 15:25:52 2009 -0500
Don't artificially limit the screen size to 2k
VBE lets you specify sizes in uint16_t. X won't work above 32k though,
so clamp to that instead of the arbitrary 2k.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/vesa.c b/src/vesa.c
index f786766..df73152 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -550,7 +550,7 @@ VESAValidateModes(ScrnInfoPtr pScrn)
mode->status = MODE_OK;
return VBEValidateModes(pScrn, NULL, pScrn->display->modes,
- NULL, NULL, 0, 2048, 1, 0, 2048,
+ NULL, NULL, 0, 32767, 1, 0, 32767,
pScrn->display->virtualX,
pScrn->display->virtualY,
pVesa->mapSize, LOOKUP_BEST_REFRESH);
commit 2fbedf7be67e98170a17118c958568439d1613cc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:06 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 9f8913c..00c154d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
INSTALL:
commit 168971773075042625b6d233192fcc0ed85183d5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 49c1d74..9f8913c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
.PHONY: ChangeLog INSTALL
commit a90aed950a5b23a6533162315e3b111b69079b3d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index ac9caf7..49c1d74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 0a96496..9353694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 82a87ff811214c20a1cd8c41f6e05e472f5e947e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:22 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index fa37d43..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,68 +0,0 @@
-2006-06-03 Daniel Stone <daniel@freedesktop.org>
-
- * configure.ac:
- Bump to 1.2.1.
-
- * src/vesa.c:
- Don't call VBEGetSetDACPaletteFormat when running in direct colour or
- YUV modes. (David Sterratt)
-
-2006-05-19 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/vesa.h:
- Bump to 1.2.0
-
-2006-05-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * src/vesa.c: (VESAScreenInit), (VESACloseScreen):
- * src/vesa.h:
- Fix ShadowFB support to work with recent miext/shadow changes from
- bug #5460.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/vesa.c:
- * src/vesa.h:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..ac9caf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,9 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 1444d07..0a96496 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -101,9 +107,6 @@ AC_HEADER_STDC
DRIVER_NAME=vesa
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile
commit 8e49958aba94062b757a7558e2d0a22cd59771af
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 13:05:24 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit d8fd5dd83ae5b1c8583a8434744180162a822ac8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..fca8616 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,78 @@
-Makefile
-Makefile.in
-*.la
-*.lo
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-stamp-h1
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for xf86-video-vesa
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 13c8350893eb32c34603cbcf8a829db3f22fd1ce
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Oct 5 21:02:28 2009 +0200
Add missing shadowRemove() in VESACloseScreen().
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Acked-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/vesa.c b/src/vesa.c
index 8165472..f786766 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1097,8 +1097,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen)
pVesa->savedPal, FALSE, TRUE);
VESAUnmapVidMem(pScrn);
}
- if (pVesa->shadowFB && pVesa->shadow)
+ if (pVesa->shadowFB && pVesa->shadow) {
+ shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
xfree(pVesa->shadow);
+ }
if (pVesa->pDGAMode) {
xfree(pVesa->pDGAMode);
pVesa->pDGAMode = NULL;
commit b2c938bf08daec061341deec768135846f702f7a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 18 17:08:24 2009 -0400
Remove unused variable.
diff --git a/src/vesa.c b/src/vesa.c
index a0d7c25..8165472 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -873,7 +873,6 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
VisualPtr visual;
VbeModeInfoBlock *mode;
int flags;
- int init_picture = 0;
if ((pVesa->pVbe = VBEExtendedInit(NULL, pVesa->pEnt->index,
SET_BIOS_SCRATCH
@@ -965,7 +964,6 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
pScrn->xDpi, pScrn->yDpi,
pScrn->displayWidth, pScrn->bitsPerPixel))
return (FALSE);
- init_picture = 1;
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -996,8 +994,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
/* must be after RGB ordering fixed */
- if (init_picture)
- fbPictureInit(pScreen, 0, 0);
+ fbPictureInit(pScreen, 0, 0);
if (pVesa->shadowFB) {
if (pVesa->mapPhys == 0xa0000) { /* Windowed */
commit 55f585a15f42ffe028ff37ea1f63543795dbf56e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 18 17:02:16 2009 -0400
Use VBE palette load, not VGA banging.
diff --git a/src/vesa.c b/src/vesa.c
index 6ba4e75..a0d7c25 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1317,16 +1317,13 @@ VESAWindowWindowed(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
(offset - pVesa->windowAoffset));
}
+/* This code works, but is very slow for programs that use it intensively */
static void
VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO *colors, VisualPtr pVisual)
{
VESAPtr pVesa = VESAGetRec(pScrn);
int i, idx;
-
-#if 0
-
- /* This code works, but is very slow for programs that use it intensively */
int base;
if (pVesa->pal == NULL)
@@ -1350,28 +1347,6 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
if (idx - 1 == indices[i - 1])
VBESetGetPaletteData(pVesa->pVbe, TRUE, base, idx - base,
pVesa->pal + base, FALSE, TRUE);
-
-#else
-
-#define VESADACDelay() \
- do { \
- (void)inb(pVesa->ioBase + VGA_IOBASE_COLOR + VGA_IN_STAT_1_OFFSET); \
- (void)inb(pVesa->ioBase + VGA_IOBASE_COLOR + VGA_IN_STAT_1_OFFSET); \
- } while (0)
-
- for (i = 0; i < numColors; i++) {
- idx = indices[i];
- outb(pVesa->ioBase + VGA_DAC_WRITE_ADDR, idx);
- VESADACDelay();
- outb(pVesa->ioBase + VGA_DAC_DATA, colors[idx].red);
- VESADACDelay();
- outb(pVesa->ioBase + VGA_DAC_DATA, colors[idx].green);
- VESADACDelay();
- outb(pVesa->ioBase + VGA_DAC_DATA, colors[idx].blue);
- VESADACDelay();
- }
-
-#endif
}
/*
commit 7bfa6d08d6df4b76ed01ddab1a543ffc8bf08886
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 18 16:40:14 2009 -0400
Fix a comment
diff --git a/src/vesa.c b/src/vesa.c
index ff0601c..6ba4e75 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -33,7 +33,6 @@
/*
* TODO:
- * - PanelID might give us useful size hints.
* - Port to RANDR 1.2 setup to make mode selection slightly better
* - Port to RANDR 1.2 to drop the old-school DGA junk
* - VBE/SCI for secondary DDC method?
Reply to: