[kernel/f21] Quiet WARN in i915 edp VDD handling

[Josh Boyer]

commit 3df10215a628bf8f32bf7da271eed580277092c6
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Fri Nov 14 09:24:46 2014 -0500

    Quiet WARN in i915 edp VDD handling

 drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch |   30 ++++++++++++++++++++++++
 kernel.spec                                    |    3 ++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch b/drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch
new file mode 100644
index 0000000..097a714
--- /dev/null
+++ b/drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch
@@ -0,0 +1,30 @@
+From 267eb54f9e4be5e78a1375553f3ea0f5768cd117 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer at fedoraproject.org>
+Date: Fri, 14 Nov 2014 09:17:39 -0500
+Subject: [PATCH] drm/i915: Don't WARN in edp_panel_vdd_off
+
+After talking with ajax, this isn't really worth splashing a backtrace
+about.  The handling here is reworked in 3.18, but the fixes are a bit
+larger than we want to backport.  Just shut it up for now.
+
+Signed-off-by: Josh Boyer <jwboyer at fedoraproject.org>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index fdff1d420c14..37d576141a36 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1303,7 +1303,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
+ 	if (!is_edp(intel_dp))
+ 		return;
+ 
+-	WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
++	DRM_DEBUG_KMS(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
+ 
+ 	intel_dp->want_panel_vdd = false;
+ 
+-- 
+1.9.3
+
diff --git a/kernel.spec b/kernel.spec
index dfca2db..30acbd7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -551,6 +551,7 @@ Patch1019: Add-sysrq-option-to-disable-secure-boot-mode.patch
 # nouveau + drm fixes
 # intel drm is all merged upstream
 Patch1826: drm-i915-hush-check-crtc-state.patch
+Patch1827: drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch
 
 # Quiet boot fixes
 
@@ -1385,6 +1386,7 @@ ApplyPatch Add-sysrq-option-to-disable-secure-boot-mode.patch
 
 # Intel DRM
 ApplyPatch drm-i915-hush-check-crtc-state.patch
+ApplyPatch drm-i915-Don-t-WARN-in-edp_panel_vdd_off.patch
 
 # Radeon DRM
 
@@ -2384,6 +2386,7 @@ fi
 #                                    ||     ||
 %changelog
 * Fri Nov 14 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Quiet WARN in i915 edp VDD handling
 - Enable I40EVF driver (rhbz 1164029)
 
 * Thu Nov 13 2014 Josh Boyer <jwboyer at fedoraproject.org>