summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drm-i915-dp-stfu.patch53
-rw-r--r--kernel.spec2
2 files changed, 0 insertions, 55 deletions
diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch
deleted file mode 100644
index c9132f6d3..000000000
--- 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 eb8139d..463e373 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -320,7 +320,7 @@ intel_dp_check_edp(struct intel_dp *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(_pp_stat_reg(intel_dp)),
- I915_READ(_pp_ctrl_reg(intel_dp)));
-@@ -436,7 +436,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;
-@@ -1084,8 +1084,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
- if (!is_edp(intel_dp))
- return;
-
-- 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;
-
-@@ -1160,7 +1160,8 @@ void ironlake_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");
-+ if (!intel_dp->want_panel_vdd)
-+ DRM_ERROR("eDP VDD not forced on");
-
- intel_dp->want_panel_vdd = false;
-
-@@ -1233,7 +1234,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 1afbf0732..5dcd5f07e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -650,7 +650,6 @@ Patch1003: sysrq-secure-boot.patch
# nouveau + drm fixes
# intel drm is all merged upstream
-Patch1825: drm-i915-dp-stfu.patch
Patch1826: drm-i915-hush-check-crtc-state.patch
# Quiet boot fixes
@@ -1343,7 +1342,6 @@ ApplyPatch sysrq-secure-boot.patch
# Nouveau DRM
# Intel DRM
-ApplyPatch drm-i915-dp-stfu.patch
ApplyPatch drm-i915-hush-check-crtc-state.patch
# Radeon DRM