Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
Just a few small things: - 2x workaround bits from Chris to fix up the new scanline waits enabled in 3.8 on snb. People who've been struck by this on dual-screen also need to upgrade the ddx. - Dump the kernel version into i915_error_state, we've had a few mixups there recently. - Disable gfx DMAR on gen4 devices, acked by David Woodhouse. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: dump UTS_RELEASE into the error_state iommu/intel: disable DMAR for g4x integrated gfx drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits drm/i915: Disable AsyncFlip performance optimisations
No related branches found
No related tags found
Showing
- drivers/gpu/drm/i915/i915_debugfs.c 2 additions, 0 deletionsdrivers/gpu/drm/i915/i915_debugfs.c
- drivers/gpu/drm/i915/i915_reg.h 1 addition, 0 deletionsdrivers/gpu/drm/i915/i915_reg.h
- drivers/gpu/drm/i915/intel_ringbuffer.c 18 additions, 6 deletionsdrivers/gpu/drm/i915/intel_ringbuffer.c
- drivers/iommu/intel-iommu.c 15 additions, 6 deletionsdrivers/iommu/intel-iommu.c
Loading
Please register or sign in to comment