drop drm patch from 4.4 and 4.9

diff --git a/queue-4.4/drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch b/queue-4.4/drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch
deleted file mode 100644 (file)
index 704b825..0000000
--- a/queue-4.4/drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9ba85914c36c8fed9bf3e8b69c0782908c1247b7 Mon Sep 17 00:00:00 2001
-From: Jing Xiangfeng <jingxiangfeng@huawei.com>
-Date: Tue, 29 Jun 2021 19:44:55 +0800
-Subject: drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jing Xiangfeng <jingxiangfeng@huawei.com>
-
-commit 9ba85914c36c8fed9bf3e8b69c0782908c1247b7 upstream.
-
-radeon_user_framebuffer_create() misses to call drm_gem_object_put() in
-an error path. Add the missed function call to fix it.
-
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/radeon_display.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1381,6 +1381,7 @@ radeon_user_framebuffer_create(struct dr
-       /* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */
-       if (obj->import_attach) {
-               DRM_DEBUG_KMS("Cannot create framebuffer from imported dma_buf\n");
-+              drm_gem_object_put(obj);
-               return ERR_PTR(-EINVAL);
-       }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index f3c5725da3f5462284139a3c334ba74ea09be7ee..1a029e0670aaa04102faef11746bd3b1696a40bb 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -126,6 +126,5 @@ can-gw-synchronize-rcu-operations-before-removing-gw-job-entry.patch
 can-bcm-delay-release-of-struct-bcm_op-after-synchronize_rcu.patch
 mac80211-fix-memory-corruption-in-eapol-handling.patch
 powerpc-barrier-avoid-collision-with-clang-s-__lwsync-macro.patch
-drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch
 mmc-sdhci-fix-warning-message-when-accessing-rpmb-in-hs400-mode.patch
 ata-ahci_sunxi-disable-dipm.patch

diff --git a/queue-4.9/drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch b/queue-4.9/drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch
deleted file mode 100644 (file)
index d800009..0000000
--- a/queue-4.9/drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9ba85914c36c8fed9bf3e8b69c0782908c1247b7 Mon Sep 17 00:00:00 2001
-From: Jing Xiangfeng <jingxiangfeng@huawei.com>
-Date: Tue, 29 Jun 2021 19:44:55 +0800
-Subject: drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jing Xiangfeng <jingxiangfeng@huawei.com>
-
-commit 9ba85914c36c8fed9bf3e8b69c0782908c1247b7 upstream.
-
-radeon_user_framebuffer_create() misses to call drm_gem_object_put() in
-an error path. Add the missed function call to fix it.
-
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/radeon_display.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1359,6 +1359,7 @@ radeon_user_framebuffer_create(struct dr
-       /* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */
-       if (obj->import_attach) {
-               DRM_DEBUG_KMS("Cannot create framebuffer from imported dma_buf\n");
-+              drm_gem_object_put(obj);
-               return ERR_PTR(-EINVAL);
-       }
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index a2bca789716840936089aa39fb3467ffce5614a0..6742b2f69770796b238f1d8d66ae1dab89e298cf 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -160,7 +160,6 @@ can-gw-synchronize-rcu-operations-before-removing-gw-job-entry.patch
 can-bcm-delay-release-of-struct-bcm_op-after-synchronize_rcu.patch
 mac80211-fix-memory-corruption-in-eapol-handling.patch
 powerpc-barrier-avoid-collision-with-clang-s-__lwsync-macro.patch
-drm-radeon-add-the-missed-drm_gem_object_put-in-radeon_user_framebuffer_create.patch
 pinctrl-amd-add-device-hid-for-new-amd-gpio-controller.patch
 mmc-sdhci-fix-warning-message-when-accessing-rpmb-in-hs400-mode.patch
 mmc-core-clear-flags-before-allowing-to-retune.patch