platform/upstream/xf86-video-vmware.git
9 years agopackaging: gbs: use upstream-git branch 66/32666/1 accepted/tizen_common sandbox/pcoval/tizen tizen tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common accepted/tizen/common/20141222.111407 submit/tizen_common/20141222.101700 submit/tizen_common/20141222.102300
Philippe Coval [Mon, 22 Dec 2014 10:09:52 +0000 (11:09 +0100)]
packaging: gbs: use upstream-git branch

Change-Id: Iad079eca3d7764aca795571af780abcc37d17094
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
9 years agoxf86xv.h cannot be included without first including xorg-server.h. submit/tizen_common/20141210.175147
Stefan Dirsch [Tue, 7 Oct 2014 09:29:32 +0000 (11:29 +0200)]
xf86xv.h cannot be included without first including xorg-server.h.

Without this the build fails on systems with the latest glibc,
throwing this error:

In file included from /usr/include/string.h:634:0,
                 from /usr/include/xorg/os.h:53,
                 from /usr/include/xorg/misc.h:115,
                 from /usr/include/xorg/screenint.h:50,
                 from /usr/include/xorg/scrnintstr.h:50,
                 from /usr/include/xorg/xvdix.h:55,
                 from /usr/include/xorg/xf86xv.h:32,
                 from vmwgfx_overlay.c:38:
/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);

This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
causing os.h to redefine it.

Change-Id: I3a8b19e1393733620cb4cce10811efec45445129
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
Origin: upstream

9 years agopackaging: Bump to 13.0.2 for Tizen
Geoffroy Van Cutsem [Thu, 4 Dec 2014 12:14:17 +0000 (13:14 +0100)]
packaging: Bump to 13.0.2 for Tizen

Change-Id: I0d1df26075cf43d5bd6d4155b3d21f247d602626
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
9 years agoxf86-video-vmware should not try to build into a pure wayland platform..
Ronan Le Martret [Mon, 27 Jan 2014 15:02:49 +0000 (16:02 +0100)]
xf86-video-vmware should not try to build into a pure wayland platform..

This package is designed for an X server platform.

In a system released, based exclusively on Wayland platform, it should be in a excluded status.

Tizen devel  | Tizen release
_____________|______________
succeeded    | succeeded
excluded     | excluded
broken       |
failed       |
unresolvable |
blocked      |
locked       |
note:
    - The disabled status is only
      allowed for OBS administration.

Change-Id: I63dc5fc9d502d6ce5eb1449495f9f30ca6d560ca
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
9 years agoresetting manifest requested domain to floor
Alexandru Cornea [Sat, 29 Jun 2013 01:15:26 +0000 (04:15 +0300)]
resetting manifest requested domain to floor

9 years agopackaging: Initial packaging on 12.0.2 for Tizen
Anas Nashif [Wed, 7 Nov 2012 05:17:38 +0000 (21:17 -0800)]
packaging: Initial packaging on 12.0.2 for Tizen

Change-Id: I16c78d3875db5fd7957c0faa5389f4fc182751db

10 years agoBump the version number to 13.0.2 upstream-git xf86-video-vmware-13.0.2
Jakob Bornecrantz [Wed, 26 Mar 2014 11:45:52 +0000 (12:45 +0100)]
Bump the version number to 13.0.2

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmware: Fix compilation on newer X servers
Jakob Bornecrantz [Fri, 21 Feb 2014 17:10:07 +0000 (18:10 +0100)]
vmware: Fix compilation on newer X servers

Found by Bryan Lee. Later versions of X.org turns dispMode pointers
into const upsetting gcc, turn them into size_t's instead.

Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
10 years agovmware/vmwgfx: Always allocate shared hardware surfaces.
Thomas Hellstrom [Wed, 15 Jan 2014 10:04:05 +0000 (11:04 +0100)]
vmware/vmwgfx: Always allocate shared hardware surfaces.

Hardware surfaces are all likely to be shared at some point, and we *really*
don't want to change a hardware surface that is bound as a drm framebuffer.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmware: Require libdrm 2.4.38 to build XMir.
Thomas Hellstrom [Thu, 9 Jan 2014 12:53:59 +0000 (13:53 +0100)]
vmware: Require libdrm 2.4.38 to build XMir.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmware: Fix build errors and warnings
Thomas Hellstrom [Thu, 9 Jan 2014 12:28:22 +0000 (13:28 +0100)]
vmware: Fix build errors and warnings

A previous commit and the hosted merge unfortunately brought in some build
errors / warnings on early X servers.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Block DMA to prime surfaces for now
Thomas Hellstrom [Tue, 7 Jan 2014 16:55:49 +0000 (17:55 +0100)]
vmwgfx: Block DMA to prime surfaces for now

Since there is currently no _good_ way to get the surface format of a
prime surface, we block DMA to these surfaces; we don't know if our
software data is compatible with the surface format.

This patch also makes sure that there is a hardware surface backing the
drawable we copy from.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Enable direct dmas
Thomas Hellstrom [Mon, 6 Jan 2014 11:37:36 +0000 (12:37 +0100)]
vmwgfx: Enable direct dmas

Enable direct dmas instead of using the xa-provided dma functionality.
This saves a bounce-buffer software copy of all dma'd contents.

This also implies that all drawables with mixed software / hardware contents
will use a kernel buffer for software rendering.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agovmwgfx: Add support for XWayland
Thomas Hellstrom [Mon, 16 Dec 2013 14:21:09 +0000 (06:21 -0800)]
vmwgfx: Add support for XWayland

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Add support for XMir v2.
Thomas Hellstrom [Mon, 16 Dec 2013 14:13:25 +0000 (06:13 -0800)]
vmwgfx: Add support for XMir v2.

Use the hosted infrastructure to add support for XMir.
Helpers go in vmwgfx_saa.c.

v2: Added comments for the helpers, and added a
vmwgfx_flush_dri2 to be executed when coming back from vt switch.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Add an infrastructure to be able to run hosted under a compositor v2
Thomas Hellstrom [Mon, 16 Dec 2013 14:05:35 +0000 (06:05 -0800)]
vmwgfx: Add an infrastructure to be able to run hosted under a compositor v2

Figure out what's needed both for XMir and XWayland and make a common
driver structure out of it.

v2: Added a lot of comments. No code change.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Fix compile breakage on XA version 1.
Thomas Hellstrom [Mon, 16 Dec 2013 09:38:21 +0000 (10:38 +0100)]
vmwgfx: Fix compile breakage on XA version 1.

A recent revert brought back code that assumed XA version 2.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: trivial
10 years agovmwgfx: Really allow XA version 2.
Thomas Hellstrom [Wed, 11 Dec 2013 14:54:02 +0000 (06:54 -0800)]
vmwgfx: Really allow XA version 2.

When XA starts to correctly advertise version 2, we didn't allow it.
Fix this.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agoRevert "vmwgfx: Get rid of device-specific DMA code"
Thomas Hellstrom [Wed, 11 Dec 2013 12:59:49 +0000 (04:59 -0800)]
Revert "vmwgfx: Get rid of device-specific DMA code"

This reverts commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932.

Reverting this because using direct DMA for shared pixmaps should
boost performance. It should be usable both in a composited environment
and when running hosted. Need to retest the DMA flaws I saw before disabling
this code.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Remove stray 1
Thomas Hellstrom [Mon, 9 Dec 2013 08:19:55 +0000 (00:19 -0800)]
vmwgfx: Remove stray 1

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Support also XA version 1 v2
Thomas Hellstrom [Thu, 5 Dec 2013 10:58:47 +0000 (02:58 -0800)]
vmwgfx: Support also XA version 1 v2

We need to support also XA version 1, since we want to be backwards
compatible with older mesa releases.
Unfortunately, the intended way of detecting XA major version at
compile-time was broken on mesa 10 so we need a workaround that tests
for XA version 2 at config time.

v2: Update the test for XA version 2.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: Fix some compilation warnings and indentations
Thomas Hellstrom [Thu, 28 Nov 2013 10:02:20 +0000 (02:02 -0800)]
vmwgfx: Fix some compilation warnings and indentations

Most of the compilation warnings we're seeing are due to bad xorg headers,
but fix the ones we can fix in the driver. Some indentation fixes as well.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
10 years agovmwgfx: handle changes of DamageUnregister API in 1.14.99.2
Gaetan Nadon [Mon, 28 Oct 2013 22:21:29 +0000 (18:21 -0400)]
vmwgfx: handle changes of DamageUnregister API in 1.14.99.2

Fix is inspired from the intel driver.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
11 years agovmwgfx: Get rid of device-specific DMA code
Thomas Hellstrom [Wed, 19 Sep 2012 19:50:40 +0000 (21:50 +0200)]
vmwgfx: Get rid of device-specific DMA code

It's rarely used and things seem to work well enough on top of XA.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
11 years agovmwgfx: Implement textured video completely on top of XA.
Thomas Hellstrom [Wed, 19 Sep 2012 18:36:57 +0000 (20:36 +0200)]
vmwgfx: Implement textured video completely on top of XA.

Remove device-specific hacks. This may increase resource usage a little
on old hardware revisions, but we don't need separate code paths on
different hardware revisions.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
11 years agovmwgfx: Avoid HW operations when not master
Thomas Hellstrom [Thu, 26 Sep 2013 08:25:33 +0000 (01:25 -0700)]
vmwgfx: Avoid HW operations when not master

Note that for DRI2, a dri2_copy_region becomes a NOP when not master.
Additionally, all dri2 operations that lead to a potential kernel
access will return FALSE.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
11 years agovmwgfx: update for XA API changes
Rob Clark [Mon, 10 Jun 2013 17:31:31 +0000 (13:31 -0400)]
vmwgfx: update for XA API changes

Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Jakob Bornecrantz <jakob@vmware.com>
11 years agoBump the version number to 13.0.1 xf86-video-vmware-13.0.1
Jakob Bornecrantz [Wed, 17 Apr 2013 10:03:32 +0000 (12:03 +0200)]
Bump the version number to 13.0.1

11 years agovmwgfx: Use myGlyphs to fix crashes
Loïc Yhuel [Thu, 11 Apr 2013 09:29:10 +0000 (11:29 +0200)]
vmwgfx: Use myGlyphs to fix crashes

Tested-by: Christian Hesse <mail@eworm.de>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
11 years agoKill mibstore
Zack Rusin [Thu, 14 Feb 2013 22:33:01 +0000 (14:33 -0800)]
Kill mibstore

It was a noop for at least 5 years and it has been removed.

Signed-off-by: Zack Rusin <zackr@vmware.com>
11 years agoBump the version number to 13.0.0 xf86-video-vmware-13.0.0
Zack Rusin [Tue, 15 Jan 2013 20:05:45 +0000 (12:05 -0800)]
Bump the version number to 13.0.0

New abi and various fixes

Signed-off-by: Zack Rusin <zackr@vmware.com>
11 years agoxf86-video-vmware 12.0.99.901
Zack Rusin [Thu, 6 Dec 2012 21:40:13 +0000 (16:40 -0500)]
xf86-video-vmware 12.0.99.901

Internal release for a round of QE testing

Signed-off-by: Zack Rusin <zackr@vmware.com>
12 years agovmwgfx: Guard against null rotate pixmap in shadow destroy
Jakob Bornecrantz [Tue, 29 May 2012 21:01:14 +0000 (23:01 +0200)]
vmwgfx: Guard against null rotate pixmap in shadow destroy

Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmware: avoid warnings about shadowing 'i'
Dave Airlie [Tue, 3 Jul 2012 12:50:30 +0000 (13:50 +0100)]
vmware: avoid warnings about shadowing 'i'

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agovmware: drop infoFromScreen inline in favour of new interface
Dave Airlie [Sat, 16 Jun 2012 13:43:52 +0000 (14:43 +0100)]
vmware: drop infoFromScreen inline in favour of new interface

This also should fix the build regression introduced with the fix
for this macro.

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 years agovmware: Fix up some warnings after new compat API change.
Robert Hooker [Fri, 15 Jun 2012 15:56:59 +0000 (11:56 -0400)]
vmware: Fix up some warnings after new compat API change.

Fixes multiple instances of these warnings on x86_64:
../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration]
../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs]
../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default]
Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmware: port vmware driver to new compat API
Dave Airlie [Wed, 6 Jun 2012 08:58:01 +0000 (09:58 +0100)]
vmware: port vmware driver to new compat API

This is a port of the vmware driver to the new compat API.

Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
Brian Paul [Fri, 20 Apr 2012 20:24:26 +0000 (14:24 -0600)]
vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces

This fixes a failed assertion in the gallium/svga driver in the
svga_texture_get_handle() function.  The texture resource wasn't
getting created with the PIPE_BIND_SHARED flag so the !cachable
assertion would fail and the X session would abort.  This didn't
happen with release builds.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agoBump version number for the release xf86-video-vmware-12.0.2
Jakob Bornecrantz [Tue, 20 Mar 2012 21:05:30 +0000 (22:05 +0100)]
Bump version number for the release

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmware/legacy: Fix crash on Xserver 1.12.0
Jakob Bornecrantz [Mon, 19 Mar 2012 13:53:34 +0000 (14:53 +0100)]
vmware/legacy: Fix crash on Xserver 1.12.0

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
12 years agoFix a memory corruption due to a redundant free.
Zack Rusin [Thu, 15 Mar 2012 15:37:26 +0000 (11:37 -0400)]
Fix a memory corruption due to a redundant free.

We use the empty rect purely as a placeholder and never
initialize it with its own memory so lets not try to free
it.
Spotted by Dave Airlie.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agoBump version number for the release xf86-video-vmware-12.0.1
Jakob Bornecrantz [Tue, 13 Mar 2012 20:41:11 +0000 (21:41 +0100)]
Bump version number for the release

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agoconfig: move AC_SYS_LARGEFILE in autoconf init section
Gaetan Nadon [Tue, 13 Mar 2012 13:44:46 +0000 (09:44 -0400)]
config: move AC_SYS_LARGEFILE in autoconf init section

There is no need for this statement to be conditionally included.
It adds support for large files without taking anything away.

http://www.gnu.org/software/autoconf/manual/autoconf.html

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agoconfig: include saa and vmwgfx subdirs in the tarball
Gaetan Nadon [Mon, 12 Mar 2012 18:51:38 +0000 (14:51 -0400)]
config: include saa and vmwgfx subdirs in the tarball

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>
12 years agoBump version number for the release xf86-video-vmware-12.0.0
Zack Rusin [Thu, 8 Mar 2012 14:55:07 +0000 (09:55 -0500)]
Bump version number for the release

Signed-off-by: Zack Rusin <zackr@vmware.com>
12 years agovmware/legacy: Fix initial mode size v2
Thomas Hellstrom [Wed, 8 Feb 2012 14:00:20 +0000 (15:00 +0100)]
vmware/legacy: Fix initial mode size v2

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>
12 years agosaa: Try to avoid readbacks during polyFillRect
Thomas Hellstrom [Mon, 6 Feb 2012 18:48:57 +0000 (19:48 +0100)]
saa: Try to avoid readbacks during polyFillRect

This significantly improves performance of shaped windows on top of 3D
contents

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
12 years agovmware: Kill warnings on Xserver 1.12
Thomas Hellstrom [Thu, 2 Feb 2012 09:24:26 +0000 (10:24 +0100)]
vmware: Kill warnings on Xserver 1.12

Compile-tested on servers 1.0 through 1.12.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
12 years agovmwgfx: Kill a deprecation warning on server 1.12
Thomas Hellstrom [Wed, 1 Feb 2012 16:30:52 +0000 (17:30 +0100)]
vmwgfx: Kill a deprecation warning on server 1.12

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
12 years agovmwgfx: Fix up swap[sl] for server 1.12
Thomas Hellstrom [Wed, 1 Feb 2012 16:25:19 +0000 (17:25 +0100)]
vmwgfx: Fix up swap[sl] for server 1.12

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
12 years agovmwgfx: Avoid including a library header and use pixman for type conversion
Thomas Hellstrom [Wed, 1 Feb 2012 15:59:13 +0000 (16:59 +0100)]
vmwgfx: Avoid including a library header and use pixman for type conversion

The PictTransform type is a typedef of a pixman type.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
12 years agoBump version number for release xf86-video-vmware-11.99.901
Thomas Hellstrom [Fri, 13 Jan 2012 16:01:02 +0000 (17:01 +0100)]
Bump version number for release

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agoMake the driver build pass "make distcheck"
Thomas Hellstrom [Fri, 13 Jan 2012 16:14:47 +0000 (17:14 +0100)]
Make the driver build pass "make distcheck"

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Adapt to new XA version number v2
Thomas Hellstrom [Thu, 12 Jan 2012 13:00:41 +0000 (14:00 +0100)]
vmwgfx: Adapt to new XA version number v2

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx,saa: Fix a bunch of compilation warnings
Thomas Hellstrom [Thu, 12 Jan 2012 16:57:37 +0000 (17:57 +0100)]
vmwgfx,saa: Fix a bunch of compilation warnings

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwlegacy: Make the default be a minimum of 800x600
Jakob Bornecrantz [Fri, 9 Dec 2011 06:34:58 +0000 (07:34 +0100)]
vmwlegacy: Make the default be a minimum of 800x600

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>
12 years agovmware: Make sure the driver builds on old servers
Thomas Hellstrom [Thu, 12 Jan 2012 09:00:41 +0000 (10:00 +0100)]
vmware: Make sure the driver builds on old servers

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>
12 years agovmware: Update Manpage
Thomas Hellström [Wed, 11 Jan 2012 13:49:56 +0000 (14:49 +0100)]
vmware: Update Manpage

Update the Manpage with new options and a brief modesetting- and 3D
description.

Signed-off-by: Thomas Hellström <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agoMerge branch 'vmwgfx_branch'
Thomas Hellstrom [Mon, 19 Dec 2011 19:25:43 +0000 (20:25 +0100)]
Merge branch 'vmwgfx_branch'

12 years agosaa, vmwgfx: Fix saa_copy_composite
Thomas Hellstrom [Wed, 14 Dec 2011 11:38:27 +0000 (12:38 +0100)]
saa, vmwgfx: Fix saa_copy_composite

The traditional accelerated copy methods aren't format aware.
Make saa copy format aware,and pass formats on to the driver copy function
if available. If the driver can't handle format conversions it needs to
return FALSE.

This fixes format confusion in the copy composite fastpath.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agosaa: Always read back hw contents on poly_fill_rect
Thomas Hellstrom [Wed, 14 Dec 2011 09:22:22 +0000 (10:22 +0100)]
saa: Always read back hw contents on poly_fill_rect

The damage region may be much larger than the actual area
filled, so make sure we read back any hw contents in the damage region
since we use it to mark sw dirty.
Revisit this in the future since it may increase readbacks in an
undesired way. There are workarounds.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agosaa: Only try to accelerate pixmaps that are driver pixmaps
Thomas Hellstrom [Wed, 14 Dec 2011 09:18:16 +0000 (10:18 +0100)]
saa: Only try to accelerate pixmaps that are driver pixmaps

Trying to accelerate scratch pixmaps doesn't work currently,
and I'm not sure it's a big benefit either.

This is in line with what EXA does.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrants <jakob@vmware.com>
12 years agovmwgfx: Reduce system resource usage with textured video
Thomas Hellstrom [Thu, 8 Dec 2011 12:14:57 +0000 (13:14 +0100)]
vmwgfx: Reduce system resource usage with textured video

Use U and V textures and corresponding dma buffers that match
the size of the input UV data rather than using textures and DMA buffers
that match the Y data. This simplifies data copy and reduces the amount of
image data transfered to the host by up to 50% (YV12).

It also reduces dma buffer- and surface memory usage correspondingly.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Hook up XV color conversion control attributes
Thomas Hellstrom [Wed, 7 Dec 2011 19:19:34 +0000 (20:19 +0100)]
vmwgfx: Hook up XV color conversion control attributes

This enables the standard XV color conversion control attributes
contrast, scaling, saturation and hue.

Currently the attribute change takes effect on the next image only.
If we ever implement a ReputImage callback, we can use it to update
the image immediately on attribute change.

The attribute ranges follow those used by the proprietary Nvidia driver.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Adapt to new interface of xa_yuv_planar_blit
Thomas Hellstrom [Wed, 7 Dec 2011 13:17:45 +0000 (14:17 +0100)]
vmwgfx: Adapt to new interface of xa_yuv_planar_blit

Also make it easier to modify the color conversion matrix based on
yuv encoding properties.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Fix MessageType members that are incorrectly typed as Bool
Thomas Hellstrom [Tue, 6 Dec 2011 09:00:00 +0000 (10:00 +0100)]
vmwgfx: Fix MessageType members that are incorrectly typed as Bool

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Add an option to enable rendercheck mode
Thomas Hellstrom [Tue, 6 Dec 2011 08:53:16 +0000 (09:53 +0100)]
vmwgfx: Add an option to enable rendercheck mode

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>
12 years agovmwgfx: Adapt to the dri state tracker sending depth instead of bpp
Thomas Hellstrom [Tue, 6 Dec 2011 08:21:25 +0000 (09:21 +0100)]
vmwgfx: Adapt to the dri state tracker sending depth instead of bpp

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Don't register back buffers as "hw_is_dri2_fronts" v2
Thomas Hellstrom [Mon, 5 Dec 2011 19:58:45 +0000 (20:58 +0100)]
vmwgfx: Don't register back buffers as "hw_is_dri2_fronts" v2

That is reserved for dri2 front or fake front pixmaps that need
immediate flushing of software contents to hardware.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Include drm.h from correct path
Jakob Bornecrantz [Thu, 1 Dec 2011 15:47:41 +0000 (16:47 +0100)]
vmwgfx: Include drm.h from correct path

Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Make the drm device name persistent
Thomas Hellstrom [Mon, 28 Nov 2011 13:51:36 +0000 (14:51 +0100)]
vmwgfx: Make the drm device name persistent

The DRI2 code doesn't copy the device name, but assumes the storage
is persistent.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Alan Hourihane <alanh@vmware.com>
12 years agovmwgfx: Get the drm device name from the open file descriptor
Thomas Hellstrom [Fri, 25 Nov 2011 13:38:45 +0000 (14:38 +0100)]
vmwgfx: Get the drm device name from the open file descriptor

Rather than hardcoding it.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Use config options to optionally set GUI topology
Thomas Hellstrom [Fri, 25 Nov 2011 10:27:26 +0000 (11:27 +0100)]
vmwgfx: Use config options to optionally set GUI topology

Use option "StaticXinerama" or "GuiLayout" to set initial GUI topology,
similar to how these options are used with the legacy driver.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwlegacy: Factor out code that can be common for vmwgfx and vmwlegacy
Thomas Hellstrom [Wed, 23 Nov 2011 10:02:00 +0000 (11:02 +0100)]
vmwlegacy: Factor out code that can be common for vmwgfx and vmwlegacy

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>
12 years agovmwlegacy: Accept option "GuiLayout" as a synonym for "staticXinerama"
Thomas Hellstrom [Wed, 23 Nov 2011 09:49:33 +0000 (10:49 +0100)]
vmwlegacy: Accept option "GuiLayout" as a synonym for "staticXinerama"

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>
12 years agovmware: Update library dependencies
Thomas Hellstrom [Fri, 25 Nov 2011 08:42:16 +0000 (09:42 +0100)]
vmware: Update library dependencies

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwgfx: Pre-init fixes
Thomas Hellstrom [Tue, 22 Nov 2011 20:06:24 +0000 (21:06 +0100)]
vmwgfx: Pre-init fixes

A bunch of fixes that makes the fallback from vmwgfx to vmwlegacy easier.

1) Allow only 16 and 24 bit depths with vmwgfx. We may revisit this later.
2) Try to reclaim some resources if pre_init fails.
3) Print error messages so the user understands what happens on fallback.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmware: Update the vmware register definition
Thomas Hellstrom [Fri, 25 Nov 2011 08:15:32 +0000 (09:15 +0100)]
vmware: Update the vmware register definition

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmware: Hook up vmwgfx to be tried before falling back to legacy
Thomas Hellstrom [Tue, 22 Nov 2011 18:56:20 +0000 (19:56 +0100)]
vmware: Hook up vmwgfx to be tried before falling back to legacy

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwlegacy: Factor out bootstrap functions
Thomas Hellstrom [Tue, 22 Nov 2011 17:37:44 +0000 (18:37 +0100)]
vmwlegacy: Factor out bootstrap functions

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>
12 years agovmwlegacy: Fix up Xinerama / panoramiX replies.
Thomas Hellstrom [Thu, 17 Nov 2011 15:38:22 +0000 (16:38 +0100)]
vmwlegacy: Fix up Xinerama / panoramiX replies.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agovmwlegacy: Fix device fifo communication
Thomas Hellstrom [Wed, 16 Nov 2011 09:23:10 +0000 (10:23 +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>
13 years agovmwgfx: Make sure we don't render when VT switched
Thomas Hellstrom [Wed, 9 Nov 2011 10:34:16 +0000 (11:34 +0100)]
vmwgfx: Make sure we don't render when VT switched

When compiz is enabled, we may try to DMA sw rendered contents of dri2
drawables to surfaces while VT switched. I'm not sure how this could be
happening, but queue the DMA until the next block handler.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Alan Hourihane <alanh@vmware.com>
13 years agovmwgfx: Fix rendering errors when rotating / unrotating a screen.
Thomas Hellstrom [Tue, 8 Nov 2011 14:28:40 +0000 (15:28 +0100)]
vmwgfx: Fix rendering errors when rotating / unrotating a screen.

The dirty trackers weren't correctly translated to
pending presents / updates when a pixmap was bound as a scanout.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrants <jakob@vmware.com>
13 years agovmwgfx: A number of damage fixes
Thomas Hellstrom [Tue, 8 Nov 2011 13:49:36 +0000 (14:49 +0100)]
vmwgfx: A number of damage fixes

A damage tracker was sometimes attached to a pixmap in the middle of an
operation. That meant that damage was never registered for that operation
which caused dirty-tracking to fail. Instead, add a damage tracker as
soon as we have storage attached to the pixmap.

Also, when a pixmap was resized, the dirty region trackers could become
stale, and cause DMA operation extending outside of the pixmap with
server crashes as a result. This commit fixes that.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Add an option to use a scanout surface
Thomas Hellstrom [Tue, 1 Nov 2011 14:39:07 +0000 (15:39 +0100)]
vmwgfx: Add an option to use a scanout surface

With this option enabled, we compose all contents (both sw and hw) in
the guest before presenting it. Just like the old xorg state tracker did
when 3D was enabled. It's not as bad as the old xorg state tracker was for
interactivity, but there's a small but noticeable lag when moving windows.

It's mainly intended for testing purposes, like testing the surface
dirty paths in the kernel module.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Be correct when setting up damage tracking
Thomas Hellstrom [Tue, 1 Nov 2011 08:59:18 +0000 (09:59 +0100)]
vmwgfx: Be correct when setting up damage tracking

When setting up damage tracking, previously the code would guess wether
sw or hw was currently dirty. The caller always have that information,
so pass it to the damage tracking setup function.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Add an option for direct presents
Thomas Hellstrom [Tue, 1 Nov 2011 07:38:52 +0000 (08:38 +0100)]
vmwgfx: Add an option for direct presents

With this option set to true, accelerated copies to a scanout pixmap will
be performed as hardware presents instead of copies to an intermediate
3D surface backing the scanout pixmap, followed by a present.

Depending on the application this might be a performance boost, but since
it might trigger device software readbacks in other situations, for example
dri2 copy front->fake_front, it might be a performance hog in other situations,
so disable it by default. (Before this commit it was enabled by default).

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Fix acceleration options.
Thomas Hellstrom [Mon, 31 Oct 2011 14:14:21 +0000 (15:14 +0100)]
vmwgfx: Fix acceleration options.

Introduce relevant acceleration options and fix up the log printout.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Alan Hourihane <alanh@vmware.com>
13 years agovmwgfx: Remove a couple of unused options
Thomas Hellstrom [Mon, 31 Oct 2011 13:40:55 +0000 (14:40 +0100)]
vmwgfx: Remove a couple of unused options

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Alan Hourihane <alanh@vmware.com>
13 years agovmwgfx: Don't do present readbacks per crtc
Thomas Hellstrom [Mon, 31 Oct 2011 13:27:29 +0000 (14:27 +0100)]
vmwgfx: Don't do present readbacks per crtc

The kernel now takes care of doing this the right way;
no need to duplicate that functionality.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Fall back to sw cursors if needed
Thomas Hellstrom [Mon, 31 Oct 2011 09:50:09 +0000 (10:50 +0100)]
vmwgfx: Fall back to sw cursors if needed

If there is a risc that we need two simultaneous cursors,
(two outputs showing the same contents, at least one of them explicit),
fall back to sw cursor.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Fix crtc position of transformed fb
Thomas Hellstrom [Wed, 26 Oct 2011 14:33:30 +0000 (16:33 +0200)]
vmwgfx: Fix crtc position of transformed fb

The fb allocated for transformed data always matches the scanout region,
so set the crtc origin to (0,0)

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Hook up vmwarectrl to the gui layout ioctl
Thomas Hellstrom [Wed, 26 Oct 2011 13:08:18 +0000 (15:08 +0200)]
vmwgfx: Hook up vmwarectrl to the gui layout ioctl

Requires drm 2.3.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Update the connector type name array
Thomas Hellstrom [Wed, 26 Oct 2011 05:28:31 +0000 (07:28 +0200)]
vmwgfx: Update the connector type name array

Also map connector types that are not in the array to "Unknown".

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agovmwgfx: Save the dri2 requested depth since it may differ from the drawable
Thomas Hellstrom [Fri, 21 Oct 2011 09:19:36 +0000 (11:19 +0200)]
vmwgfx: Save the dri2 requested depth since it may differ from the drawable
depth.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
13 years agoBuild fix for ABI version 12
Jeremy Huddleston [Fri, 7 Oct 2011 20:15:11 +0000 (13:15 -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>
13 years agoFix build failures resulting from changes to the swaps and swapl macros in recent...
Jeremy Huddleston [Fri, 7 Oct 2011 20:10:59 +0000 (13:10 -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>
13 years agoxf86-video-vmware 11.0.99.901 xf86-video-vmware-11.0.99.901
Thomas Hellstrom [Wed, 5 Oct 2011 11:33:17 +0000 (13:33 +0200)]
xf86-video-vmware 11.0.99.901

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
13 years agoUse dixLookupWindow instead of LookupWindow on Xorg 1.5 & later
Alan Coopersmith [Wed, 28 Sep 2011 02:31:22 +0000 (19:31 -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>