Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux...
authorDave Airlie <airlied@redhat.com>
Fri, 29 Apr 2016 04:27:50 +0000 (14:27 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 29 Apr 2016 04:27:50 +0000 (14:27 +1000)
commitd8ba5d60d59fd1db5b53c8a110c2f8321591a9d8
treee93fc174ca1511ef65823e9944fc8426a70af0fb
parent9a11d2e7e66b6b8764a2430686b8716637bf812e
parent7851496a32319237456919575e5f4ba62f74cc7d
Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes

three misc vmwgfx fixes

* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Fix order of operation
  drm/vmwgfx: use vmw_cmd_dx_cid_check for query commands.
  drm/vmwgfx: Enable SVGA_3D_CMD_DX_SET_PREDICATION