From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jul 2010 01:48:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt... 
X-Git-Tag: v2.6.35-rc4~10
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=97e0214044d9f279a3d6286c9f859696ef0b7ebe

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: fix page flip finish vs. prepare on plane B
  drm/i915: change default panel fitting mode to preserve aspect ratio
  drm/i915: fix uninitialized variable warning in i915_setup_compression()
  drm/i915: take struct_mutex in i915_dma_cleanup()
  drm/i915: Fix CRT hotplug regression in 2.6.35-rc1
  i915: fix ironlake edp panel setup (v4)
  drm/i915: don't access FW_BLC_SELF on 965G
  drm/i915: Account for space on the ring buffer consumed whilst wrapping.
  drm/i915: gen3 page flipping fixes
  drm/i915: don't queue flips during a flip pending event
  drm/i915: Fix incorrect intel_ring_begin size in BSD ringbuffer.
  drm/i915: Turn on 945 self-refresh only if single CRTC is active
  drm/i915/gen4: Fix interrupt setup ordering
  drm/i915: Use RSEN instead of HTPLG for tfp410 monitor detection.
  drm/i915: Move non-phys cursors into the GTT
  Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."

(Included the "fix page flip finish vs.  prepare on plane B" patch from
Jesse on top of the pull request from Eric.   -- Linus)
---

97e0214044d9f279a3d6286c9f859696ef0b7ebe
diff --cc drivers/gpu/drm/i915/i915_dma.c
index 59a2bf8592e,e50ae3c6cb6..f00c5ae9556
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -1408,8 -1408,12 +1410,12 @@@ static int i915_load_modeset_init(struc
  					     i915_switcheroo_set_state,
  					     i915_switcheroo_can_switch);
  	if (ret)
 -		goto destroy_ringbuffer;
 +		goto cleanup_vga_client;
  
+ 	/* IIR "flip pending" bit means done if this bit is set */
+ 	if (IS_GEN3(dev) && (I915_READ(ECOSKPD) & ECO_FLIP_DONE))
+ 		dev_priv->flip_pending_is_done = true;
+ 
  	intel_modeset_init(dev);
  
  	ret = drm_irq_install(dev);