From: Dave Airlie <airlied@gmail.com>
Date: Sat, 26 Jan 2013 08:17:39 +0000 (+1000)
Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=483674325f64a37c7696edb12ce6ad3e535421bc;p=linux-beck.git

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
---

483674325f64a37c7696edb12ce6ad3e535421bc