[09/11] CHROMIUM: drm/i915: change order of PWM enable vs BLC enable

Commit Message

Taylor, Clinton A July 16, 2014, 9:49 p.m. UTC

From: Jesse Barnes <[e-mail]>

Needed for spec compliance

Signed-off-by: Jesse Barnes <[e-mail]>
Signed-off-by: Wayne Boyer <[e-mail]>

Change-Id: Ib09f64bdc44108c13bbe5a6ab8ab2f536360f8d2
Reviewed-on: https://chromium-review.googlesource.com/192469
Reviewed-by: Stéphane Marchesin <[e-mail]>
Reviewed-by: Aaron Durbin <[e-mail]>
Tested-by: Wayne Boyer <[e-mail]>
Commit-Queue: Wayne Boyer <[e-mail]>

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c
---
 drivers/gpu/drm/i915/intel_dp.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 4f0fc11..f9becf8 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1410,6 +1410,8 @@  void intel_edp_backlight_on(struct intel_dp *intel_dp)
 
 	assert_pwm_disabled(dev_priv, intel_dp->attached_connector);
 
+	intel_panel_enable_backlight(intel_dp->attached_connector);
+
 	/*
 	 * If we enable the backlight right away following a panel power
 	 * on, we may see slight flicker as the panel syncs with the eDP
@@ -1447,10 +1449,10 @@  void intel_edp_backlight_off(struct intel_dp *intel_dp)
 
 	I915_WRITE(pp_ctrl_reg, pp);
 	POSTING_READ(pp_ctrl_reg);
-	intel_dp->last_backlight_off = jiffies;
 
-	edp_wait_backlight_off(intel_dp);
+	intel_dp->last_backlight_off = jiffies;
 
+	msleep(intel_dp->backlight_off_delay);
 	intel_panel_disable_backlight(intel_dp->attached_connector);
 }