[PATCH 36/40] drm/i915: Allow vdd_off when vdd is already off

ville.syrjala
2014-06-27T23:06:37Z

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Allow calling the vdd off functions when vdd is already off. Makes
things simpler later.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 03ee9e8..65ab54c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1239,7 +1239,11 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
if (!is_edp(intel_dp))
return;

- WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
+ if (!edp_have_panel_vdd(intel_dp))
+ return;
+
+ if (!intel_dp->want_panel_vdd)
+ return;

intel_dp->want_panel_vdd = false;

--
1.8.5.5