drop drm-re-enable-error-handling.patch

diff --git a/queue-3.18/drm-re-enable-error-handling.patch b/queue-3.18/drm-re-enable-error-handling.patch
deleted file mode 100644 (file)
index 6dff4c0..0000000
--- a/queue-3.18/drm-re-enable-error-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From foo@baz Tue Aug 28 16:08:28 CEST 2018
-From: Nicholas Mc Guire <hofrat@osadl.org>
-Date: Sat, 14 Jul 2018 14:32:12 +0200
-Subject: drm: re-enable error handling
-
-From: Nicholas Mc Guire <hofrat@osadl.org>
-
-[ Upstream commit d530b5f1ca0bb66958a2b714bebe40a1248b9c15 ]
-
-drm_legacy_ctxbitmap_next() returns idr_alloc() which can return
--ENOMEM, -EINVAL or -ENOSPC none of which are -1 . but the call sites
-of drm_legacy_ctxbitmap_next() seem to be assuming that the error case
-would be -1 (original return of drm_ctxbitmap_next() prior to 2.6.23
-was actually -1). Thus reenable error handling by checking for < 0.
-
-Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
-Fixes: 62968144e673 ("drm: convert drm context code to use Linux idr")
-Signed-off-by: Sean Paul <seanpaul@chromium.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/1531571532-22733-1-git-send-email-hofrat@osadl.org
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/drm_context.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_context.c
-+++ b/drivers/gpu/drm/drm_context.c
-@@ -341,7 +341,7 @@ int drm_legacy_addctx(struct drm_device
-               ctx->handle = drm_legacy_ctxbitmap_next(dev);
-       }
-       DRM_DEBUG("%d\n", ctx->handle);
--      if (ctx->handle == -1) {
-+      if (ctx->handle < 0) {
-               DRM_DEBUG("Not enough free contexts.\n");
-               /* Should this return -EBUSY instead? */
-               return -ENOMEM;

diff --git a/queue-3.18/series b/queue-3.18/series
index 1da528ff4c737c1f1bedf5615dabea260e38e357..686613519f722f1d6b39dfb1ae0af1d7fa7ab9d3 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -5,7 +5,6 @@ xfrm-free-skb-if-nlsk-pointer-is-null.patch
 mac80211-add-stations-tied-to-ap_vlans-during-hw-reconfig.patch
 nl80211-add-a-missing-break-in-parse_station_flags.patch
 scsi-libiscsi-fix-possible-null-pointer-dereference-in-case-of-tmf.patch
-drm-re-enable-error-handling.patch
 drm-imx-imx-ldb-disable-ldb-on-driver-bind.patch
 drm-imx-imx-ldb-check-if-channel-is-enabled-before-printing-warning.patch
 usb-gadget-r8a66597-fix-two-possible-sleep-in-atomic-context-bugs-in-init_controller.patch

diff --git a/queue-4.14/drm-re-enable-error-handling.patch b/queue-4.14/drm-re-enable-error-handling.patch
deleted file mode 100644 (file)
index f141157..0000000
--- a/queue-4.14/drm-re-enable-error-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From foo@baz Sun Aug 26 09:13:00 CEST 2018
-From: Nicholas Mc Guire <hofrat@osadl.org>
-Date: Sat, 14 Jul 2018 14:32:12 +0200
-Subject: drm: re-enable error handling
-
-From: Nicholas Mc Guire <hofrat@osadl.org>
-
-[ Upstream commit d530b5f1ca0bb66958a2b714bebe40a1248b9c15 ]
-
-drm_legacy_ctxbitmap_next() returns idr_alloc() which can return
--ENOMEM, -EINVAL or -ENOSPC none of which are -1 . but the call sites
-of drm_legacy_ctxbitmap_next() seem to be assuming that the error case
-would be -1 (original return of drm_ctxbitmap_next() prior to 2.6.23
-was actually -1). Thus reenable error handling by checking for < 0.
-
-Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
-Fixes: 62968144e673 ("drm: convert drm context code to use Linux idr")
-Signed-off-by: Sean Paul <seanpaul@chromium.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/1531571532-22733-1-git-send-email-hofrat@osadl.org
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/drm_context.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_context.c
-+++ b/drivers/gpu/drm/drm_context.c
-@@ -372,7 +372,7 @@ int drm_legacy_addctx(struct drm_device
-               ctx->handle = drm_legacy_ctxbitmap_next(dev);
-       }
-       DRM_DEBUG("%d\n", ctx->handle);
--      if (ctx->handle == -1) {
-+      if (ctx->handle < 0) {
-               DRM_DEBUG("Not enough free contexts.\n");
-               /* Should this return -EBUSY instead? */
-               return -ENOMEM;

diff --git a/queue-4.14/series b/queue-4.14/series
index e62c164c8677b94f6f1db5f80e78ac548b622a9d..1ebb7551b92870ccb8534eaea2ea50435ee94cf5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -9,7 +9,6 @@ nl80211-add-a-missing-break-in-parse_station_flags.patch
 drm-bridge-adv7511-reset-registers-on-hotplug.patch
 scsi-target-iscsi-cxgbit-fix-max-iso-npdu-calculation.patch
 scsi-libiscsi-fix-possible-null-pointer-dereference-in-case-of-tmf.patch
-drm-re-enable-error-handling.patch
 drm-imx-imx-ldb-disable-ldb-on-driver-bind.patch
 drm-imx-imx-ldb-check-if-channel-is-enabled-before-printing-warning.patch
 nbd-don-t-requeue-the-same-request-twice.patch

diff --git a/queue-4.4/drm-re-enable-error-handling.patch b/queue-4.4/drm-re-enable-error-handling.patch
deleted file mode 100644 (file)
index 6f05b1c..0000000
--- a/queue-4.4/drm-re-enable-error-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From foo@baz Tue Aug 28 16:10:37 CEST 2018
-From: Nicholas Mc Guire <hofrat@osadl.org>
-Date: Sat, 14 Jul 2018 14:32:12 +0200
-Subject: drm: re-enable error handling
-
-From: Nicholas Mc Guire <hofrat@osadl.org>
-
-[ Upstream commit d530b5f1ca0bb66958a2b714bebe40a1248b9c15 ]
-
-drm_legacy_ctxbitmap_next() returns idr_alloc() which can return
--ENOMEM, -EINVAL or -ENOSPC none of which are -1 . but the call sites
-of drm_legacy_ctxbitmap_next() seem to be assuming that the error case
-would be -1 (original return of drm_ctxbitmap_next() prior to 2.6.23
-was actually -1). Thus reenable error handling by checking for < 0.
-
-Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
-Fixes: 62968144e673 ("drm: convert drm context code to use Linux idr")
-Signed-off-by: Sean Paul <seanpaul@chromium.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/1531571532-22733-1-git-send-email-hofrat@osadl.org
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/drm_context.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_context.c
-+++ b/drivers/gpu/drm/drm_context.c
-@@ -372,7 +372,7 @@ int drm_legacy_addctx(struct drm_device
-               ctx->handle = drm_legacy_ctxbitmap_next(dev);
-       }
-       DRM_DEBUG("%d\n", ctx->handle);
--      if (ctx->handle == -1) {
-+      if (ctx->handle < 0) {
-               DRM_DEBUG("Not enough free contexts.\n");
-               /* Should this return -EBUSY instead? */
-               return -ENOMEM;

diff --git a/queue-4.4/series b/queue-4.4/series
index cd26a206393b215e3cbc36b29bdd8d462c8eeaf4..a674c4a0fc86fd2dfcaa3d66504039404611a713 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -7,7 +7,6 @@ mac80211-add-stations-tied-to-ap_vlans-during-hw-reconfig.patch
 nl80211-add-a-missing-break-in-parse_station_flags.patch
 drm-bridge-adv7511-reset-registers-on-hotplug.patch
 scsi-libiscsi-fix-possible-null-pointer-dereference-in-case-of-tmf.patch
-drm-re-enable-error-handling.patch
 drm-imx-imx-ldb-disable-ldb-on-driver-bind.patch
 drm-imx-imx-ldb-check-if-channel-is-enabled-before-printing-warning.patch
 usb-gadget-r8a66597-fix-two-possible-sleep-in-atomic-context-bugs-in-init_controller.patch

diff --git a/queue-4.9/drm-re-enable-error-handling.patch b/queue-4.9/drm-re-enable-error-handling.patch
deleted file mode 100644 (file)
index cf2982d..0000000
--- a/queue-4.9/drm-re-enable-error-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From foo@baz Sun Aug 26 09:16:12 CEST 2018
-From: Nicholas Mc Guire <hofrat@osadl.org>
-Date: Sat, 14 Jul 2018 14:32:12 +0200
-Subject: drm: re-enable error handling
-
-From: Nicholas Mc Guire <hofrat@osadl.org>
-
-[ Upstream commit d530b5f1ca0bb66958a2b714bebe40a1248b9c15 ]
-
-drm_legacy_ctxbitmap_next() returns idr_alloc() which can return
--ENOMEM, -EINVAL or -ENOSPC none of which are -1 . but the call sites
-of drm_legacy_ctxbitmap_next() seem to be assuming that the error case
-would be -1 (original return of drm_ctxbitmap_next() prior to 2.6.23
-was actually -1). Thus reenable error handling by checking for < 0.
-
-Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
-Fixes: 62968144e673 ("drm: convert drm context code to use Linux idr")
-Signed-off-by: Sean Paul <seanpaul@chromium.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/1531571532-22733-1-git-send-email-hofrat@osadl.org
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/drm_context.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_context.c
-+++ b/drivers/gpu/drm/drm_context.c
-@@ -372,7 +372,7 @@ int drm_legacy_addctx(struct drm_device
-               ctx->handle = drm_legacy_ctxbitmap_next(dev);
-       }
-       DRM_DEBUG("%d\n", ctx->handle);
--      if (ctx->handle == -1) {
-+      if (ctx->handle < 0) {
-               DRM_DEBUG("Not enough free contexts.\n");
-               /* Should this return -EBUSY instead? */
-               return -ENOMEM;

diff --git a/queue-4.9/series b/queue-4.9/series
index ef4b008732a5f186b7beb053de0abf5b31734454..e76c2358fa6150ab2363d4c412cc74f2693581e8 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -5,7 +5,6 @@ mac80211-add-stations-tied-to-ap_vlans-during-hw-reconfig.patch
 nl80211-add-a-missing-break-in-parse_station_flags.patch
 drm-bridge-adv7511-reset-registers-on-hotplug.patch
 scsi-libiscsi-fix-possible-null-pointer-dereference-in-case-of-tmf.patch
-drm-re-enable-error-handling.patch
 drm-imx-imx-ldb-disable-ldb-on-driver-bind.patch
 drm-imx-imx-ldb-check-if-channel-is-enabled-before-printing-warning.patch
 usb-gadget-r8a66597-fix-two-possible-sleep-in-atomic-context-bugs-in-init_controller.patch