Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2266b058 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes 

Daniel writes:
"Two tiny patches and one revert:
- Kill a bogus error message introduced in 3.4, further Bspec reading
  indicates that this is how the hw is supposed to work.
- Reorder one backlight register restore, fixing broken backlight on some
  machines after resume.
- Revert a hack from Jesse for ivb backlight control - it breaks the
  backlight controls on my shiny new ivb laptop."

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  Revert "drm/i915: allow PCH PWM override on IVB"
  drm/i915: Fix eDP blank screen after S3 resume on HP desktops
  drm/i915: rip out the PM_IIR WARN
parents e9bf5f36 7aa1e7f0

drivers/gpu/drm/i915/i915_irq.c

+0 −1
Original line number Diff line number Diff line
@@ -412,7 +412,6 @@ static void gen6_queue_rps_work(struct drm_i915_private *dev_priv, 
	 */



	spin_lock_irqsave(&dev_priv->rps_lock, flags);

	WARN(dev_priv->pm_iir & pm_iir, "Missed a PM interrupt\n");

	dev_priv->pm_iir |= pm_iir;

	I915_WRITE(GEN6_PMIMR, dev_priv->pm_iir);

	POSTING_READ(GEN6_PMIMR);

drivers/gpu/drm/i915/i915_suspend.c

+4 −1
Original line number Diff line number Diff line
@@ -740,8 +740,11 @@ static void i915_restore_display(struct drm_device *dev) 
	if (HAS_PCH_SPLIT(dev)) {

		I915_WRITE(BLC_PWM_PCH_CTL1, dev_priv->saveBLC_PWM_CTL);

		I915_WRITE(BLC_PWM_PCH_CTL2, dev_priv->saveBLC_PWM_CTL2);

		I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL);

		/* NOTE: BLC_PWM_CPU_CTL must be written after BLC_PWM_CPU_CTL2;

		 * otherwise we get blank eDP screen after S3 on some machines

		 */

		I915_WRITE(BLC_PWM_CPU_CTL2, dev_priv->saveBLC_CPU_PWM_CTL2);

		I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL);

		I915_WRITE(PCH_PP_ON_DELAYS, dev_priv->savePP_ON_DELAYS);

		I915_WRITE(PCH_PP_OFF_DELAYS, dev_priv->savePP_OFF_DELAYS);

		I915_WRITE(PCH_PP_DIVISOR, dev_priv->savePP_DIVISOR);

drivers/gpu/drm/i915/intel_display.c

+0 −16
Original line number Diff line number Diff line
@@ -6921,19 +6921,6 @@ static void i915_disable_vga(struct drm_device *dev) 
	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, PWM_ENABLE);

	I915_WRITE(BLC_PWM_CPU_CTL, 0);

	I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE | (1<<30));

}



void intel_modeset_init_hw(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -6950,9 +6937,6 @@ void intel_modeset_init_hw(struct drm_device *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)