xf86-video-vmware: Changes to 'master'

[Thomas Hellstrom]

 vmwgfx/vmwgfx_saa.c        |   11 +++++---
 vmwgfx/vmwgfx_saa_priv.h   |   11 ++++++++
 vmwgfx/vmwgfx_xa_surface.c |   61 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 72 insertions(+), 11 deletions(-)

New commits:
commit 64e0faf1480663a990e0f6aeef7af0e69845af49
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Wed Apr 2 14:05:23 2014 +0200

    vmware/vmwgfx: Don't tell XA that we have a mask when we haven't
    
    In some cases, the X server sends us a composit operation with
    mask_pict != NULL, but mask_pix == NULL. Assume there's no mask
    involved in that case.
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
    Reviewed-by: Brian Paul <brianp at vmware.com>

commit c062d08a50a26c99a3b8f565a8b2b00e8dc21c3f
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Thu Jan 16 18:27:57 2014 +0100

    vmware/vmwgfx: Don't change backing-store of active scanout surfaces
    
    With option "HwPresents" on, the driver would sometimes change backing
    store of active scanout surfaces, making the kernel module refuse to
    present. This was caused by scanout surfaces not having the RENDERTARGET flag
    on by default. So when rendered to, using copies or composites, they
    would be reallocated. Fix this by adding the RENDERTARGET flag from start.
    
    Also add code that prints out an error message when we change backing store
    of active scanout surfaces
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
    Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>