linux/include/drm
Linus Torvalds 94e0fb086f Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (57 commits)
  drm/i915: Handle ERESTARTSYS during page fault
  drm/i915: Warn before mmaping a purgeable buffer.
  drm/i915: Track purged state.
  drm/i915: Remove eviction debug spam
  drm/i915: Immediately discard any backing storage for uneeded objects
  drm/i915: Do not mis-classify clean objects as purgeable
  drm/i915: Whitespace correction for madv
  drm/i915: BUG_ON page refleak during unbind
  drm/i915: Search harder for a reusable object
  drm/i915: Clean up evict from list.
  drm/i915: Add tracepoints
  drm/i915: framebuffer compression for GM45+
  drm/i915: split display functions by chip type
  drm/i915: Skip the sanity checks if the current relocation is valid
  drm/i915: Check that the relocation points to within the target
  drm/i915: correct FBC update when pipe base update occurs
  drm/i915: blacklist Acer AspireOne lid status
  ACPI: make ACPI button funcs no-ops if not built in
  drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks
  drm/i915: intel_display.c handle latency variable efficiently
  ...

Fix up trivial conflicts in drivers/gpu/drm/i915/{i915_dma.c|i915_drv.h}
2009-09-24 10:30:41 -07:00
..
ttm Merge Linus master to drm-next 2009-08-20 13:38:04 +10:00
drm_cache.h drm/ttm: consolidate cache flushing code in one place. 2009-08-27 09:53:47 +10:00
drm_core.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
drm_crtc_helper.h drm/kms: add explicit encoder disable function and detach harder. 2009-09-02 09:42:59 +10:00
drm_crtc.h drm/kms: add a function that can add the mode for the output device without EDID 2009-09-07 18:44:40 +10:00
drm_edid.h drm: Fix shifts which were miscalculated when converting from bitfields. 2009-06-24 16:11:04 +10:00
drm_encoder_slave.h drm/kms: no need to return void value (encoder) 2009-08-19 16:06:49 +10:00
drm_fb_helper.h drm/kms: move driver specific fb common code to helper functions (v2) 2009-08-31 09:09:31 +10:00
drm_hashtab.h drm: include kernel list header file in hashtab header 2009-06-12 15:56:34 +10:00
drm_memory.h includecheck fix: include/drm, drm_memory.h 2009-09-20 16:02:58 +05:30
drm_mm.h drm: include seq_file.h for debugfs builds. 2009-09-08 11:32:08 +10:00
drm_mode.h drm: clarify scaling property names 2009-08-19 16:06:40 +10:00
drm_os_linux.h drm: fix missing inline function on 32-bit powerpc. 2009-04-03 09:07:07 +10:00
drm_pciids.h drm/i915: add B43 chipset support 2009-09-08 23:33:26 -07:00
drm_sarea.h drm: move to kref per-master structures. 2008-12-29 17:47:22 +10:00
drm_sman.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
drm_sysfs.h drm: Enable drm drivers to add drm sysfs devices. 2009-08-19 16:08:51 +10:00
drm.h make drm headers use strict integer types 2009-03-26 18:14:18 +01:00
drmP.h drm/vgaarb: add VGA arbitration support to the drm and kms. 2009-09-21 15:00:27 +10:00
i810_drm.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
i830_drm.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
i915_drm.h drm/i915: Track purged state. 2009-09-23 01:10:38 +01:00
Kbuild DRM: add mode setting support 2008-12-29 17:47:23 +10:00
mga_drm.h make drm headers use strict integer types 2009-03-26 18:14:18 +01:00
r128_drm.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
radeon_drm.h drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian. 2009-09-18 16:01:59 +10:00
savage_drm.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
sis_drm.h drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00
via_drm.h make drm headers use strict integer types 2009-03-26 18:14:18 +01:00