From: Dave Airlie Date: Thu, 21 Nov 2013 08:46:26 +0000 (+1000) Subject: Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=28adb3026d01da3f6acded3cec817e1a3ba37f44;p=deliverable%2Flinux.git 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 --- 28adb3026d01da3f6acded3cec817e1a3ba37f44