Merge branch 'topic/ppgtt' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 25 Jan 2014 20:14:57 +0000 (21:14 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 25 Jan 2014 20:14:57 +0000 (21:14 +0100)
commit0e5539b923e3cfb79512b61f6f6137f865160804
treecb4c21b9b4cda572d98492f6e0020dfb4fb51146
parentfc2c807b7a2b2ca8dbe2aed2f5ae730c19beeda5
parentf72d21eddfa900bfa2674195dcc0203e18d0cc62
Merge branch 'topic/ppgtt' into drm-intel-next-queued

Because whatever.*

* This should contain a fairly long list of issues and still
unresolved resgressions, but I didn't really get a vote.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
14 files changed:
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/intel_fbdev.c
drivers/gpu/drm/i915/intel_overlay.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_uncore.c