From: Dave Airlie <airlied@redhat.com>
Date: Wed, 22 Feb 2012 08:02:17 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarn... 
X-Git-Tag: upstream/snapshot3+hdmi~8114^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb757a7e251f73ce6626689f8be4bb8ba86933cd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/jbarnes/drm-intel into drm-fixes

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
  drm/i915: do not enable RC6p on Sandy Bridge
  drm/i915: gen7: Disable the RHWO optimization as it can cause GPU hangs.
  drm/i915: gen7: work around a system hang on IVB
  drm/i915: gen7: Implement an L3 caching workaround.
  drm/i915: gen7: implement rczunit workaround
---

bb757a7e251f73ce6626689f8be4bb8ba86933cd