From: Dave Airlie <airlied@gmail.com>
Date: Tue, 27 Nov 2012 04:40:13 +0000 (+1000)
Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
X-Git-Tag: v3.7-rc8~19^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc15e04886d4fdc57f580ec4ae049aece8973e7;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel

Daniel writes:
- Unbreak mbp retina, this time with a much more fine-grained approach
   (since the previous "completely ignore edp vbt bpp value" regressed some
   machines even after fixing a bug in our dp bw code).
- Disable cloning on sdvo. It just doesn't work (yeah took us a while to
   figure out), leading to jittery outputs in the best case.
- Revert rc6 for ilk again. It seems to help a few of the gpu hang
  reporters at least, and it's definitely the best we've got.
  Head-against-the-wall-banging is still ongoing for what really breaks
  (and how we can reproduce the non-rc6 hangs and how to reproduce on
  gen4).
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  Revert "drm/i915: enable rc6 on ilk again"
  drm/i915: do not default to 18 bpp for eDP if missing from VBT
  drm/i915: disable cloning on sdvo
---

efc15e04886d4fdc57f580ec4ae049aece8973e7