linux/drivers/gpu/drm/vmwgfx
Linus Torvalds 1a464cbb3d Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
  drm/nouveau/pm: fix build with HWMON off
  gma500: silence gcc warnings in mid_get_vbt_data()
  drm/ttm: fix condition (and vs or)
  drm/radeon: double lock typo in radeon_vm_bo_rmv()
  drm/radeon: use after free in radeon_vm_bo_add()
  drm/sis|via: don't return stack garbage from free_mem ioctl
  drm/radeon/kms: remove pointless CS flags priority struct
  drm/radeon/kms: check if vm is supported in VA ioctl
  drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
  radeon: Fix disabling PCI bus mastering on big endian hosts.
  ttm: fix agp since ttm tt rework
  agp: Fix multi-line warning message whitespace
  drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
  drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
  drm/radeon/kms: sync across multiple rings when doing bo moves v3
  drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
  drm/radeon: GPU virtual memory support v22
  drm: make DRM_UNLOCKED ioctls with their own mutex
  drm: no need to hold global mutex for static data
  drm/radeon/benchmark: common modes sweep ignores 640x480@32
  ...

Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c
2012-01-10 11:04:36 -08: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 branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux 2012-01-10 11:04:36 -08: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 drm/vmwgfx: Add DRM driver for VMware Virtual GPU 2009-12-15 08:38:43 +10:00
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