|
 |
efa8ce0 |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
|
|
 |
ab7183f |
index 296cfc2..516e1e2 100644
|
|
|
efa8ce0 |
--- a/drivers/gpu/drm/i915/intel_dp.c
|
|
|
efa8ce0 |
+++ b/drivers/gpu/drm/i915/intel_dp.c
|
|
|
ab7183f |
@@ -350,7 +350,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
|
|
|
efa8ce0 |
if (!is_edp(intel_dp))
|
|
|
efa8ce0 |
return;
|
|
|
efa8ce0 |
if (!ironlake_edp_have_panel_power(intel_dp) && !ironlake_edp_have_panel_vdd(intel_dp)) {
|
|
|
efa8ce0 |
- WARN(1, "eDP powered off while attempting aux channel communication.\n");
|
|
|
efa8ce0 |
+ DRM_ERROR("eDP powered off while attempting aux channel communication.\n");
|
|
|
efa8ce0 |
DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n",
|
|
|
efa8ce0 |
I915_READ(PCH_PP_STATUS),
|
|
|
efa8ce0 |
I915_READ(PCH_PP_CONTROL));
|
|
 |
6328a50 |
@@ -447,7 +447,7 @@ intel_dp_aux_ch(struct intel_dp *intel_d
|
|
|
efa8ce0 |
}
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
if (try == 3) {
|
|
|
efa8ce0 |
- WARN(1, "dp_aux_ch not started status 0x%08x\n",
|
|
|
efa8ce0 |
+ DRM_ERROR("dp_aux_ch not started status 0x%08x\n",
|
|
|
efa8ce0 |
I915_READ(ch_ctl));
|
|
|
6328a50 |
ret = -EBUSY;
|
|
|
6328a50 |
goto out;
|
|
|
ab7183f |
@@ -1024,8 +1024,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
|
|
|
efa8ce0 |
return;
|
|
|
efa8ce0 |
DRM_DEBUG_KMS("Turn eDP VDD on\n");
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
- WARN(intel_dp->want_panel_vdd,
|
|
|
efa8ce0 |
- "eDP VDD already requested on\n");
|
|
|
efa8ce0 |
+ if (intel_dp->want_panel_vdd)
|
|
|
efa8ce0 |
+ DRM_ERROR("eDP VDD already requested on\n");
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
intel_dp->want_panel_vdd = true;
|
|
|
efa8ce0 |
|
|
|
ab7183f |
@@ -1090,7 +1090,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
|
|
|
efa8ce0 |
return;
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd);
|
|
|
efa8ce0 |
- WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
|
|
|
efa8ce0 |
+ if (!intel_dp->want_panel_vdd)
|
|
|
efa8ce0 |
+ DRM_ERROR("eDP VDD not forced on");
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
intel_dp->want_panel_vdd = false;
|
|
|
efa8ce0 |
|
|
|
ab7183f |
@@ -1160,7 +1161,8 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp)
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
DRM_DEBUG_KMS("Turn eDP power off\n");
|
|
|
efa8ce0 |
|
|
|
ab7183f |
- WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
|
|
|
ab7183f |
+ if (!intel_dp->want_panel_vdd)
|
|
|
ab7183f |
+ DRM_ERROR("Need VDD to turn off panel\n");
|
|
|
efa8ce0 |
|
|
|
efa8ce0 |
pp = ironlake_get_pp_control(dev_priv);
|
|
|
ab7183f |
pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_BLC_ENABLE);
|