tree b43ad7967e14f77a327e4e6cef0fc7e72849b1ad
parent 71404e8a88fa4a94b3833ccc853c322fd33336d7
parent 58541f7a6458e17ab417321b284f0090f530aa91
author Dave Airlie <airlied@redhat.com> 1468554715 +1000
committer Dave Airlie <airlied@redhat.com> 1468554715 +1000

Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes

A bunch of vmwgfx fixes that fix a black screen issue on latest distros/hw combos.

* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Fix error paths when mapping framebuffer
  drm/vmwgfx: Fix corner case screen target management
  drm/vmwgfx: Delay pinning fbdev framebuffer until after mode set
  drm/vmwgfx: Check pin count before attempting to move a buffer
  drm/ttm: Make ttm_bo_mem_compat available
  drm/vmwgfx: Add an option to change assumed FB bpp
  drm/vmwgfx: Work around mode set failure in 2D VMs
  drm/vmwgfx: Add a check to handle host message failure