Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (39 commits) i915/gtt: fix ordering causing DMAR errors on object teardown. i915/gtt: fix ordering issues with status setup and DMAR drm/i915/execbuffer: Reorder binding of objects to favour restrictions drm/i915: If we hit OOM when allocating GTT pages, clear the aperture drm/i915/evict: Ensure we completely cleanup on failure drm/i915/execbuffer: Correctly clear the current object list upon EFAULT drm/i915/debugfs: Show all objects in the gtt drm/i915: Record AGP memory type upon error drm/i915: Periodically flush the active lists and requests drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT drm/i915: Record the error batchbuffer on each ring drm/i915: Include TLB miss overhead for computing WM drm/i915: Propagate error from flushing the ring drm/i915: detect & report PCH display error interrupts drm/i915: cleanup rc6 code drm/i915: fix rc6 enabling around suspend/resume drm/i915: re-enable rc6 support for Ironlake+ drm/i915: Make the ring IMR handling private drm/i915/ringbuffer: Simplify the ring irq refcounting drm/i915/debugfs: Show the per-ring IMR ...
Showing
- drivers/char/agp/intel-agp.h 2 additions, 0 deletionsdrivers/char/agp/intel-agp.h
- drivers/char/agp/intel-gtt.c 13 additions, 4 deletionsdrivers/char/agp/intel-gtt.c
- drivers/gpu/drm/i915/i915_debugfs.c 81 additions, 6 deletionsdrivers/gpu/drm/i915/i915_debugfs.c
- drivers/gpu/drm/i915/i915_dma.c 0 additions, 8 deletionsdrivers/gpu/drm/i915/i915_dma.c
- drivers/gpu/drm/i915/i915_drv.c 9 additions, 0 deletionsdrivers/gpu/drm/i915/i915_drv.c
- drivers/gpu/drm/i915/i915_drv.h 11 additions, 13 deletionsdrivers/gpu/drm/i915/i915_drv.h
- drivers/gpu/drm/i915/i915_gem.c 110 additions, 46 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_gem_evict.c 8 additions, 1 deletiondrivers/gpu/drm/i915/i915_gem_evict.c
- drivers/gpu/drm/i915/i915_gem_execbuffer.c 75 additions, 44 deletionsdrivers/gpu/drm/i915/i915_gem_execbuffer.c
- drivers/gpu/drm/i915/i915_gem_gtt.c 3 additions, 7 deletionsdrivers/gpu/drm/i915/i915_gem_gtt.c
- drivers/gpu/drm/i915/i915_irq.c 103 additions, 166 deletionsdrivers/gpu/drm/i915/i915_irq.c
- drivers/gpu/drm/i915/i915_reg.h 88 additions, 7 deletionsdrivers/gpu/drm/i915/i915_reg.h
- drivers/gpu/drm/i915/i915_suspend.c 2 additions, 6 deletionsdrivers/gpu/drm/i915/i915_suspend.c
- drivers/gpu/drm/i915/intel_crt.c 25 additions, 5 deletionsdrivers/gpu/drm/i915/intel_crt.c
- drivers/gpu/drm/i915/intel_display.c 248 additions, 186 deletionsdrivers/gpu/drm/i915/intel_display.c
- drivers/gpu/drm/i915/intel_dp.c 39 additions, 11 deletionsdrivers/gpu/drm/i915/intel_dp.c
- drivers/gpu/drm/i915/intel_drv.h 3 additions, 0 deletionsdrivers/gpu/drm/i915/intel_drv.h
- drivers/gpu/drm/i915/intel_fb.c 9 additions, 11 deletionsdrivers/gpu/drm/i915/intel_fb.c
- drivers/gpu/drm/i915/intel_lvds.c 6 additions, 8 deletionsdrivers/gpu/drm/i915/intel_lvds.c
- drivers/gpu/drm/i915/intel_panel.c 31 additions, 0 deletionsdrivers/gpu/drm/i915/intel_panel.c
Loading
Please register or sign in to comment