proj/linux-patches:7.1 commit in: /

"Mike Pagano" <[email protected]> Mon, 03 Aug 2026 11:27:32 +0000 (UTC)
Newsgroups gmane.linux.gentoo.cvs
Message-ID <1785756426.6cefa69feb14429ed866159dcf1ec095d241a716.mpagano@gentoo>
commit:     6cefa69feb14429ed866159dcf1ec095d241a716
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 11:27:06 2026 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 11:27:06 2026 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=6cefa69f

Remove redundant patch

Removed:
2700_drm-amdgpu-fix-check-in-amdgpu-hmm-invalidate-gfx.patch

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                                        |  4 --
 ...pu-fix-check-in-amdgpu-hmm-invalidate-gfx.patch | 61 ----------------------
 2 files changed, 65 deletions(-)

diff --git a/0000_README b/0000_README
index 414dc26f..6443236f 100644
--- a/0000_README
+++ b/0000_README
@@ -87,10 +87,6 @@ Patch:  2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
 From:   https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org/raw
 Desc:   Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
 
-Patch:  2700_drm-amdgpu-fix-check-in-amdgpu-hmm-invalidate-gfx.patch
-From:   https://gitlab.freedesktop.org/agd5f/linux/-/commit/631849ff5d603841e74f19f4a5e30fe1f7d7cf30
-Desc:   drm/amdgpu: fix check in amdgpu_hmm_invalidate_gfx
-
 Patch:  2901_permit-menuconfig-sorting.patch
 From:   https://lore.kernel.org/
 Desc:   menuconfig: Allow sorting the entries alphabetically

diff --git a/2700_drm-amdgpu-fix-check-in-amdgpu-hmm-invalidate-gfx.patch b/2700_drm-amdgpu-fix-check-in-amdgpu-hmm-invalidate-gfx.patch
deleted file mode 100644
index 0f9969f0..00000000
--- a/2700_drm-amdgpu-fix-check-in-amdgpu-hmm-invalidate-gfx.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 631849ff5d603841e74f19f4a5e30fe1f7d7cf30 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
-Date: Wed, 24 Jun 2026 16:00:41 +0200
-Subject: [PATCH] drm/amdgpu: fix check in amdgpu_hmm_invalidate_gfx
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For a short moment during alloc/free the userptr BO is not part of his VM,
-so bo->vm_bo can be NULL.
-
-Keep a reference to the VM root PD as parent of the userptr BO so that
-we can always use that to wait for all submissions of the VM instead of
-only the one involving the userptr BO.
-
-Signed-off-by: Christian König <[email protected]>
-Fixes: 91250893cbaa ("drm/amdgpu: fix waiting for all submissions for userptrs")
-Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5399
-Reviewed-by: Alex Deucher <[email protected]>
-Signed-off-by: Alex Deucher <[email protected]>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 +
- drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-index 76da3f932f246..6a0699746fbcd 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-@@ -535,6 +535,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
- 	bo = gem_to_amdgpu_bo(gobj);
- 	bo->preferred_domains = AMDGPU_GEM_DOMAIN_GTT;
- 	bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;
-+	bo->parent = amdgpu_bo_ref(fpriv->vm.root.bo);
- 	r = amdgpu_ttm_tt_set_userptr(&bo->tbo, args->addr, args->flags);
- 	if (r)
- 		goto release_object;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
-index 99bc9ad67d5b8..a7d13e337d846 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
-@@ -67,7 +67,6 @@ static bool amdgpu_hmm_invalidate_gfx(struct mmu_interval_notifier *mni,
- {
- 	struct amdgpu_bo *bo = container_of(mni, struct amdgpu_bo, notifier);
- 	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
--	struct amdgpu_bo *vm_root = bo->vm_bo->vm->root.bo;
- 	long r;
- 
- 	if (!mmu_notifier_range_blockable(range))
-@@ -78,7 +77,7 @@ static bool amdgpu_hmm_invalidate_gfx(struct mmu_interval_notifier *mni,
- 	mmu_interval_set_seq(mni, cur_seq);
- 
- 	amdgpu_vm_bo_invalidate(bo, false);
--	r = dma_resv_wait_timeout(vm_root->tbo.base.resv,
-+	r = dma_resv_wait_timeout(bo->parent->tbo.base.resv,
- 				  DMA_RESV_USAGE_BOOKKEEP, false,
- 				  MAX_SCHEDULE_TIMEOUT);
- 	mutex_unlock(&adev->notifier_lock);
--- 
-GitLab
-