drm: amd: drop 5.3+ commit
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/queue/drm-amdgpu-user-pages-array-memory-leak-fix.patch b/queue/drm-amdgpu-user-pages-array-memory-leak-fix.patch
deleted file mode 100644
index b67baa5..0000000
--- a/queue/drm-amdgpu-user-pages-array-memory-leak-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 46b187d697cda8bc73266b687ef56ea60ec6231a Mon Sep 17 00:00:00 2001
-From: Philip Yang <Philip.Yang@amd.com>
-Date: Thu, 3 Oct 2019 14:18:25 -0400
-Subject: [PATCH] drm/amdgpu: user pages array memory leak fix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 209620b422945ee03cebb03f726e706d537b692d upstream.
-
-user_pages array should always be freed after validation regardless if
-user pages are changed after bo is created because with HMM change parse
-bo always allocate user pages array to get user pages for userptr bo.
-
-v2: remove unused local variable and amend commit
-
-v3: add back get user pages in gem_userptr_ioctl, to detect application
-bug where an userptr VMA is not ananymous memory and reject it.
-
-Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962
-
-Signed-off-by: Philip Yang <Philip.Yang@amd.com>
-Tested-by: Joe Barnett <thejoe@gmail.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org # 5.3
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index bc40d6eabce7..5d01db60bafe 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -535,7 +535,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
-
- list_for_each_entry(lobj, validated, tv.head) {
- struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-- bool binding_userptr = false;
- struct mm_struct *usermm;
-
- usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
-@@ -552,7 +551,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
- return r;
- amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
- lobj->user_pages);
-- binding_userptr = true;
- }
-
- if (p->evictable == lobj)
-@@ -562,10 +560,8 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
- if (r)
- return r;
-
-- if (binding_userptr) {
-- kvfree(lobj->user_pages);
-- lobj->user_pages = NULL;
-- }
-+ kvfree(lobj->user_pages);
-+ lobj->user_pages = NULL;
- }
- return 0;
- }
---
-2.7.4
-
diff --git a/queue/series b/queue/series
index dc24467..6991002 100644
--- a/queue/series
+++ b/queue/series
@@ -109,7 +109,6 @@
drm-amdgpu-vcn-fix-allocation-size-in-enc-ring-test.patch
drm-amdgpu-uvd6-fix-allocation-size-in-enc-ring-test.patch
drm-amdgpu-uvd7-fix-allocation-size-in-enc-ring-test.patch
-drm-amdgpu-user-pages-array-memory-leak-fix.patch
drivers-base-memory.c-don-t-access-uninitialized-mem.patch
fs-proc-page.c-don-t-access-uninitialized-memmaps-in.patch
mmc-mxs-fix-flags-passed-to-dmaengine_prep_slave_sg.patch
