]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Nov 2018 08:47:41 +0000 (09:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Nov 2018 08:47:41 +0000 (09:47 +0100)
queue-4.14/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch [deleted file]
queue-4.14/series
queue-4.18/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch [deleted file]
queue-4.18/series
queue-4.19/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch [deleted file]
queue-4.19/series

diff --git a/queue-4.14/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch b/queue-4.14/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
deleted file mode 100644 (file)
index f6109c1..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From e96550956fbcd090629c0e2b5b8cded2eded2adf Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 8 Oct 2018 19:24:30 -0400
-Subject: drm/atomic_helper: Disallow new modesets on unregistered connectors
-
-From: Lyude Paul <lyude@redhat.com>
-
-commit e96550956fbcd090629c0e2b5b8cded2eded2adf upstream.
-
-With the exception of modesets which would switch the DPMS state of a
-connector from on to off, we want to make sure that we disallow all
-modesets which would result in enabling a new monitor or a new mode
-configuration on a monitor if the connector for the display in question
-is no longer registered. This allows us to stop userspace from trying to
-enable new displays on connectors for an MST topology that were just
-removed from the system, without preventing userspace from disabling
-DPMS on those connectors.
-
-Changes since v5:
-- Fix typo in comment, nothing else
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Cc: stable@vger.kernel.org
-Link: https://patchwork.freedesktop.org/patch/msgid/20181008232437.5571-2-lyude@redhat.com
-(cherry picked from commit 4d80273976bf880c4bed9359b8f2d45663140c86)
-Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/drm_atomic_helper.c |   21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_atomic_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -306,6 +306,26 @@ update_connector_routing(struct drm_atom
-               return 0;
-       }
-+      crtc_state = drm_atomic_get_new_crtc_state(state,
-+                                                 new_connector_state->crtc);
-+      /*
-+       * For compatibility with legacy users, we want to make sure that
-+       * we allow DPMS On->Off modesets on unregistered connectors. Modesets
-+       * which would result in anything else must be considered invalid, to
-+       * avoid turning on new displays on dead connectors.
-+       *
-+       * Since the connector can be unregistered at any point during an
-+       * atomic check or commit, this is racy. But that's OK: all we care
-+       * about is ensuring that userspace can't do anything but shut off the
-+       * display on a connector that was destroyed after its been notified,
-+       * not before.
-+       */
-+      if (!READ_ONCE(connector->registered) && crtc_state->active) {
-+              DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] is not registered\n",
-+                               connector->base.id, connector->name);
-+              return -EINVAL;
-+      }
-+
-       funcs = connector->helper_private;
-       if (funcs->atomic_best_encoder)
-@@ -350,7 +370,6 @@ update_connector_routing(struct drm_atom
-       set_best_encoder(state, new_connector_state, new_encoder);
--      crtc_state = drm_atomic_get_new_crtc_state(state, new_connector_state->crtc);
-       crtc_state->connectors_changed = true;
-       DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n",
index 5571b35a2f0ed2a60d13ac5f2e95fdd2dda1fc40..2bf4279a3fc17f2351e2ab94391ffa55a1df55da 100644 (file)
@@ -108,7 +108,6 @@ drm-rockchip-allow-driver-to-be-shutdown-on-reboot-kexec.patch
 drm-amdgpu-add-missing-chip_hainan-in-amdgpu_ucode_get_load_type.patch
 drm-nouveau-check-backlight-ids-are-0-not-0.patch
 drm-dp_mst-check-if-primary-mstb-is-null.patch
-drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
 drm-i915-restore-vblank-interrupts-earlier.patch
 drm-i915-don-t-unset-intel_connector-mst_port.patch
 drm-i915-skip-vcpi-allocation-for-mstb-ports-that-are-gone.patch
diff --git a/queue-4.18/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch b/queue-4.18/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
deleted file mode 100644 (file)
index f6109c1..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From e96550956fbcd090629c0e2b5b8cded2eded2adf Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 8 Oct 2018 19:24:30 -0400
-Subject: drm/atomic_helper: Disallow new modesets on unregistered connectors
-
-From: Lyude Paul <lyude@redhat.com>
-
-commit e96550956fbcd090629c0e2b5b8cded2eded2adf upstream.
-
-With the exception of modesets which would switch the DPMS state of a
-connector from on to off, we want to make sure that we disallow all
-modesets which would result in enabling a new monitor or a new mode
-configuration on a monitor if the connector for the display in question
-is no longer registered. This allows us to stop userspace from trying to
-enable new displays on connectors for an MST topology that were just
-removed from the system, without preventing userspace from disabling
-DPMS on those connectors.
-
-Changes since v5:
-- Fix typo in comment, nothing else
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Cc: stable@vger.kernel.org
-Link: https://patchwork.freedesktop.org/patch/msgid/20181008232437.5571-2-lyude@redhat.com
-(cherry picked from commit 4d80273976bf880c4bed9359b8f2d45663140c86)
-Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/drm_atomic_helper.c |   21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_atomic_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -306,6 +306,26 @@ update_connector_routing(struct drm_atom
-               return 0;
-       }
-+      crtc_state = drm_atomic_get_new_crtc_state(state,
-+                                                 new_connector_state->crtc);
-+      /*
-+       * For compatibility with legacy users, we want to make sure that
-+       * we allow DPMS On->Off modesets on unregistered connectors. Modesets
-+       * which would result in anything else must be considered invalid, to
-+       * avoid turning on new displays on dead connectors.
-+       *
-+       * Since the connector can be unregistered at any point during an
-+       * atomic check or commit, this is racy. But that's OK: all we care
-+       * about is ensuring that userspace can't do anything but shut off the
-+       * display on a connector that was destroyed after its been notified,
-+       * not before.
-+       */
-+      if (!READ_ONCE(connector->registered) && crtc_state->active) {
-+              DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] is not registered\n",
-+                               connector->base.id, connector->name);
-+              return -EINVAL;
-+      }
-+
-       funcs = connector->helper_private;
-       if (funcs->atomic_best_encoder)
-@@ -350,7 +370,6 @@ update_connector_routing(struct drm_atom
-       set_best_encoder(state, new_connector_state, new_encoder);
--      crtc_state = drm_atomic_get_new_crtc_state(state, new_connector_state->crtc);
-       crtc_state->connectors_changed = true;
-       DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n",
index 4dd48e54c435f023983ef384db9c9a1059daaa09..89b24767ec7e0eb91bc555679f770d759d14f62b 100644 (file)
@@ -150,7 +150,6 @@ drm-nouveau-fix-nv50_mstc-best_encoder.patch
 drm-amd-powerplay-enable-disable-nbpstate-on-on-off-of-uvd.patch
 drm-etnaviv-fix-bogus-fence-complete-check-in-timeout-handler.patch
 drm-dp_mst-check-if-primary-mstb-is-null.patch
-drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
 drm-panel-orientation-quirks-add-quirk-for-acer-one-10-s1003.patch
 drm-i915-dp-link-train-fallback-on-edp-only-if-fallback-link-bw-can-fit-panel-s-native-mode.patch
 drm-i915-restore-vblank-interrupts-earlier.patch
diff --git a/queue-4.19/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch b/queue-4.19/drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
deleted file mode 100644 (file)
index 57c5621..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From e96550956fbcd090629c0e2b5b8cded2eded2adf Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 8 Oct 2018 19:24:30 -0400
-Subject: drm/atomic_helper: Disallow new modesets on unregistered connectors
-
-From: Lyude Paul <lyude@redhat.com>
-
-commit e96550956fbcd090629c0e2b5b8cded2eded2adf upstream.
-
-With the exception of modesets which would switch the DPMS state of a
-connector from on to off, we want to make sure that we disallow all
-modesets which would result in enabling a new monitor or a new mode
-configuration on a monitor if the connector for the display in question
-is no longer registered. This allows us to stop userspace from trying to
-enable new displays on connectors for an MST topology that were just
-removed from the system, without preventing userspace from disabling
-DPMS on those connectors.
-
-Changes since v5:
-- Fix typo in comment, nothing else
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Cc: stable@vger.kernel.org
-Link: https://patchwork.freedesktop.org/patch/msgid/20181008232437.5571-2-lyude@redhat.com
-(cherry picked from commit 4d80273976bf880c4bed9359b8f2d45663140c86)
-Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/drm_atomic_helper.c |   21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_atomic_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -307,6 +307,26 @@ update_connector_routing(struct drm_atom
-               return 0;
-       }
-+      crtc_state = drm_atomic_get_new_crtc_state(state,
-+                                                 new_connector_state->crtc);
-+      /*
-+       * For compatibility with legacy users, we want to make sure that
-+       * we allow DPMS On->Off modesets on unregistered connectors. Modesets
-+       * which would result in anything else must be considered invalid, to
-+       * avoid turning on new displays on dead connectors.
-+       *
-+       * Since the connector can be unregistered at any point during an
-+       * atomic check or commit, this is racy. But that's OK: all we care
-+       * about is ensuring that userspace can't do anything but shut off the
-+       * display on a connector that was destroyed after its been notified,
-+       * not before.
-+       */
-+      if (!READ_ONCE(connector->registered) && crtc_state->active) {
-+              DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] is not registered\n",
-+                               connector->base.id, connector->name);
-+              return -EINVAL;
-+      }
-+
-       funcs = connector->helper_private;
-       if (funcs->atomic_best_encoder)
-@@ -351,7 +371,6 @@ update_connector_routing(struct drm_atom
-       set_best_encoder(state, new_connector_state, new_encoder);
--      crtc_state = drm_atomic_get_new_crtc_state(state, new_connector_state->crtc);
-       crtc_state->connectors_changed = true;
-       DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n",
index bdb7c918a44aa280de488858ece2b2b99bd277f0..d81edd8993da8b8e8a23293d9c021e8fefb06cf3 100644 (file)
@@ -179,7 +179,6 @@ drm-nouveau-fix-nv50_mstc-best_encoder.patch
 drm-amd-powerplay-enable-disable-nbpstate-on-on-off-of-uvd.patch
 drm-etnaviv-fix-bogus-fence-complete-check-in-timeout-handler.patch
 drm-dp_mst-check-if-primary-mstb-is-null.patch
-drm-atomic_helper-disallow-new-modesets-on-unregistered-connectors.patch
 drm-panel-orientation-quirks-add-quirk-for-acer-one-10-s1003.patch
 drm-i915-dp-link-train-fallback-on-edp-only-if-fallback-link-bw-can-fit-panel-s-native-mode.patch
 drm-i915-use-the-correct-crtc-when-sanitizing-plane-mapping.patch