Dave Airlie 4cf73129cb Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next ... -next reported a messy merge, so I've merged my upstream pull into my -next tree. Conflicts: drivers/gpu/drm/vmwgfx/vmwgfx_kms.c		2011-12-21 09:50:56 +00:00
..
Kconfig	vmwgfx: Take the driver out of staging	2011-10-11 13:06:36 +01:00
Makefile	vmwgfx: Add screen object support	2011-10-05 10:17:14 +01:00
svga3d_reg.h	vmwgfx: Update register files to latest from vmware-sdk	2011-10-05 10:17:08 +01:00
svga_escape.h	vmwgfx: Update register files to latest from vmware-sdk	2011-10-05 10:17:08 +01:00
svga_overlay.h	vmwgfx: Update register files to latest from vmware-sdk	2011-10-05 10:17:08 +01:00
svga_reg.h	vmwgfx: Update register files to latest from vmware-sdk	2011-10-05 10:17:08 +01:00
svga_types.h
vmwgfx_buffer.c	drm/ttm: isolate dma data from ttm_tt V4	2011-12-06 10:40:02 +00:00
vmwgfx_dmabuf.c	vmwgfx: Fix up query processing	2011-10-05 10:17:22 +01:00
vmwgfx_drv.c	drm: Make the per-driver file_operations struct const	2011-11-11 11:14:47 +00:00
vmwgfx_drv.h	vmwgfx: Add helper function to get surface or dmabuf	2011-12-19 14:06:02 +00:00
vmwgfx_execbuf.c	Revert "drm/ttm: add a way to bo_wait for either the last read or last write"	2011-10-27 18:28:37 +02:00
vmwgfx_fb.c	gpu: Add export.h as required to drivers/gpu files.	2011-10-31 19:32:03 -04:00
vmwgfx_fence.c	vmwgfx: memory leaks caused by double allocation	2011-10-18 10:41:31 +01:00
vmwgfx_fence.h	vmwgfx: Add fence events	2011-10-10 15:46:55 +01:00
vmwgfx_fifo.c	vmwgfx: Use the revised fifo hw version register when present	2011-12-19 14:06:00 +00:00
vmwgfx_gmr.c	vmwgfx: Implement GMR2	2011-09-01 09:39:25 +01:00
vmwgfx_gmrid_manager.c	vmwgfx: Restrict number of GMR pages to device limit	2011-09-01 09:38:07 +01:00
vmwgfx_ioctl.c	vmwgfx: Remove dmabuf check in present ioctl	2011-12-19 14:06:01 +00:00
vmwgfx_irq.c	vmwgfx: Add fence events	2011-10-10 15:46:55 +01:00
vmwgfx_kms.c	Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next	2011-12-21 09:50:56 +00:00
vmwgfx_kms.h	Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next	2011-12-21 09:50:56 +00:00
vmwgfx_ldu.c	Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next	2011-12-21 09:50:56 +00:00
vmwgfx_marker.c	vmwgfx: Fix confusion caused by using "fence" in various places	2011-09-06 11:48:40 +01:00
vmwgfx_overlay.c	vmwgfx: minor dmabuf utilities cleanup	2011-10-05 10:17:20 +01:00
vmwgfx_reg.h
vmwgfx_resource.c	Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next	2011-12-21 09:50:56 +00:00
vmwgfx_scrn.c	vmwgfx: Infrastructure for explicit placement	2011-11-07 13:15:18 +00:00
vmwgfx_ttm_glue.c	vmwgfx: Remove the possibility to map the fifo from user-space	2011-09-06 11:48:34 +01:00