]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 21 Nov 2013 08:46:26 +0000 (18:46 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 21 Nov 2013 08:46:26 +0000 (18:46 +1000)
commit2b7c936b9816f131abcc88d99eb9666150fb18ea
tree26df1bf50f9ccf6fd282f3b22d103cb3b30ecaa3
parent72d84aa66de218dceef35b56bf3ffd6999aa74b4
parent02e75fc6cc01430565e5ba4bfc5e5fec7df4a314
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