From 00e8dab1681ce334796fceb290da4eec8391421f Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Dec 17 2013 16:27:28 +0000
Subject: Drop drm-i915-dp-stfu.patch


(On Dec 17, 2013)

10:35 < jwb> ajax, drm-i915-dp-stfu.patch
10:36 < jwb> ajax, is that something upstreamable?
10:37 <@ajax> it's probably worth dropping at this point
10:37 <@ajax> if it's still as noisy as it was then it's probably worth
              investigating

---

diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch
deleted file mode 100644
index fb2e58e..0000000
--- a/drm-i915-dp-stfu.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index fb2fbc1..0aaf67d 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -283,7 +283,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
- 	pp_ctrl_reg = IS_VALLEYVIEW(dev) ? PIPEA_PP_CONTROL : PCH_PP_CONTROL;
- 
- 	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(pp_stat_reg),
- 				I915_READ(pp_ctrl_reg));
-@@ -376,7 +376,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));
- 		ret = -EBUSY;
- 		goto out;
-@@ -995,8 +995,8 @@ 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;
- 
-@@ -1070,7 +1070,8 @@ 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;
- 
-@@ -1144,7 +1145,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
- 
- 	DRM_DEBUG_KMS("Turn eDP power off\n");
- 
--	WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
-+	if (!intel_dp->want_panel_vdd)
-+		DRM_ERROR("Need VDD to turn off panel\n");
- 
- 	pp = ironlake_get_pp_control(intel_dp);
- 	/* We need to switch off panel power _and_ force vdd, for otherwise some
diff --git a/kernel.spec b/kernel.spec
index b60ae5e..915e1a1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -671,7 +671,6 @@ Patch1000: devel-pekey-secure-boot-20130502.patch
 # nouveau + drm fixes
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
-Patch1825: drm-i915-dp-stfu.patch
 # mustard patch to shut abrt up. please drop (and notify ajax) whenever it
 # fails to apply
 Patch1826: drm-i915-tv-detect-hush.patch
@@ -1468,7 +1467,6 @@ ApplyPatch devel-pekey-secure-boot-20130502.patch
 
 # Intel DRM
 ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-i915-dp-stfu.patch
 ApplyPatch drm-i915-tv-detect-hush.patch
 
 # silence the ACPI blacklist code