diff mbox

[02/11] CHROMIUM: drm/i915: do not explicitly disable backlight in panel_off

Message ID 1405547387-14051-3-git-send-email-clinton.a.taylor@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Taylor, Clinton A July 16, 2014, 9:49 p.m. UTC 
From: Jesse Barnes <jbarnes@virtuousgeek.org>

Per eDP spec, we must disable the backlight in order to power down the
panel. However, in our code, we have always disabled the backlight
before we try to turn off the panel. The assertions from the previous
patch make sure this is the case.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>

Change-Id: I68ae4ee80cee40aa4745697ce7acf3883ffb721d
Reviewed-on: https://chromium-review.googlesource.com/194250
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: Wayne Boyer <wayne.boyer@intel.com>
Commit-Queue: Wayne Boyer <wayne.boyer@intel.com>

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c
---
 drivers/gpu/drm/i915/intel_dp.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 90b24f6..9242499 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1371,8 +1371,7 @@  void intel_edp_panel_off(struct intel_dp *intel_dp)
 	pp = ironlake_get_pp_control(intel_dp);
 	/* We need to switch off panel power _and_ force vdd, for otherwise some
 	 * panels get very unhappy and cease to work. */
-	pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_FORCE_VDD |
-		EDP_BLC_ENABLE);
+	pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET);
 
 	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);