[kernel/f16] drm-i915-dp-stfu.patch: Muzzle a bunch of DP WARN()s. They're not wrong,

[Josh Boyer]

commit 70a06342d81b58b605384085d2bd86bb1499cbc2
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon Mar 19 19:23:04 2012 -0400

    drm-i915-dp-stfu.patch: Muzzle a bunch of DP WARN()s.  They're not wrong,
    
      but they're not helpful at this point.

 drm-i915-dp-stfu.patch |   69 ++++++++++++++++++++++++++++++++++++++++++++++++
 kernel.spec            |   10 +++++-
 2 files changed, 77 insertions(+), 2 deletions(-)
---
diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch
new file mode 100644
index 0000000..8948229
--- /dev/null
+++ b/drm-i915-dp-stfu.patch
@@ -0,0 +1,69 @@
+From 04a43e2598db35b3d0ec25925bb8475b5c0a3809 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at 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 at 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
+
diff --git a/kernel.spec b/kernel.spec
index 7cc9217..823c367 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -694,6 +694,7 @@ Patch1500: fix_xen_guest_on_old_EC2.patch
 
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
+Patch1825: drm-i915-dp-stfu.patch
 
 # hush the i915 fbc noise
 Patch1826: drm-i915-fbc-stfu.patch
@@ -1364,6 +1365,7 @@ ApplyPatch fix_xen_guest_on_old_EC2.patch
 
 # Intel DRM
 ApplyOptionalPatch drm-intel-next.patch
+ApplyPatch drm-i915-dp-stfu.patch
 ApplyPatch drm-i915-fbc-stfu.patch
 
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
@@ -2154,7 +2156,11 @@ fi
 # and build.
 
 %changelog
-* Mon Mar 19 2012 Josh Boyer <jwboyer at redhat.com>
+* Mon Mar 19 2012 Adam Jackson <ajax at redhat.com> - 3.3.0-2
+- drm-i915-dp-stfu.patch: Muzzle a bunch of DP WARN()s.  They're not wrong,
+  but they're not helpful at this point.
+
+* Mon Mar 19 2012 Josh Boyer <jwboyer at redhat.com> - 3.3.0-1
 - Linux 3.3
 - Drop compat-wireless infrastructure in preparation for 3.3 rebase