linux/include/drm
Dave Airlie 7547a917fa Merge branch 'drm-ttm-unmappable' into drm-core-next
* drm-ttm-unmappable:
  drm/radeon/kms: enable use of unmappable VRAM V2
  drm/ttm: remove io_ field from TTM V6
  drm/vmwgfx: add support for new TTM fault callback V5
  drm/nouveau/kms: add support for new TTM fault callback V5
  drm/radeon/kms: add support for new fault callback V7
  drm/ttm: ttm_fault callback to allow driver to handle bo placement V6
  drm/ttm: split no_wait argument in 2 GPU or reserve wait

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_bo.c
2010-04-20 14:15:09 +10:00
..
i2c drm/nouveau: Add DRM driver for NVIDIA GPUs 2009-12-11 21:29:34 +10:00
ttm Merge branch 'drm-ttm-unmappable' into drm-core-next 2010-04-20 14:15:09 +10:00
drm_buffer.h drm: Add generic multipart buffer. 2010-02-23 09:46:20 +10:00
drm_cache.h
drm_core.h
drm_crtc_helper.h drm/kms/fb: separate fbdev connector list from core drm connectors 2010-04-07 10:28:01 +10:00
drm_crtc.h Merge branch 'drm-fbdev-cleanup' into drm-core-next 2010-04-20 13:16:04 +10:00
drm_dp_helper.h drm/radeon/kms: add support for DP modesetting 2009-12-08 10:22:44 +10:00
drm_edid.h drm/edid: Remove arbitrary EDID extension limit 2010-04-06 10:40:20 +10:00
drm_encoder_slave.h
drm_fb_helper.h drm/kms/fb: use slow work mechanism for normal hotplug also. 2010-04-07 10:30:38 +10:00
drm_hashtab.h
drm_mem_util.h drm/ttm: use drm calloc large and free large 2010-03-15 10:31:43 +10:00
drm_memory.h
drm_mm.h drm: Add memory manager debug function 2009-12-10 15:28:06 +10:00
drm_mode.h drm/kms: Remove incorrect comment in struct drm_mode_modeinfo 2010-02-01 11:26:39 +10:00
drm_os_linux.h drm/i915: add i915_lp_ring_sync helper 2009-11-05 14:47:07 -08:00
drm_pciids.h drm/radeon/kms: add FireMV 2400 PCI ID. 2010-04-19 18:53:10 +10:00
drm_sarea.h
drm_sman.h
drm_sysfs.h
drm.h Merge remote branch 'anholt/drm-intel-next' into drm-linus 2009-12-08 14:03:47 +10:00
drmP.h drm: free core gem object from driver callbacks 2010-04-20 13:19:33 +10:00
i810_drm.h
i830_drm.h
i915_drm.h drm/i915: execbuf2 support 2010-01-06 09:39:39 -08:00
Kbuild Merge remote branch 'korg/drm-vmware-staging' into drm-core-next 2009-12-18 09:53:50 +10:00
mga_drm.h drm: Add compatibility #ifdefs for *BSD 2009-12-04 08:59:28 +10:00
nouveau_drm.h drm/nouveau: new gem pushbuf interface, bump to 0.0.16 2010-02-25 15:08:44 +10:00
r128_drm.h
radeon_drm.h drm/radeon/kms: add support for square microtiles on r3xx-r5xx 2010-02-25 11:36:12 +10:00
savage_drm.h
sis_drm.h
via_drm.h drm: Add compatibility #ifdefs for *BSD 2009-12-04 08:59:28 +10:00
vmwgfx_drm.h drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major. 2010-02-11 12:03:26 +10:00