linux/include/drm
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
..
i2c
ttm
drm_buffer.h
drm_cache.h
drm_core.h
drm_crtc_helper.h
drm_crtc.h
drm_dp_helper.h
drm_edid.h
drm_encoder_slave.h
drm_fb_helper.h
drm_fixed.h
drm_fourcc.h
drm_global.h
drm_hashtab.h
drm_mem_util.h
drm_memory.h
drm_mm.h
drm_mode.h
drm_os_linux.h
drm_pciids.h
drm_sarea.h
drm_sysfs.h
drm_usb.h
drm.h
drmP.h Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux 2012-01-10 11:04:36 -08:00
exynos_drm.h
gma_drm.h
i810_drm.h
i915_drm.h
intel-gtt.h
Kbuild
mga_drm.h
nouveau_drm.h
r128_drm.h
radeon_drm.h
savage_drm.h
sis_drm.h
via_drm.h
vmwgfx_drm.h