tree 26df1bf50f9ccf6fd282f3b22d103cb3b30ecaa3
parent cf969677945e6e19810d616873617320da002e32
parent c486d4f894d7c7d0e4148426360aa354384f6dc8
author Dave Airlie <airlied@redhat.com> 1385023586 +1000
committer Dave Airlie <airlied@redhat.com> 1385023586 +1000

Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Below is a fix for a false lockep warning,
and the vmwgfx prime implementation.

* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Make vmwgfx dma buffers prime aware
  drm/vmwgfx: Make surfaces prime-aware
  drm/vmwgfx: Hook up the prime ioctls
  drm/ttm: Add a minimal prime implementation for ttm base objects
  drm/vmwgfx: Fix false lockdep warning
  drm/ttm: Allow execbuf util reserves without ticket