summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2012-03-20vmware/legacy: Fix crash on Xserver 1.12.0Jakob Bornecrantz
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Reviewed-by: Zack Rusin <zackr@vmware.com>
2012-03-13config: include saa and vmwgfx subdirs in the tarballGaetan Nadon
Use AM_CONDITIONAL. Automake knows what to distribute. It needs to be able to navigate down the subdirs to find what needs to be included in the tarball. To test reliably, create a tarball and expand it into a separate directory and build with xatracker. Distcheck will not detect missing code when such code is configured not to build. The content of a tarball *must* always be identical, regardless of the configuration options used or on which platform it was configured. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
2012-02-08vmware/legacy: Fix initial mode size v2Thomas Hellstrom
Commit "vmwlegacy: Make the default be a minium of 800x600..." read the dimensions from the incorrect register pair. v2: Also treat initial widths and heights larger than the maximum values as an error and revert back to the minimum. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2012-02-02vmware: Kill warnings on Xserver 1.12Thomas Hellstrom
Compile-tested on servers 1.0 through 1.12. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2012-01-12vmwlegacy: Make the default be a minimum of 800x600Jakob Bornecrantz
This patch and the corresponding vmwgfx patch formalizes both drivers on the same behviour. The minimum is 800x600 (unless the max size is smaller). This makes it unnecessary to check against VRAM size since it is always at least large enough to fit the max values. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
2012-01-12vmware: Make sure the driver builds on old serversThomas Hellstrom
Move things around a bit so the driver compiles with servers back to Xserver 1.0. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-12-19Merge branch 'vmwgfx_branch'Thomas Hellstrom
2011-12-06vmwgfx: Add an option to enable rendercheck modeThomas Hellstrom
Rendercheck mode is used to enable acceleration of all supported composite operations, regardless of the current data location. The mode is off by default, but could be turned on to test the hardware composite operation implementation. Due to excessive data migration, rendercheck mode will be slow. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-25vmwlegacy: Factor out code that can be common for vmwgfx and vmwlegacyThomas Hellstrom
In this case it's the parsing of the gui / statix xinerama topology. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-25vmwlegacy: Accept option "GuiLayout" as a synonym for "staticXinerama"Thomas Hellstrom
It's more user-friendly and in line with what it's being used for in the vmwgfx driver. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-25vmware: Update library dependenciesThomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-25vmware: Update the vmware register definitionThomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-25vmware: Hook up vmwgfx to be tried before falling back to legacyThomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-25vmwlegacy: Factor out bootstrap functionsThomas Hellstrom
Preparing for choosing driver path in preinit instead of using shim loader. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-22vmwlegacy: Fix up Xinerama / panoramiX replies.Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2011-11-17vmwlegacy: Fix device fifo communicationThomas Hellstrom
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>
2011-10-07Build fix for ABI version 12Jeremy Huddleston
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>
2011-10-07Fix build failures resulting from changes to the swaps and swapl macros in ↵Jeremy Huddleston
recent xorg-server Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-05Use dixLookupWindow instead of LookupWindow on Xorg 1.5 & laterAlan Coopersmith
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>
2011-09-25Fix wrong-sized swapsMatt Turner
Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-07-05vmwlegacy: Fix server termination due to pitch inconsistency.Thomas Hellstrom
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>
2011-06-16vmwgfx, saa: Initial importThomas Hellstrom
This imports the vmwgfx driver, based on the Gallium3D Xorg state tracker, as well as the saa library. A "Shadow Acceleration Architecture", which is optimized for the case where transfers between system (shadow) and hw memory is very costly. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-03-30vmwlegacy: Don't prune modes based on the virtual size of the default modeThomas Hellstrom
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>
2011-03-30vmwlegacy: Fix up default mode VRefresh anc Clock calculationThomas Hellstrom
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>
2011-03-30vmwlegacy: Fix a bug in screen dimension calculationThomas Hellstrom
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>
2011-03-30vmwlegacy: Make sure we draw the colorkey to the right drawableThomas Hellstrom
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änzer <daenzer@vmware.com>
2011-03-30vmwlegacy: Silence a number of warningsThomas Hellstrom
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änzer <daenzer@vmware.com>
2011-03-29vmwlegacy: Fix segfault and setup of initial mode.Thomas Hellstrom
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>
2011-03-03Remove unused variableThomas Hellstrom
Signed-off-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-02-16vmwlegacy: Fix mode lookupAlan Hourihane
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>
2011-02-16vmwlegacy: Add a missing includeThomas Hellstrom
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>
2011-02-16vmwlegacy: Don't attempt to call RRSendConfigNotify on Xservers < 1.2Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Alan Hourihane <alanh@vmware.com> Reviewed-by: Michel Dänzer <daenzer@vmware.com>
2011-02-04vmwlegacy: Send ConfigureNotify events on Xinerama state changes with no ↵Michel Dänzer
mode change Signed-off-by: Michel Dänzer <daenzer@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-01-27Fix crosscompile build for older Xservers v2Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-01-21Revert "Fix crosscompile build for older Xservers"Thomas Hellstrom
This reverts commit 16e16390385d890b3666485a40369f4c690d5033. The fix was bogus as pointed out by Cyril Bruleboid <kibi@debian.org>, and Gaetan Nadon <memsize@videotron.ca>
2011-01-13Fix crosscompile build for older XserversThomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-01-13vmwlegacy: Remove Write-Combining setupsThomas Hellstrom
The virtual CPUs doesn't support it anyway. Once suggested by Michel Daenzer. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-10-06Purge cvs tags.Jesse Adkins
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-16Make the modinfo string contain an optional subpatch numberThomas Hellstrom
The idea is that the build system assigns this number if needed. As an example it might be the commit number since the last version tag. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-09-08vmwlegacy: Fix a segfault in vmwareCursorCloseScreen.Thomas Hellstrom
The segfault occured because the named function was using resources that were already taken down, because VMWARECloseScreen was called very late in the CloseScreen callchain. Make sure we wrap the CloseScreen pointers late in ScreenInit to avoid this. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-09-07vmwlegacy: A number of Xv fixesThomas Hellstrom
Properly init and uninit the port private clipboxes on setup and end. Clear the port private clipboxes on video stop, to force re-painting of the colorkey when the stream is resumed. Make sure the colorkey is painted *before* the overlay is flushed. Some host implementations seem picky about this. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-09-07vmware/vmwlegacy: Silence compilation errors and -warnings.Thomas Hellstrom
Silence warnings and errors on various server versions due to incorrect usage of libc functions. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-09-03vmwlegacy: Always scale screen dimensions to the initial DPI on modeswitch.Thomas Hellstrom
When we switch mode we usually alter the size in a constant DPI environment rather than keeping the size constant and alter the DPI. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-09-01vmware: Handle chain-loader failures gracefully.Thomas Hellstrom
If the vmwlegacy driver wasn't present when expected, that would leave the X server in a confused state. Thus report loading errors properly back to the X server. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-08-18Make the driver build and run without libdrm.Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-08-12Only set the first xinerama output as primary.Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-07-13Don't crash the server on Xorg -configureJulien Cristau
2010-07-09Purge macros NEED_EVENTS and NEED_REPLIESFernando Carrijo
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-03-29Fix some issues pointed out by compiler warnings.Michel Dänzer
* vmware_chain_module() doesn't return any values. * Remove an unused local variable.
2010-03-09Rework chainloader code to check for vmwgfx userspace driver as wellJakob Bornecrantz