From: Greg Kroah-Hartman Date: Tue, 25 Jan 2022 08:33:28 +0000 (+0100) Subject: drop revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch X-Git-Tag: v4.4.300~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fe22ff717f0888b801083f24544bdbd2e44e490;p=thirdparty%2Fkernel%2Fstable-queue.git drop revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch the queues did not apply properly without this. --- diff --git a/queue-5.15/revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch b/queue-5.15/revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch deleted file mode 100644 index 04de88a7381..00000000000 --- a/queue-5.15/revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8b5da5a458c95ad49571a6a6285800bf13409616 Mon Sep 17 00:00:00 2001 -From: Rajneesh Bhardwaj -Date: Mon, 10 Jan 2022 12:14:10 -0500 -Subject: Revert "drm/amdgpu: Don't inherit GEM object VMAs in child process" - -From: Rajneesh Bhardwaj - -commit 8b5da5a458c95ad49571a6a6285800bf13409616 upstream. - -This reverts commit fbcdbfde87509d523132b59f661a355c731139d0. - -Reviewed-by: Felix Kuehling -Signed-off-by: Rajneesh Bhardwaj -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 --- - 1 file changed, 3 deletions(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c -@@ -264,9 +264,6 @@ static int amdgpu_gem_object_mmap(struct - !(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))) - vma->vm_flags &= ~VM_MAYWRITE; - -- if (bo->kfd_bo) -- vma->vm_flags |= VM_DONTCOPY; -- - return drm_gem_ttm_mmap(obj, vma); - } - diff --git a/queue-5.15/series b/queue-5.15/series index a8d833da06b..74cdbc3e8a5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -723,7 +723,6 @@ ext4-fix-an-use-after-free-issue-about-data-journal-writeback-mode.patch ext4-don-t-use-the-orphan-list-when-migrating-an-inode.patch tracing-osnoise-properly-unhook-events-if-start_per_cpu_kthreads-fails.patch ath11k-qmi-avoid-error-messages-when-dma-allocation-fails.patch -revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch of-base-improve-argument-length-mismatch-error.patch firmware-update-kconfig-help-text-for-google-firmware.patch diff --git a/queue-5.16/revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch b/queue-5.16/revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch deleted file mode 100644 index 04de88a7381..00000000000 --- a/queue-5.16/revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8b5da5a458c95ad49571a6a6285800bf13409616 Mon Sep 17 00:00:00 2001 -From: Rajneesh Bhardwaj -Date: Mon, 10 Jan 2022 12:14:10 -0500 -Subject: Revert "drm/amdgpu: Don't inherit GEM object VMAs in child process" - -From: Rajneesh Bhardwaj - -commit 8b5da5a458c95ad49571a6a6285800bf13409616 upstream. - -This reverts commit fbcdbfde87509d523132b59f661a355c731139d0. - -Reviewed-by: Felix Kuehling -Signed-off-by: Rajneesh Bhardwaj -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 --- - 1 file changed, 3 deletions(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c -@@ -264,9 +264,6 @@ static int amdgpu_gem_object_mmap(struct - !(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))) - vma->vm_flags &= ~VM_MAYWRITE; - -- if (bo->kfd_bo) -- vma->vm_flags |= VM_DONTCOPY; -- - return drm_gem_ttm_mmap(obj, vma); - } - diff --git a/queue-5.16/series b/queue-5.16/series index 70f32180b71..85917565d0f 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -897,7 +897,6 @@ ext4-destroy-ext4_fc_dentry_cachep-kmemcache-on-module-removal.patch ext4-fix-null-ptr-deref-in-__ext4_journal_ensure_credits.patch ext4-fix-an-use-after-free-issue-about-data-journal-writeback-mode.patch ext4-don-t-use-the-orphan-list-when-migrating-an-inode.patch -revert-drm-amdgpu-don-t-inherit-gem-object-vmas-in-child-process.patch drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch drm-amdgpu-display-only-set-vblank_disable_immediate-when-psr-is-not-enabled.patch firmware-update-kconfig-help-text-for-google-firmware.patch