diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-21 09:46:26 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-21 09:46:26 +0100 |
| commit | 28adb3026d01da3f6acded3cec817e1a3ba37f44 (patch) | |
| tree | 26df1bf50f9ccf6fd282f3b22d103cb3b30ecaa3 /drivers/gpu/drm/vmwgfx/Makefile | |
| parent | Merge tag 'drm-intel-fixes-2013-11-20' of git://people.freedesktop.org/~danve... (diff) | |
| parent | drm/vmwgfx: Make vmwgfx dma buffers prime aware (diff) | |
| download | linux-28adb3026d01da3f6acded3cec817e1a3ba37f44.tar.xz linux-28adb3026d01da3f6acded3cec817e1a3ba37f44.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/Makefile')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile index 2cc6cd91ac11..9f8b690bcf52 100644 --- a/drivers/gpu/drm/vmwgfx/Makefile +++ b/drivers/gpu/drm/vmwgfx/Makefile @@ -6,6 +6,6 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \ vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \ - vmwgfx_surface.o + vmwgfx_surface.o vmwgfx_prime.o obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o |