Merge tag 'vmwgfx-fixes-4.3-150924' of git://people.freedesktop.org/~thomash/linux...

Pull request of 2015-09-24

Vmwgfx fixes for 4.3:
 - A couple of uninitialized variable fixes by Christian Engelmayer
 - A TTM fix for a bug that causes problems with the new vmwgfx device init
 - A vmwgfx refcounting fix
 - A vmwgfx iomem caching fix
 - A DRM change to allow also control clients to read the drm driver version.

* tag 'vmwgfx-fixes-4.3-150924' of git://people.freedesktop.org/~thomash/linux:
  drm: Allow also control clients to check the drm version
  drm/vmwgfx: Fix uninitialized return in vmw_kms_helper_dirty()
  drm/vmwgfx: Fix uninitialized return in vmw_cotable_unbind()
  drm/vmwgfx: Only build on X86
  drm/ttm: Fix memory space allocation v2
  drm/vmwgfx: Map the fifo as cached
  drm/vmwgfx: Fix up user_dmabuf refcounting

diff --combined drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 6d02de6,a20f482..f19fd39
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@@ -240,7 -240,7 +240,7 @@@ enum vmw_dma_map_mode 
   * device-specific information.
   *
   * @sgt: Pointer to a struct sg_table with binding information
 - * @num_regions: Number of regions with device-address contigous pages
 + * @num_regions: Number of regions with device-address contiguous pages
   */
  struct vmw_sg_table {
        enum vmw_dma_map_mode mode;
@@@ -376,7 -376,6 +376,6 @@@ struct vmw_private 
        uint32_t initial_width;
        uint32_t initial_height;
        u32 __iomem *mmio_virt;
-       int mmio_mtrr;
        uint32_t capabilities;
        uint32_t max_gmr_ids;
        uint32_t max_gmr_pages;
@@@ -631,7 -630,8 +630,8 @@@ extern int vmw_user_dmabuf_alloc(struc
                                 uint32_t size,
                                 bool shareable,
                                 uint32_t *handle,
-                                struct vmw_dma_buffer **p_dma_buf);
+                                struct vmw_dma_buffer **p_dma_buf,
+                                struct ttm_base_object **p_base);
  extern int vmw_user_dmabuf_reference(struct ttm_object_file *tfile,
                                     struct vmw_dma_buffer *dma_buf,
                                     uint32_t *handle);
@@@ -645,7 -645,8 +645,8 @@@ extern uint32_t vmw_dmabuf_validate_nod
                                         uint32_t cur_validate_node);
  extern void vmw_dmabuf_validate_clear(struct ttm_buffer_object *bo);
  extern int vmw_user_dmabuf_lookup(struct ttm_object_file *tfile,
-                                 uint32_t id, struct vmw_dma_buffer **out);
+                                 uint32_t id, struct vmw_dma_buffer **out,
+                                 struct ttm_base_object **base);
  extern int vmw_stream_claim_ioctl(struct drm_device *dev, void *data,
                                  struct drm_file *file_priv);
  extern int vmw_stream_unref_ioctl(struct drm_device *dev, void *data,