xserver-xorg-video-vmware: Changes to 'debian-experimental'
ChangeLog | 280 ++++++++++++++++++++++
configure.ac | 6
debian/README.source | 24 -
debian/changelog | 38 ++
debian/compat | 2
debian/control | 23 -
debian/patches/series | 1
debian/rules | 108 +-------
debian/watch | 1
debian/xsfbs/repack.sh | 32 --
debian/xsfbs/xsfbs.mk | 285 ----------------------
debian/xsfbs/xsfbs.sh | 622 -------------------------------------------------
src/vmware.c | 80 ++++--
src/vmware.h | 14 -
src/vmwarectrl.c | 81 ++----
src/vmwaremodes.c | 152 +++++++----
src/vmwaremodule.c | 7
src/vmwarevideo.c | 50 ++-
src/vmwarexinerama.c | 106 +++++---
19 files changed, 657 insertions(+), 1255 deletions(-)
New commits:
commit e02a56593e1a36558d358b1777ff2882e594e633
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 11 15:58:00 2012 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 6b2fda3..40227b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-vmware (1:11.1.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:11.1.0-1) experimental; urgency=low
* New upstream release.
* Build against Xserver 1.12 RC1.
- -- Cyril Brulebois <kibi@debian.org> Wed, 11 Jan 2012 15:55:29 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 11 Jan 2012 15:57:53 +0100
xserver-xorg-video-vmware (1:11.0.99.901-1) unstable; urgency=low
commit 5221c5603ed762192329d3dbaf45d01443a8cf8f
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 11 15:57:47 2012 +0100
Build against Xserver 1.12 RC1.
diff --git a/debian/changelog b/debian/changelog
index a95df49..6b2fda3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-vmware (1:11.1.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Build against Xserver 1.12 RC1.
-- Cyril Brulebois <kibi@debian.org> Wed, 11 Jan 2012 15:55:29 +0100
diff --git a/debian/control b/debian/control
index 430948e..8cbff77 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.11.99.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
commit 51386966d68aa1dc18b978579a6c9c49a05545ed
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 11 15:55:45 2012 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 5ded524..a9325ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+commit 5d7242154c392b2df57476c01f5f0a7a9bce3d8b
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Jan 11 13:15:59 2012 +0100
+
+ Bump package version to 11.1.0 for release
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit abf9cb75630cb27bb4741d194cb23014fe3d09b1
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Nov 17 16:38:22 2011 +0100
+
+ vmwlegacy: Fix up Xinerama / panoramiX replies.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+
+commit be23efbc91f47a6a34fbe24f167ee29fdf58f541
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Nov 16 10:23:10 2011 +0100
+
+ vmwlegacy: Fix device fifo communication
+
+ This fixes two issues with the device fifo communication:
+ 1) Idle the fifo before initializing it. If the fifo is already up and
+ processing data due to an uncleanly shut down server, and init could
+ otherwise confuse the device.
+
+ 2) Mark fifo memory volatile when writing to it and make sure commands
+ are written before telling the device they are available.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+
+commit 4c08c2600936efeedb1a33436876ba82a11218e7
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 7 13:15:11 2011 -0700
+
+ Build fix for ABI version 12
+
+ This results in the vmware driver assuming there is only one PCI domain,
+ which I think is true for everywhere this is expected to run anyway.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 208ccbc7179b40a570a5943e325dd22740a67577
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 7 13:10:59 2011 -0700
+
+ Fix build failures resulting from changes to the swaps and swapl macros in recent xorg-server
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
commit de70a1d0cb79dad9e52baa43306264db80a163da
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Oct 5 13:33:17 2011 +0200
diff --git a/debian/changelog b/debian/changelog
index 8a3cca9..a95df49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:11.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 11 Jan 2012 15:55:29 +0100
+
xserver-xorg-video-vmware (1:11.0.99.901-1) unstable; urgency=low
* New upstream release candidate.
commit 5d7242154c392b2df57476c01f5f0a7a9bce3d8b
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Jan 11 13:15:59 2012 +0100
Bump package version to 11.1.0 for release
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/configure.ac b/configure.ac
index 74fd1b9..f90e8b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [11.0.99.901],
+ [11.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit abf9cb75630cb27bb4741d194cb23014fe3d09b1
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu Nov 17 16:38:22 2011 +0100
vmwlegacy: Fix up Xinerama / panoramiX replies.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c
index 49df3f2..954abdc 100644
--- a/src/vmwarexinerama.c
+++ b/src/vmwarexinerama.c
@@ -153,9 +153,11 @@ VMwareXineramaGetState(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.state = pVMWARE->xinerama;
+ rep.window = stuff->window;
if(client->swapped) {
_swaps (&rep.sequenceNumber, n);
_swapl (&rep.length, n);
+ _swapl (&rep.window, n);
}
WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
return client->noClientException;
@@ -206,9 +208,12 @@ VMwareXineramaGetScreenCount(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.ScreenCount = pVMWARE->xineramaNumOutputs;
+ rep.window = stuff->window;
+
if(client->swapped) {
_swaps(&rep.sequenceNumber, n);
_swapl(&rep.length, n);
+ _swapl(&rep.window, n);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
return client->noClientException;
@@ -244,6 +249,7 @@ VMwareXineramaGetScreenSize(ClientPtr client)
VMWAREPtr pVMWARE;
int rc;
+
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success)
@@ -260,11 +266,15 @@ VMwareXineramaGetScreenSize(ClientPtr client)
rep.sequenceNumber = client->sequence;
rep.width = pVMWARE->xineramaState[stuff->screen].width;
rep.height = pVMWARE->xineramaState[stuff->screen].height;
+ rep.window = stuff->window;
+ rep.screen = stuff->screen;
if(client->swapped) {
_swaps(&rep.sequenceNumber, n);
_swapl(&rep.length, n);
_swapl(&rep.width, n);
_swapl(&rep.height, n);
+ _swapl(&rep.window, n);
+ _swapl(&rep.screen, n);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
return client->noClientException;
commit be23efbc91f47a6a34fbe24f167ee29fdf58f541
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 16 10:23:10 2011 +0100
vmwlegacy: Fix device fifo communication
This fixes two issues with the device fifo communication:
1) Idle the fifo before initializing it. If the fifo is already up and
processing data due to an uncleanly shut down server, and init could
otherwise confuse the device.
2) Mark fifo memory volatile when writing to it and make sure commands
are written before telling the device they are available.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
diff --git a/src/vmware.c b/src/vmware.c
index 55bde22..fa01dca 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -299,7 +299,7 @@ vmwareWriteReg(VMWAREPtr pVMWARE, int index, CARD32 value)
void
vmwareWriteWordToFIFO(VMWAREPtr pVMWARE, CARD32 value)
{
- CARD32* vmwareFIFO = pVMWARE->vmwareFIFO;
+ volatile CARD32* vmwareFIFO = pVMWARE->vmwareFIFO;
/* Need to sync? */
if ((vmwareFIFO[SVGA_FIFO_NEXT_CMD] + sizeof(CARD32) == vmwareFIFO[SVGA_FIFO_STOP])
@@ -310,6 +310,9 @@ vmwareWriteWordToFIFO(VMWAREPtr pVMWARE, CARD32 value)
}
vmwareFIFO[vmwareFIFO[SVGA_FIFO_NEXT_CMD] / sizeof(CARD32)] = value;
+
+ write_mem_barrier();
+
if(vmwareFIFO[SVGA_FIFO_NEXT_CMD] == vmwareFIFO[SVGA_FIFO_MAX] -
sizeof(CARD32)) {
vmwareFIFO[SVGA_FIFO_NEXT_CMD] = vmwareFIFO[SVGA_FIFO_MIN];
@@ -1342,7 +1345,7 @@ VMWAREInitFIFO(ScrnInfoPtr pScrn)
int err;
void *mmioVirtBase;
#endif
- CARD32* vmwareFIFO;
+ volatile CARD32* vmwareFIFO;
Bool extendedFifo;
int min;
@@ -1373,6 +1376,9 @@ VMWAREInitFIFO(ScrnInfoPtr pScrn)
extendedFifo = pVMWARE->vmwareCapability & SVGA_CAP_EXTENDED_FIFO;
min = extendedFifo ? vmwareReadReg(pVMWARE, SVGA_REG_MEM_REGS) : 4;
+ vmwareWaitForFB(pVMWARE);
+ vmwareWriteReg(pVMWARE, SVGA_REG_CONFIG_DONE, 0);
+
vmwareFIFO[SVGA_FIFO_MIN] = min * sizeof(CARD32);
vmwareFIFO[SVGA_FIFO_MAX] = pVMWARE->mmioSize;
vmwareFIFO[SVGA_FIFO_NEXT_CMD] = min * sizeof(CARD32);
commit bd0fa01e7b27e37f1ed1af50f1a2b6ef72e81634
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 3 01:09:29 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 1900dc4..8a3cca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-vmware (1:11.0.99.901-1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:11.0.99.901-1) unstable; urgency=low
* New upstream release candidate.
* It's probably not bug-free, but that's what release candidates and
unstable users are for. ;-)
- -- Cyril Brulebois <kibi@debian.org> Thu, 03 Nov 2011 01:01:21 +0100
+ -- Cyril Brulebois <kibi@debian.org> Thu, 03 Nov 2011 01:09:25 +0100
xserver-xorg-video-vmware (1:11.0.3-3) unstable; urgency=high
commit 8da17585deef022f26154d0454464db5355fc29d
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 3 01:08:31 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3e9b3d4..5ded524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,230 @@
+commit de70a1d0cb79dad9e52baa43306264db80a163da
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Oct 5 13:33:17 2011 +0200
+
+ xf86-video-vmware 11.0.99.901
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 26845eb54a15d43f09288a87c5f74beac8fb6ec7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Sep 27 19:31:22 2011 -0700
+
+ Use dixLookupWindow instead of LookupWindow on Xorg 1.5 & later
+
+ The LookupWindow function was deprecated in xserver commit ed75b056511ccb4
+ and removed during the Xorg 1.11 merge window by commit 82a8677d9175732.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit b5438423ad29338429321cd29118a66b715cdcac
+Author: Matt Turner <mattst88@gmail.com>
+Date: Sun Sep 25 14:06:47 2011 -0400
+
+ Fix wrong-sized swaps
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 4ae8aac35b7209576eaeb64347470d3145b27832
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon Jul 4 15:39:02 2011 +0200
+
+ vmwlegacy: Fix server termination due to pitch inconsistency.
+
+ Don't require a 32*32 bit pitch alignment when validating modes, since the
+ requested virtual pitch (pVMWARE->maxWidth*bpp) must be a multiple of that
+ alignment. If not, the server will terminate with a cryptic error message.
+
+ This is only for validating modes. The driver will adjust the pitch to the
+ host requirement when a mode is set anyway, and hopefully the host won't
+ require a pitch it doesn't support.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 0142bb8d10edb153c9ce79a2ea3ff92a7fb15ac5
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Mar 30 12:37:24 2011 +0200
+
+ vmwlegacy: Don't prune modes based on the virtual size of the default mode
+
+ We might be pruning modes based on the virtual size of the default mode in
+ some situations. Avoid this by allowing a virtual size equal to the device
+ max size, unless the user has requested something else.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Alan Hourihane <alanh@vmware.com>
+
+commit 04297d435b87e3d04a427ac8ef33d314727220e6
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Mar 30 12:22:43 2011 +0200
+
+ vmwlegacy: Fix up default mode VRefresh anc Clock calculation
+
+ The VRefresh value was a factor 1000 too high.
+ Calculate clock based on vrefresh and resolution.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Alan Hourihane <alanh@vmware.com>
+
+commit c5ca599361c87ec816db92d4f9841143f8601934
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Mar 30 11:01:06 2011 +0200
+
+ vmwlegacy: Fix a bug in screen dimension calculation
+
+ This bug resulted in incorrect screen dimensions and DPI being calculated
+ in some circumstances, leading to among other things bad aspect ratios in xine.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit c02d5977015983473a9bbae97ec65ce70a5faa3b
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Tue Mar 29 13:03:39 2011 +0200
+
+ vmwlegacy: Make sure we draw the colorkey to the right drawable
+
+ Don't draw the colorkey to the screen drawable, but to the video drawable
+ when possible.
+
+ Also change the Xv API/ABI test to use the builtin ABI version
+ functions.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Michel D�er <daenzer@vmware.com>
+
+commit b234d7d6925b480a9c4fe23e5100e6fe7e5c0eac
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Tue Mar 29 11:18:24 2011 +0200
+
+ vmwlegacy: Silence a number of warnings
+
+ This potentially also fixes a use of an uninitialized pointer value, which
+ may cause OOM or segfaults.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Michel D�er <daenzer@vmware.com>
+
+commit cdb04224db69a6b3beb66c99879e20917b8b0fb2
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Fri Mar 25 19:17:00 2011 +0100
+
+ vmwlegacy: Fix segfault and setup of initial mode.
+
+ The fact that modes were added without names caused segfaults on older
+ X servers. At least up to and including Xserver 1.4.
+
+ Also, for some reason, at least Xserver 1.4 insists on setting the first mode
+ in the modelist, even if we set another mode as the current one.
+
+ Work around this by inserting a new mode with the current screen dimensions,
+ and add that modename last to the array of display requested mode names.
+ This means that if none of the previous mode names are found, we will at least
+ find the newly inserted mode.
+
+ Also, if there are no requested mode names at all, the driver previously
+ chose the largest mode that fit the timings. Now we will, in that case,
+ always select the newly inserted mode and thus not change resolution unless
+ specified.
+
+ Also add an option to not add this default mode. The option
+ "AddDefaultMode" is true by default.
+
+ Finally when we restore registers at exit and VT switch, make sure we
+ reprogram the initial width, height and bpp for the next time we start a
+ server.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 9a8f0af8782fd5e9de2d71dfa86fad1d48d52b64
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Mar 3 09:47:48 2011 +0100
+
+ Remove unused variable
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit c208a5380b20f910ab49433abc0d39dce6bb5528
+Author: Alan Hourihane <alanh@vmware.com>
+Date: Wed Feb 16 18:53:14 2011 +0100
+
+ vmwlegacy: Fix mode lookup
+
+ In situations where we have trouble finding a specified mode,
+ use the resolution given by the width and height device registers.
+
+ Signed-off-by: Alan Hourihane <alanh@vmware.com>
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 2e5001b7e93c63c2cd25d7d8ebdee8a420c13b96
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Feb 16 18:47:02 2011 +0100
+
+ vmwlegacy: Add a missing include
+
+ The test for Xserver >= 1.2 in the affected file was always failing.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Michel Dänzer <daenzer@vmware.com>
+
+commit b3c244ebd7899a66aa401d2d7b0ddc66ee56e6d7
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed Feb 16 17:29:47 2011 +0100
+
+ vmwlegacy: Don't attempt to call RRSendConfigNotify on Xservers < 1.2
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Alan Hourihane <alanh@vmware.com>
+ Reviewed-by: Michel Dänzer <daenzer@vmware.com>
+
+commit eacfa46ada8562bfb15d3fc6a8af272d88036d2f
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Thu Jan 27 11:09:39 2011 +0100
+
+ vmwlegacy: Send ConfigureNotify events on Xinerama state changes with no mode change
+
+ Signed-off-by: Michel D�er <daenzer@vmware.com>
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit cc66e4a49a4a9ac90940d7866db5bc7621cb7e16
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Jan 27 11:02:44 2011 +0100
+
+ Fix crosscompile build for older Xservers v2
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit d1ac343b8894a9b8a34c1dcf4b6aeb57239034c0
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Fri Jan 21 23:07:10 2011 +0100
+
+ Revert "Fix crosscompile build for older Xservers"
+
+ This reverts commit 16e16390385d890b3666485a40369f4c690d5033.
+
+ The fix was bogus as pointed out by Cyril Bruleboid <kibi@debian.org>, and
+ Gaetan Nadon <memsize@videotron.ca>
+
+commit 16e16390385d890b3666485a40369f4c690d5033
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Jan 13 13:17:17 2011 +0100
+
+ Fix crosscompile build for older Xservers
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+commit 5b30df47117bc65fd5f14667671041428e1d00b5
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Jan 13 12:52:14 2011 +0100
+
+ vmwlegacy: Remove Write-Combining setups
+
+ The virtual CPUs doesn't support it anyway.
+ Once suggested by Michel Daenzer.
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+
commit 8f8f71f0075d9d5cbbfca93425462ba03c5b8046
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Nov 9 14:31:30 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index d6ecf81..1900dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-vmware (1:11.0.99.901-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate.
+ * It's probably not bug-free, but that's what release candidates and
+ unstable users are for. ;-)
+
+ -- Cyril Brulebois <kibi@debian.org> Thu, 03 Nov 2011 01:01:21 +0100
+
xserver-xorg-video-vmware (1:11.0.3-3) unstable; urgency=high
* Cherry-pick from upstream: Use dixLookupWindow instead of LookupWindow on
commit c9779cf7ef4589518f2a2ce97248f2dc14dc4767
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 25 23:22:56 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index ffe58a3..d6ecf81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vmware (1:11.0.3-3) unstable; urgency=high
+
+ * Cherry-pick from upstream: Use dixLookupWindow instead of LookupWindow on
+ Xorg 1.5 & later.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 25 Oct 2011 23:22:42 +0200
+
xserver-xorg-video-vmware (1:11.0.3-2) unstable; urgency=low
* Switch to dh:
commit 40633644ea2b910a4faa9ff63b077f9100115aff
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 27 19:31:22 2011 -0700
Use dixLookupWindow instead of LookupWindow on Xorg 1.5 & later
The LookupWindow function was deprecated in xserver commit ed75b056511ccb4
and removed during the Xorg 1.11 merge window by commit 82a8677d9175732.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
(cherry picked from commit 26845eb54a15d43f09288a87c5f74beac8fb6ec7)
diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c
index 3476f43..d207f8f 100644
--- a/src/vmwarexinerama.c
+++ b/src/vmwarexinerama.c
@@ -48,6 +48,26 @@
#include <xf86_libc.h>
#endif
+/*
+ * LookupWindow was removed with video abi 11.
+ */
+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
+#ifndef DixGetAttrAccess
+#define DixGetAttrAccess (1<<4)
+#endif
+#endif
+
+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 2)
+static inline int
+dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
+{
+ *pWin = LookupWindow(id, client);
+ if (!*pWin)
+ return BadWindow;
+ return Success;
+}
+#endif
+
/*
*----------------------------------------------------------------------------
@@ -116,10 +136,12 @@ VMwareXineramaGetState(ClientPtr client)
ExtensionEntry *ext;
ScrnInfoPtr pScrn;
VMWAREPtr pVMWARE;
+ int rc;
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
- pWin = LookupWindow(stuff->window, client);
- if(!pWin) return BadWindow;
+ rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+ if (rc != Success)
+ return rc;
if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
return BadMatch;
@@ -168,10 +190,12 @@ VMwareXineramaGetScreenCount(ClientPtr client)
ExtensionEntry *ext;
ScrnInfoPtr pScrn;
VMWAREPtr pVMWARE;
+ int rc;
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
- pWin = LookupWindow(stuff->window, client);
- if(!pWin) return BadWindow;
+ rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+ if (rc != Success)
+ return rc;
if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
return BadMatch;
@@ -220,10 +244,12 @@ VMwareXineramaGetScreenSize(ClientPtr client)
ExtensionEntry *ext;
ScrnInfoPtr pScrn;
VMWAREPtr pVMWARE;
+ int rc;
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
- pWin = LookupWindow (stuff->window, client);
- if(!pWin) return BadWindow;
+ rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+ if (rc != Success)
+ return rc;
if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
return BadMatch;
commit 4c08c2600936efeedb1a33436876ba82a11218e7
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Oct 7 13:15:11 2011 -0700
Build fix for ABI version 12
This results in the vmware driver assuming there is only one PCI domain,
which I think is true for everywhere this is expected to run anyway.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/vmware.c b/src/vmware.c
index 1be0990..55bde22 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -612,9 +612,11 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
uint32 width = 0, height = 0;
Bool defaultMode;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
#ifndef BUILD_FOR_420
domainIOBase = pScrn->domainIOBase;
#endif
+#endif
if (flags & PROBE_DETECT) {
return FALSE;
commit 208ccbc7179b40a570a5943e325dd22740a67577
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Oct 7 13:10:59 2011 -0700
Fix build failures resulting from changes to the swaps and swapl macros in recent xorg-server
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/vmware.h b/src/vmware.h
index cf32462..0385292 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -43,6 +43,14 @@
#include "svga_reg.h"
#include "svga_struct.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+#define _swapl(x, n) swapl(x,n)
+#define _swaps(x, n) swaps(x,n)
+#else
+#define _swapl(x, n) swapl(x)
+#define _swaps(x, n) swaps(x)
+#endif
+
/*
* The virtual hardware's cursor limits are pretty big. Some VMware
* product versions limit to 1024x1024 pixels, others limit to 128
diff --git a/src/vmwarectrl.c b/src/vmwarectrl.c
index d021eb7..d31bef6 100644
--- a/src/vmwarectrl.c
+++ b/src/vmwarectrl.c
@@ -82,10 +82,10 @@ VMwareCtrlQueryVersion(ClientPtr client)
rep.majorVersion = VMWARE_CTRL_MAJOR_VERSION;
rep.minorVersion = VMWARE_CTRL_MINOR_VERSION;
if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.majorVersion, n);
- swapl(&rep.minorVersion, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swapl(&rep.majorVersion, n);
+ _swapl(&rep.minorVersion, n);
}
WriteToClient(client, sizeof(xVMwareCtrlQueryVersionReply), (char *)&rep);
@@ -225,11 +225,11 @@ VMwareCtrlSetRes(ClientPtr client)
rep.x = stuff->x;
rep.y = stuff->y;
if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.screen, n);
- swapl(&rep.x, n);
- swapl(&rep.y, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swapl(&rep.screen, n);
+ _swapl(&rep.x, n);
+ _swapl(&rep.y, n);
}
WriteToClient(client, sizeof(xVMwareCtrlSetResReply), (char *)&rep);
@@ -379,9 +379,9 @@ VMwareCtrlSetTopology(ClientPtr client)
rep.sequenceNumber = client->sequence;
rep.screen = stuff->screen;
if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.screen, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swapl(&rep.screen, n);
}
WriteToClient(client, sizeof(xVMwareCtrlSetTopologyReply), (char *)&rep);
@@ -448,7 +448,7 @@ SVMwareCtrlQueryVersion(ClientPtr client)
REQUEST(xVMwareCtrlQueryVersionReq);
REQUEST_SIZE_MATCH(xVMwareCtrlQueryVersionReq);
- swaps(&stuff->length, n);
+ _swaps(&stuff->length, n);
return VMwareCtrlQueryVersion(client);
}
@@ -479,10 +479,10 @@ SVMwareCtrlSetRes(ClientPtr client)
REQUEST(xVMwareCtrlSetResReq);
REQUEST_SIZE_MATCH(xVMwareCtrlSetResReq);
- swaps(&stuff->length, n);
- swapl(&stuff->screen, n);
- swapl(&stuff->x, n);
- swapl(&stuff->y, n);
+ _swaps(&stuff->length, n);
+ _swapl(&stuff->screen, n);
+ _swapl(&stuff->x, n);
+ _swapl(&stuff->y, n);
return VMwareCtrlSetRes(client);
}
@@ -513,9 +513,9 @@ SVMwareCtrlSetTopology(ClientPtr client)
REQUEST(xVMwareCtrlSetTopologyReq);
REQUEST_SIZE_MATCH(xVMwareCtrlSetTopologyReq);
- swaps(&stuff->length, n);
- swapl(&stuff->screen, n);
- swapl(&stuff->number, n);
+ _swaps(&stuff->length, n);
+ _swapl(&stuff->screen, n);
+ _swapl(&stuff->number, n);
/* Each extent is a struct of shorts. */
SwapRestS(stuff);
diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c
index 2407c27..49df3f2 100644
--- a/src/vmwarexinerama.c
+++ b/src/vmwarexinerama.c
@@ -99,10 +99,10 @@ VMwareXineramaQueryVersion(ClientPtr client)
rep.majorVersion = 1;
rep.minorVersion = 0;
if(client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swaps(&rep.majorVersion, n);
- swaps(&rep.minorVersion, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swaps(&rep.majorVersion, n);
+ _swaps(&rep.minorVersion, n);
}
WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep);
return (client->noClientException);
@@ -154,8 +154,8 @@ VMwareXineramaGetState(ClientPtr client)
rep.sequenceNumber = client->sequence;
rep.state = pVMWARE->xinerama;
if(client->swapped) {
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
+ _swaps (&rep.sequenceNumber, n);
+ _swapl (&rep.length, n);
}
WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
return client->noClientException;
@@ -207,8 +207,8 @@ VMwareXineramaGetScreenCount(ClientPtr client)
rep.sequenceNumber = client->sequence;
rep.ScreenCount = pVMWARE->xineramaNumOutputs;
if(client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
return client->noClientException;
@@ -261,10 +261,10 @@ VMwareXineramaGetScreenSize(ClientPtr client)
rep.width = pVMWARE->xineramaState[stuff->screen].width;
rep.height = pVMWARE->xineramaState[stuff->screen].height;
if(client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.width, n);
- swapl(&rep.height, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swapl(&rep.width, n);
+ _swapl(&rep.height, n);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
return client->noClientException;
@@ -310,9 +310,9 @@ VMwareXineramaIsActive(ClientPtr client)
rep.state = pVMWARE->xinerama;
if(client->swapped) {
register int n;
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.state, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swapl(&rep.state, n);
}
WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
return client->noClientException;
@@ -358,9 +358,9 @@ VMwareXineramaQueryScreens(ClientPtr client)
rep.length = rep.number * sz_XineramaScreenInfo >> 2;
if(client->swapped) {
register int n;
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.number, n);
+ _swaps(&rep.sequenceNumber, n);
+ _swapl(&rep.length, n);
+ _swapl(&rep.number, n);
}
WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
@@ -375,10 +375,10 @@ VMwareXineramaQueryScreens(ClientPtr client)
scratch.height = pVMWARE->xineramaState[i].height;
if(client->swapped) {
register int n;
- swaps(&scratch.x_org, n);
- swaps(&scratch.y_org, n);
- swaps(&scratch.width, n);
- swaps(&scratch.height, n);
+ _swaps(&scratch.x_org, n);
+ _swaps(&scratch.y_org, n);
+ _swaps(&scratch.width, n);
+ _swaps(&scratch.height, n);
}
WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
}
@@ -449,7 +449,7 @@ SVMwareXineramaQueryVersion (ClientPtr client)
{
REQUEST(xPanoramiXQueryVersionReq);
register int n;
- swaps(&stuff->length,n);
+ _swaps(&stuff->length,n);
REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
return VMwareXineramaQueryVersion(client);
}
@@ -477,7 +477,7 @@ SVMwareXineramaGetState(ClientPtr client)
{
REQUEST(xPanoramiXGetStateReq);
register int n;
- swaps (&stuff->length, n);
+ _swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
return VMwareXineramaGetState(client);
}
@@ -505,7 +505,7 @@ SVMwareXineramaGetScreenCount(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenCountReq);
register int n;
- swaps (&stuff->length, n);
+ _swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
return VMwareXineramaGetScreenCount(client);
}
@@ -533,7 +533,7 @@ SVMwareXineramaGetScreenSize(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenSizeReq);
register int n;
- swaps (&stuff->length, n);
+ _swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
return VMwareXineramaGetScreenSize(client);
}
@@ -561,7 +561,7 @@ SVMwareXineramaIsActive(ClientPtr client)
{
REQUEST(xXineramaIsActiveReq);
register int n;
- swaps (&stuff->length, n);
+ _swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
return VMwareXineramaIsActive(client);
}
@@ -589,7 +589,7 @@ SVMwareXineramaQueryScreens(ClientPtr client)
{
REQUEST(xXineramaQueryScreensReq);
register int n;
- swaps (&stuff->length, n);
+ _swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
return VMwareXineramaQueryScreens(client);
}
commit de70a1d0cb79dad9e52baa43306264db80a163da
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Oct 5 13:33:17 2011 +0200
xf86-video-vmware 11.0.99.901
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/configure.ac b/configure.ac
Reply to: