From: Matthew Auld <matthew.auld@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-xe] [PATCH v10 7/9] drm/xe/vm: tidy up xe_runtime_pm usage
Date: Wed, 24 May 2023 18:56:59 +0100 [thread overview]
Message-ID: <20230524175701.320653-7-matthew.auld@intel.com> (raw)
In-Reply-To: <20230524175701.320653-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>
---
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 a0306526b269..8d14ee7bf70f 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -1145,11 +1145,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)
@@ -1263,10 +1260,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);
}
@@ -1419,7 +1414,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
next prev parent reply other threads:[~2023-05-24 17:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 17:56 [Intel-xe] [PATCH v10 1/9] drm/xe: don't allocate under ct->lock Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 2/9] drm/xe: keep pulling mem_access_get further back Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 3/9] drm/xe: drop xe_device_mem_access_get() from guc_ct_send Matthew Auld
2023-05-24 19:33 ` Rodrigo Vivi
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 4/9] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 5/9] drm/xe: drop xe_device_mem_access_get() from invalidation_vma Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 6/9] drm/xe: fix xe_device_mem_access_get() races Matthew Auld
2023-05-24 17:56 ` Matthew Auld [this message]
2023-05-24 19:30 ` [Intel-xe] [PATCH v10 7/9] drm/xe/vm: tidy up xe_runtime_pm usage Rodrigo Vivi
2023-05-24 17:57 ` [Intel-xe] [PATCH v10 8/9] drm/xe: add lockdep annotation for xe_device_mem_access_get() Matthew Auld
2023-05-24 17:57 ` [Intel-xe] [PATCH v10 9/9] drm/xe/debugfs: grab mem_access around forcewake Matthew Auld
2023-05-24 19:32 ` Rodrigo Vivi
2023-05-24 18:33 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [v10,1/9] drm/xe: don't allocate under ct->lock Patchwork
2023-05-24 18:34 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-24 18:38 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-24 19:14 ` [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=20230524175701.320653-7-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