tree e93fc174ca1511ef65823e9944fc8426a70af0fb
parent 9a11d2e7e66b6b8764a2430686b8716637bf812e
parent 7851496a32319237456919575e5f4ba62f74cc7d
author Dave Airlie <airlied@redhat.com> 1461904070 +1000
committer Dave Airlie <airlied@redhat.com> 1461904070 +1000

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