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