tree 3081244133d5709df54e61da7e5aaf87f40cbfa2
parent 39dae59d66acd86d1de24294bd2f343fd5e7a625
parent cef75036c40408ba3bc308bcb00a3d440da713fc
author Dave Airlie <airlied@redhat.com> 1510038099 +1000
committer Dave Airlie <airlied@redhat.com> 1510038099 +1000

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

One vmwgfx blackscreen fix and trivial patch.

* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
  drm/vmwgfx: constify vmw_fence_ops