Dave Airlie 1fbe6f625f Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next ...

Merge in the upstream tree to bring in the mainline fixes.

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c

2011-12-20 14:43:53 +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

drm/vmwgfx: Add svga headers for vmwgfx driver

2009-12-15 08:38:36 +10:00

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: Reinstate the update_layout ioctl

2011-11-02 08:30:31 +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: Add fence events

2011-10-10 15:46:55 +01: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: Use kcalloc instead of kzalloc to allocate array

2011-12-07 10:44:41 +00:00

vmwgfx_irq.c

vmwgfx: Add fence events

2011-10-10 15:46:55 +01:00

vmwgfx_kms.c

Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

2011-12-20 14:43:53 +00:00

vmwgfx_kms.h

drm: add an fb creation ioctl that takes a pixel format v5

2011-11-15 19:53:23 +00:00

vmwgfx_ldu.c

drm: Replace pitch with pitches[] in drm_framebuffer

2011-12-20 10:06:27 +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

drm/vmwgfx: Add DRM driver for VMware Virtual GPU

2009-12-15 08:38:43 +10:00

vmwgfx_resource.c

drm/ttm: simplify memory accounting for ttm user v2

2011-12-06 10:40:11 +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