[PULL] drm-intel-next

[Keith Packard]

I've pushed four more patches to this branch for your merging pleasure.

>  * Disabling FBC on Ironlake to enable RC6 instead

Two patches for this are included.

The following changes since commit 645c62a5e95a5f9a8e0d0627446bbda4ee042024:

  drm/i915: split PCH clock gating init (2011-05-13 18:12:53 -0700)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next

Feng, Boqun (2):
      drm/i915: fix user irq miss in BSD ring on g4x
      drm/i915: clean up unused ring_get_irq/ring_put_irq functions

Jesse Barnes (2):
      drm/i915: add fbc enable flag, but disable by default
      drm/i915: enable rc6 by default

 drivers/gpu/drm/i915/i915_debugfs.c     |    3 ++
 drivers/gpu/drm/i915/i915_drv.c         |    7 +++-
 drivers/gpu/drm/i915/i915_drv.h         |    2 +
 drivers/gpu/drm/i915/intel_display.c    |    5 +++
 drivers/gpu/drm/i915/intel_ringbuffer.c |   50 ++++++++++++++----------------
 5 files changed, 38 insertions(+), 29 deletions(-)

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20110517/c5b7fa2e/attachment.pgp>