From 04a43e2598db35b3d0ec25925bb8475b5c0a3809 Mon Sep 17 00:00:00 2001

From: Adam Jackson <ajax@redhat.com>

Date: Fri, 16 Mar 2012 16:39:11 -0400

Subject: [PATCH] drm/i915/dp: Use DRM_ERROR not WARN for sanity checks

These are noisy as shit and creating a ton of abrt reports.  I don't

need more, thanks.  Proper fix upstream eventually.

Signed-off-by: Adam Jackson <ajax@redhat.com>

---

 drivers/gpu/drm/i915/intel_dp.c |   14 ++++++++------

 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c

index 94f860c..6bf27c9 100644

--- a/drivers/gpu/drm/i915/intel_dp.c

+++ b/drivers/gpu/drm/i915/intel_dp.c

@@ -331,7 +331,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)

 	if (!is_edp(intel_dp))

 		return;

 	if (!ironlake_edp_have_panel_power(intel_dp) && !ironlake_edp_have_panel_vdd(intel_dp)) {

-		WARN(1, "eDP powered off while attempting aux channel communication.\n");

+		DRM_ERROR("eDP powered off while attempting aux channel communication.\n");

 		DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n",

 			      I915_READ(PCH_PP_STATUS),

 			      I915_READ(PCH_PP_CONTROL));

@@ -386,7 +386,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,

 	}

 	if (try == 3) {

-		WARN(1, "dp_aux_ch not started status 0x%08x\n",

+		DRM_ERROR("dp_aux_ch not started status 0x%08x\n",

 		     I915_READ(ch_ctl));

 		return -EBUSY;

 	}

@@ -992,8 +992,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)

 		return;

 	DRM_DEBUG_KMS("Turn eDP VDD on\n");

-	WARN(intel_dp->want_panel_vdd,

-	     "eDP VDD already requested on\n");

+	if (intel_dp->want_panel_vdd)

+		DRM_ERROR("eDP VDD already requested on\n");

 	intel_dp->want_panel_vdd = true;

@@ -1058,7 +1058,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)

 		return;

 	DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd);

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

+	if (!intel_dp->want_panel_vdd)

+		DRM_ERROR("eDP VDD not forced on");

 	intel_dp->want_panel_vdd = false;

@@ -1128,7 +1129,8 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp)

 	DRM_DEBUG_KMS("Turn eDP power off\n");

-	WARN(intel_dp->want_panel_vdd, "Cannot turn power off while VDD is on\n");

+	if (intel_dp->want_panel_vdd)

+		DRM_ERROR("Cannot turn power off while VDD is on\n");

 	pp = ironlake_get_pp_control(dev_priv);

 	pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET | EDP_BLC_ENABLE);

-- 

1.7.7.6