Subject: linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 16 Jul 2012 13:00:21 +1000

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit 7aa1e7f06d6e ("Revert
"drm/i915: allow PCH PWM override on IVB"") from Linus' tree and commit
8090c6b9daa0 ("drm/i915: wrap up gt powersave enabling functions") from
the drm tree.

Just context changes (I think).  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/i915/intel_display.c
index a8538ac,0972f49..0000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -6921,22 -7172,31 +7172,16 @@@ static void i915_disable_vga(struct drm
  	POSTING_READ(vga_reg);
  }
  
 -static void ivb_pch_pwm_override(struct drm_device *dev)
 -{
 -	struct drm_i915_private *dev_priv = dev->dev_private;
 -
 -	/*
 -	 * IVB has CPU eDP backlight regs too, set things up to let the
 -	 * PCH regs control the backlight
 -	 */
 -	I915_WRITE(BLC_PWM_CPU_CTL2, BLM_PWM_ENABLE);
 -	I915_WRITE(BLC_PWM_CPU_CTL, 0);
 -	I915_WRITE(BLC_PWM_PCH_CTL1, BLM_PCH_PWM_ENABLE | BLM_PCH_OVERRIDE_ENABLE);
 -}
 -
  void intel_modeset_init_hw(struct drm_device *dev)
  {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
+ 	intel_prepare_ddi(dev);
  
  	intel_init_clock_gating(dev);
  
- 	if (IS_IRONLAKE_M(dev)) {
- 		ironlake_enable_drps(dev);
- 		ironlake_enable_rc6(dev);
- 		intel_init_emon(dev);
- 	}
+ 	mutex_lock(&dev->struct_mutex);
+ 	intel_enable_gt_powersave(dev);
+ 	mutex_unlock(&dev->struct_mutex);
  
- 	if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
- 		gen6_enable_rps(dev_priv);
- 		gen6_update_ring_freq(dev_priv);
- 	}
 -	if (IS_IVYBRIDGE(dev))
 -		ivb_pch_pwm_override(dev);
  }
  
  void intel_modeset_init(struct drm_device *dev)