drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code

am: 686ea5862e

Change-Id: Ia2e54ed7a09853c55ec83ab1eb1147c1779acd8c
This commit is contained in:
Ville Syrjl
2017-03-15 02:27:15 +00:00
committed by android-build-merger

View File

@@ -2832,6 +2832,9 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
enum pipe pipe = intel_dp->pps_pipe;
i915_reg_t pp_on_reg = PP_ON_DELAYS(pipe);
if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
return;
edp_panel_vdd_off_sync(intel_dp);
/*
@@ -2859,9 +2862,6 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,
lockdep_assert_held(&dev_priv->pps_mutex);
if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
return;
for_each_intel_encoder(dev, encoder) {
struct intel_dp *intel_dp;
enum port port;