Here's another handful of fixes that I had merged to
drm-intel-next. Once these are merged, I'll move drm-intel-fixes and
start putting stuff there for 3.0.

The following changes since commit 9e3c256d7d56a12a3242222945ce8e6347f93fa0:

  drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge (2011-05-18 15:14:39 -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

Chris Wilson (5):
      drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/
      drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0
      drm/i915/crt: Explicitly return false if connected to a digital monitor
      drm/i915: Remove unused enum "chip_family"
      drm/i915: Share the common force-audio property between connectors

Dan Carpenter (1):
      drm/i915: fix if statement in ivybridge irq handler

Daniel Vetter (3):
      drm/i915: Only print out the actual number of fences for i915_error_state
      drm/i915: not finding a fence is a non-recoverable condition
      drm/915: fix relaxed tiling on gen2: tile height

Jason Stubbs (1):
      drm/i915: fix regression after clock gating init split

Nicolas Kaiser (1):
      drm: i915: correct return status in intel_hdmi_mode_valid()

 drivers/gpu/drm/i915/i915_debugfs.c  |    2 +-
 drivers/gpu/drm/i915/i915_drv.h      |    8 +---
 drivers/gpu/drm/i915/i915_gem.c      |   28 +++++-----
 drivers/gpu/drm/i915/i915_irq.c      |    2 +-
 drivers/gpu/drm/i915/intel_crt.c     |    4 ++
 drivers/gpu/drm/i915/intel_display.c |   89 ++++++++--------------------------
 drivers/gpu/drm/i915/intel_dp.c      |   15 +-----
 drivers/gpu/drm/i915/intel_drv.h     |    1 +
 drivers/gpu/drm/i915/intel_hdmi.c    |   16 +-----
 drivers/gpu/drm/i915/intel_modes.c   |   30 +++++++++++
 drivers/gpu/drm/i915/intel_sdvo.c    |   14 +-----
 11 files changed, 80 insertions(+), 129 deletions(-)


-- 
keith.packard@intel.com