From: Dave Airlie <airlied@redhat.com>
Date: Fri, 8 Feb 2013 01:08:10 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet/drm... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cd17ef4114ad5c514b17e6a0bb02a309ab90b692;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

Daniel writes:
"Probably the last feature pull for 3.9, there's some fixes outstanding
thought that I'd like to sneak in. And maybe 3.8 takes a bit longer ...
Anyway, highlights of this pull:
- Kill the horrible IS_DISPLAYREG hack to handle the mmio offset movements
  on vlv, big thanks to Ville.
- Dynamic power well support for Haswell, shaves away a bit when only
  using the eDP port on pipe A (Paulo). Plus unclaimed register fixes
  uncovered by this.
- Clarifications of the gpu hang/reset state transitions, hopefully fixing
  a few spurious -EIO deaths in userspace.
- Haswell ELD fixes.
- Some more (pp)gtt cleanups from Ben.
- A few smaller things all over.

Plus all the stuff from the previous rather small pull request:
- Broadcast RBG improvements and reduced color range fixes from Ville.
- Ben is on a "kill legacy gtt code for good" spree, first pile of patches
  included.
- No-relocs and bo lut improvements for faster execbuf from Chris.
- Some refactorings from Imre."

* tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet/drm-intel: (101 commits)
  GPU/i915: Fix acpi_bus_get_device() check in drivers/gpu/drm/i915/intel_opregion.c
  drm/i915: Set the SR01 "screen off" bit in i915_redisable_vga() too
  drm/i915: Kill IS_DISPLAYREG()
  drm/i915: Introduce i915_vgacntrl_reg()
  drm/i915: gen6_gmch_remove can be static
  drm/i915: dynamic Haswell display power well support
  drm/i915: check the power down well on assert_pipe()
  drm/i915: don't send DP "idle" pattern before "normal" on HSW PORT_A
  drm/i915: don't run hsw power well code on !hsw
  drm/i915: kill cargo-culted locking from power well code
  drm/i915: Only run idle processing from i915_gem_retire_requests_worker
  drm/i915: Fix CAGF for HSW
  drm/i915: Reclaim GTT space for failed PPGTT
  drm/i915: remove intel_gtt structure
  drm/i915: Add probe and remove to the gtt ops
  drm/i915: extract hw ppgtt setup/cleanup code
  drm/i915: pte_encode is gen6+
  drm/i915: vfuncs for ppgtt
  drm/i915: vfuncs for gtt_clear_range/insert_entries
  drm/i915: Error state should print /sys/kernel/debug
  ...
---

cd17ef4114ad5c514b17e6a0bb02a309ab90b692
diff --cc drivers/gpu/drm/i915/intel_fb.c
index 755c27450a2c,6591029ac0d7..1c510da04d16
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@@ -306,7 -304,8 +305,8 @@@ void intel_fb_restore_mode(struct drm_d
  
  	/* Be sure to shut off any planes that may be active */
  	list_for_each_entry(plane, &config->plane_list, head)
- 		plane->funcs->disable_plane(plane);
+ 		if (plane->enabled)
+ 			plane->funcs->disable_plane(plane);
  
 -	mutex_unlock(&dev->mode_config.mutex);
 +	drm_modeset_unlock_all(dev);
  }