]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* '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

1  2 
drivers/gpu/drm/i915/intel_display.c

Simple merge