Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarn...
authorDave Airlie <airlied@redhat.com>
Wed, 22 Feb 2012 08:02:17 +0000 (08:02 +0000)
committerDave Airlie <airlied@redhat.com>
Wed, 22 Feb 2012 08:02:17 +0000 (08:02 +0000)
commitbb757a7e251f73ce6626689f8be4bb8ba86933cd
tree17cc7b2858c4d8ddaf6acd94ab45b033f450f4dd
parent53ef299f3900bc1deb163b94d4f1cac4f3346152
parent1c8ecf80fdee4e7b23a9e7da7ff9bd59ba2dcf96
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
drivers/gpu/drm/i915/intel_display.c