Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...
authorDave Airlie <airlied@redhat.com>
Tue, 21 Aug 2012 23:19:40 +0000 (09:19 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 21 Aug 2012 23:19:40 +0000 (09:19 +1000)
commit85119c16b34526b2b3c33b01ac6d770aa4431434
tree6516fb3ac367a1296a21d6e0062b74985f8c0f45
parente2be2cd8046748a006c4afa40959855fe4079274
parent1ee9ae3244c4789f3184c5123f3b2d7e405b3f4c
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Daniel writes:

" Nothing too major:
- A few fixes around the edid handling from Jani, also fixing a regression
  in 3.5 due to us using gmbus by default.
- Fixup hsw uncached pte flags.
- Fix suspend/resume crash when using hw contexts, from Ben.
- Try to tune gpu turbo a bit better, seems to help with some oddball
  power regressions."

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: use hsw rps tuning values everywhere on gen6+
  drm/i915: fall back to bit-banging if GMBUS fails in CRT EDID reads
  drm/i915: extract connector update from intel_ddc_get_modes() for reuse
  drm/i915: fix hsw uncached pte
  drm/i915/contexts: fix list corruption
  drm/i915: fix EDID memory leak in SDVO