From: Dave Airlie <airlied@redhat.com>
Date: Thu, 25 Feb 2010 03:39:36 +0000 (+1000)
Subject: Merge remote branch 'anholt/drm-intel-next' into drm-next-stage
X-Git-Tag: v2.6.34-rc1~209^2~11^2~24
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=30d6c72c4a760cfc9069ee100786e4d6cf6de59d;p=linux-block.git

Merge remote branch 'anholt/drm-intel-next' into drm-next-stage

* anholt/drm-intel-next:
  drm/i915: Record batch buffer following GPU error
  drm/i915: give up on 8xx lid status
  drm/i915: reduce some of the duplication of tiling checking
  drm/i915: blow away userspace mappings before fence change
  drm/i915: move a gtt flush to the correct place
  agp/intel: official names for Pineview and Ironlake
  drm/i915: overlay: drop superflous gpu flushes
  drm/i915: overlay: nuke readback to flush wc caches
  drm/i915: provide self-refresh status in debugfs
  drm/i915: provide FBC status in debugfs
  drm/i915: fix drps disable so unload & re-load works
  drm/i915: Fix OGLC performance regression on 945
  drm/i915: Deobfuscate the render p-state obfuscation
  drm/i915: add dynamic performance control support for Ironlake
  drm/i915: enable memory self refresh on 9xx
  drm/i915: Don't reserve compatibility fence regs in KMS mode.
  drm/i915: Keep MCHBAR always enabled
  drm/i915: Replace open-coded eviction in i915_gem_idle()
---

30d6c72c4a760cfc9069ee100786e4d6cf6de59d