From: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Needed for spec compliance Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Signed-off-by: Wayne Boyer <wayne.boyer@xxxxxxxxx> Change-Id: Ib09f64bdc44108c13bbe5a6ab8ab2f536360f8d2 Reviewed-on: https://chromium-review.googlesource.com/192469 Reviewed-by: Stéphane Marchesin <marcheu@xxxxxxxxxxxx> Reviewed-by: Aaron Durbin <adurbin@xxxxxxxxxxxx> Tested-by: Wayne Boyer <wayne.boyer@xxxxxxxxx> Commit-Queue: Wayne Boyer <wayne.boyer@xxxxxxxxx> Conflicts: drivers/gpu/drm/i915/intel_dp.c --- drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); } -- 1.7.9.5 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
