diff options
| author | Dave Airlie <airlied@gmail.com> | 2013-01-26 18:17:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-01-26 18:17:39 +1000 |
| commit | 483674325f64a37c7696edb12ce6ad3e535421bc (patch) | |
| tree | b9b334854ad4fa931b211f0f44a47e4d75d3c514 /include/linux/btree.h | |
| parent | f0f21aa53a30fffd69899794da3a077960f27771 (diff) | |
| parent | 4518f611ba21ba165ea3714055938a8984a44ff9 (diff) | |
| download | talos-obmc-linux-483674325f64a37c7696edb12ce6ad3e535421bc.tar.gz talos-obmc-linux-483674325f64a37c7696edb12ce6ad3e535421bc.zip | |
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
Diffstat (limited to 'include/linux/btree.h')
0 files changed, 0 insertions, 0 deletions
