delete broken i915 patch from 4.11 and 4.9

diff --git a/queue-4.11/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch b/queue-4.11/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch
deleted file mode 100644 (file)
index 321679d..0000000
--- a/queue-4.11/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From b7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-Date: Thu, 1 Jun 2017 17:36:14 +0300
-Subject: drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
-commit b7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef upstream.
-
-If intel_crtc_disable_noatomic() were to ever get called during resume
-we'd end up deadlocking since resume has its own acqcuire_ctx but
-intel_crtc_disable_noatomic() still tries to use the
-mode_config.acquire_ctx. Pass down the correct acquire ctx from the top.
-
-Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Link: http://patchwork.freedesktop.org/patch/msgid/20170601143619.27840-3-ville.syrjala@linux.intel.com
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-(cherry picked from commit da1d0e265535634bba80d44510b864c620549bee)
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/intel_display.c |    9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -6850,7 +6850,8 @@ static void i9xx_crtc_disable(struct int
-               intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
- }
- 
--static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
-+static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
-+                                      struct drm_modeset_acquire_ctx *ctx)
- {
-       struct intel_encoder *encoder;
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-@@ -6880,7 +6881,7 @@ static void intel_crtc_disable_noatomic(
-               return;
-       }
- 
--      state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
-+      state->acquire_ctx = ctx;
- 
-       /* Everything's already locked, -EDEADLK can't happen. */
-       crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);
-@@ -16872,7 +16873,7 @@ static void intel_sanitize_crtc(struct i
-               plane = crtc->plane;
-               crtc->base.primary->state->visible = true;
-               crtc->plane = !plane;
--              intel_crtc_disable_noatomic(&crtc->base);
-+              intel_crtc_disable_noatomic(&crtc->base, ctx);
-               crtc->plane = plane;
-       }
- 
-@@ -16888,7 +16889,7 @@ static void intel_sanitize_crtc(struct i
-       /* Adjust the state of the output pipe according to whether we
-        * have active connectors/encoders. */
-       if (crtc->active && !intel_crtc_has_encoders(crtc))
--              intel_crtc_disable_noatomic(&crtc->base);
-+              intel_crtc_disable_noatomic(&crtc->base, ctx);
- 
-       if (crtc->active || HAS_GMCH_DISPLAY(dev_priv)) {
-               /*

diff --git a/queue-4.11/series b/queue-4.11/series
index 05ba352ff5310b2f620288a05c681498b217a7f9..31752fc71ee60889f1744f42527ce8666b42f449 100644 (file)
--- a/queue-4.11/series
+++ b/queue-4.11/series
@@ -46,4 +46,3 @@ drm-radeon-add-a-quirk-for-toshiba-satellite-l20-183.patch
 drm-amdgpu-atom-fix-ps-allocation-size-for-enabledisppowergating.patch
 drm-amdgpu-adjust-default-display-clock.patch
 drm-amdgpu-add-polaris12-did.patch
-drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch

diff --git a/queue-4.9/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch b/queue-4.9/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch
deleted file mode 100644 (file)
index 3ddf9e1..0000000
--- a/queue-4.9/drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From b7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-Date: Thu, 1 Jun 2017 17:36:14 +0300
-Subject: drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
-commit b7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef upstream.
-
-If intel_crtc_disable_noatomic() were to ever get called during resume
-we'd end up deadlocking since resume has its own acqcuire_ctx but
-intel_crtc_disable_noatomic() still tries to use the
-mode_config.acquire_ctx. Pass down the correct acquire ctx from the top.
-
-Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Link: http://patchwork.freedesktop.org/patch/msgid/20170601143619.27840-3-ville.syrjala@linux.intel.com
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-(cherry picked from commit da1d0e265535634bba80d44510b864c620549bee)
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/intel_display.c |    9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -6838,7 +6838,8 @@ static void i9xx_crtc_disable(struct int
-               intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
- }
- 
--static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
-+static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
-+                                      struct drm_modeset_acquire_ctx *ctx)
- {
-       struct intel_encoder *encoder;
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-@@ -6868,7 +6869,7 @@ static void intel_crtc_disable_noatomic(
-               return;
-       }
- 
--      state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
-+      state->acquire_ctx = ctx;
- 
-       /* Everything's already locked, -EDEADLK can't happen. */
-       crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);
-@@ -16607,7 +16608,7 @@ static void intel_sanitize_crtc(struct i
-               plane = crtc->plane;
-               to_intel_plane_state(crtc->base.primary->state)->base.visible = true;
-               crtc->plane = !plane;
--              intel_crtc_disable_noatomic(&crtc->base);
-+              intel_crtc_disable_noatomic(&crtc->base, ctx);
-               crtc->plane = plane;
-       }
- 
-@@ -16623,7 +16624,7 @@ static void intel_sanitize_crtc(struct i
-       /* Adjust the state of the output pipe according to whether we
-        * have active connectors/encoders. */
-       if (crtc->active && !intel_crtc_has_encoders(crtc))
--              intel_crtc_disable_noatomic(&crtc->base);
-+              intel_crtc_disable_noatomic(&crtc->base, ctx);
- 
-       if (crtc->active || HAS_GMCH_DISPLAY(dev)) {
-               /*

diff --git a/queue-4.9/series b/queue-4.9/series
index 0ab47cdc8191ea69929e549e7bc35dd693cfeaac..d82d4801f82fc4a6fa868c86bf5327bfae507668 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -31,4 +31,3 @@ drm-radeon-add-a-px-quirk-for-another-k53tk-variant.patch
 drm-radeon-add-a-quirk-for-toshiba-satellite-l20-183.patch
 drm-amdgpu-atom-fix-ps-allocation-size-for-enabledisppowergating.patch
 drm-amdgpu-adjust-default-display-clock.patch
-drm-i915-plumb-the-correct-acquire-ctx-into-intel_crtc_disable_noatomic.patch