forked from Minki/linux
94e0fb086f
* '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}
|
||
|---|---|---|
| .. | ||
| agp.h | ||
| ali-agp.c | ||
| alpha-agp.c | ||
| amd64-agp.c | ||
| amd-k7-agp.c | ||
| ati-agp.c | ||
| backend.c | ||
| compat_ioctl.c | ||
| compat_ioctl.h | ||
| efficeon-agp.c | ||
| frontend.c | ||
| generic.c | ||
| hp-agp.c | ||
| i460-agp.c | ||
| intel-agp.c | ||
| isoch.c | ||
| Kconfig | ||
| Makefile | ||
| nvidia-agp.c | ||
| parisc-agp.c | ||
| sgi-agp.c | ||
| sis-agp.c | ||
| sworks-agp.c | ||
| uninorth-agp.c | ||
| via-agp.c | ||