Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-xe] [PATCH v11 02/12] drm/xe/vm: tidy up xe_runtime_pm usage
Date: Mon, 12 Jun 2023 18:12:15 +0100	[thread overview]
Message-ID: <20230612171225.88689-3-matthew.auld@intel.com> (raw)
In-Reply-To: <20230612171225.88689-1-matthew.auld@intel.com>

The xe_device_mem_access_get() should be all that's needed here and
should now work as expected, without any strange races. In theory should
be no functional changes here.

Reported-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/xe_vm.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index d1c380ad7f6b..d06892c6963f 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -1202,11 +1202,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
 
 	INIT_LIST_HEAD(&vm->extobj.list);
 
-	if (!(flags & XE_VM_FLAG_MIGRATION)) {
-		/* We need to immeditatelly exit from any D3 state */
-		xe_pm_runtime_get(xe);
+	if (!(flags & XE_VM_FLAG_MIGRATION))
 		xe_device_mem_access_get(xe);
-	}
 
 	err = dma_resv_lock_interruptible(&vm->resv, NULL);
 	if (err)
@@ -1318,10 +1315,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
 err_put:
 	dma_resv_fini(&vm->resv);
 	kfree(vm);
-	if (!(flags & XE_VM_FLAG_MIGRATION)) {
+	if (!(flags & XE_VM_FLAG_MIGRATION))
 		xe_device_mem_access_put(xe);
-		xe_pm_runtime_put(xe);
-	}
 	return ERR_PTR(err);
 }
 
@@ -1474,7 +1469,6 @@ static void vm_destroy_work_func(struct work_struct *w)
 
 	if (!(vm->flags & XE_VM_FLAG_MIGRATION)) {
 		xe_device_mem_access_put(xe);
-		xe_pm_runtime_put(xe);
 
 		if (xe->info.has_asid) {
 			mutex_lock(&xe->usm.lock);
-- 
2.40.1


  parent reply	other threads:[~2023-06-12 17:14 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-12 17:12 [Intel-xe] [PATCH v11 00/12] xe_device_mem_access fixes and related bits Matthew Auld
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 01/12] drm/xe: fix xe_device_mem_access_get() races Matthew Auld
2023-06-12 17:12 ` Matthew Auld [this message]
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 03/12] drm/xe/debugfs: grab mem_access around forcewake Matthew Auld
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 04/12] drm/xe/mmio: grab mem_access in xe_mmio_ioctl Matthew Auld
2023-06-12 18:13   ` Matthew Brost
2023-06-13  8:30     ` Matthew Auld
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 05/12] drm/xe: ensure correct access_put ordering Matthew Auld
2023-06-12 18:16   ` Matthew Brost
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 06/12] drm/xe/pci: wrap probe with mem_access Matthew Auld
2023-06-12 18:34   ` Matthew Brost
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 07/12] drm/xe/display: use mem_access underneath Matthew Auld
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 08/12] drm/xe/mmio: enforce xe_device_assert_mem_access Matthew Auld
2023-06-12 18:17   ` Matthew Brost
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 09/12] drm/xe: drop xe_device_mem_access_get() from guc_ct_send Matthew Auld
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 10/12] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM Matthew Auld
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 11/12] drm/xe: drop xe_device_mem_access_get() from invalidation_vma Matthew Auld
2023-06-12 18:22   ` Matthew Brost
2023-06-12 17:12 ` [Intel-xe] [PATCH v11 12/12] drm/xe: add lockdep annotation for xe_device_mem_access_get() Matthew Auld
2023-06-12 18:32   ` Matthew Brost
2023-06-13  9:42   ` Thomas Hellström
2023-06-13 10:13     ` Matthew Auld
2023-06-12 17:16 ` [Intel-xe] ✓ CI.Patch_applied: success for xe_device_mem_access fixes and related bits Patchwork
2023-06-12 17:17 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-06-12 17:18 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-06-12 17:22 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-06-12 17:22 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-06-12 17:23 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-06-12 17:52 ` [Intel-xe] ○ CI.BAT: info " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230612171225.88689-3-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=rodrigo.vivi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox