svn commit: r277959 - head/sys/dev/drm2/i915

[Adrian Chadd]

Author: adrian
Date: Sat Jan 31 02:13:25 2015
New Revision: 277959
URL: https://svnweb.freebsd.org/changeset/base/277959

Log:
  Fix backlight for ivybridge based laptops (and whatever else comes through
  this codepath.)
  
  (1<<30) is documented as BLM_PCH_OVERRIDE_ENABLE, which the current
  i915 driver in Linux only sets for broadwell chips.
  
  This fixes the backlight control on the Lenovo X230.
  
  Approved by:	kib
  Obtained from:	Linux 7aa1e7f06d6ea1bce3b27630d50769d13da28b1a

Modified:
  head/sys/dev/drm2/i915/intel_display.c

Modified: head/sys/dev/drm2/i915/intel_display.c
==============================================================================
--- head/sys/dev/drm2/i915/intel_display.c	Sat Jan 31 02:12:57 2015	(r277958)
+++ head/sys/dev/drm2/i915/intel_display.c	Sat Jan 31 02:13:25 2015	(r277959)
@@ -6995,7 +6995,7 @@ static void ivb_pch_pwm_override(struct 
 	 */
 	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));
+	I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE);
 }
 
 void intel_modeset_init_hw(struct drm_device *dev)