From: Matthew Auld <matthew.auld@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-xe] [PATCH v13 06/10] drm/xe: ensure correct access_put ordering
Date: Thu, 13 Jul 2023 14:22:51 +0100 [thread overview]
Message-ID: <20230713132244.459605-18-matthew.auld@intel.com> (raw)
In-Reply-To: <20230713132244.459605-12-matthew.auld@intel.com>
Only call access_put after dropping the forcewake. In theory the device
could suspend, but really we want to start asserting that we have a
mem_access.ref when touching mmio.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/xe/xe_gt.c | 8 ++++----
drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 +-
drivers/gpu/drm/xe/xe_guc_pc.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index a21d44bfe9e8..7db8eaf311ec 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -534,8 +534,8 @@ static int gt_reset(struct xe_gt *gt)
if (err)
goto err_out;
- xe_device_mem_access_put(gt_to_xe(gt));
err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
+ xe_device_mem_access_put(gt_to_xe(gt));
XE_WARN_ON(err);
xe_gt_info(gt, "reset done\n");
@@ -578,8 +578,8 @@ void xe_gt_suspend_prepare(struct xe_gt *gt)
xe_uc_stop_prepare(>->uc);
- xe_device_mem_access_put(gt_to_xe(gt));
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+ xe_device_mem_access_put(gt_to_xe(gt));
}
int xe_gt_suspend(struct xe_gt *gt)
@@ -601,8 +601,8 @@ int xe_gt_suspend(struct xe_gt *gt)
if (err)
goto err_force_wake;
- xe_device_mem_access_put(gt_to_xe(gt));
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+ xe_device_mem_access_put(gt_to_xe(gt));
xe_gt_info(gt, "suspended\n");
return 0;
@@ -629,8 +629,8 @@ int xe_gt_resume(struct xe_gt *gt)
if (err)
goto err_force_wake;
- xe_device_mem_access_put(gt_to_xe(gt));
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+ xe_device_mem_access_put(gt_to_xe(gt));
xe_gt_info(gt, "resumed\n");
return 0;
diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index b5a5538ae630..98dd3b2506b1 100644
--- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
@@ -45,8 +45,8 @@ static int hw_engines(struct seq_file *m, void *data)
for_each_hw_engine(hwe, gt, id)
xe_hw_engine_print(hwe, &p);
- xe_device_mem_access_put(xe);
err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
+ xe_device_mem_access_put(xe);
if (err)
return err;
diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index a5aae624d11e..b34792f6c767 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -839,8 +839,8 @@ int xe_guc_pc_start(struct xe_guc_pc *pc)
ret = pc_action_setup_gucrc(pc, XE_GUCRC_FIRMWARE_CONTROL);
out:
- xe_device_mem_access_put(pc_to_xe(pc));
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+ xe_device_mem_access_put(pc_to_xe(pc));
return ret;
}
--
2.41.0
next prev parent reply other threads:[~2023-07-13 13:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 13:22 [Intel-xe] [PATCH v13 00/10] xe_device_mem_access fixes and related bits Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 01/10] drm/xe: fix xe_device_mem_access_get() races Matthew Auld
2023-07-14 13:04 ` Gupta, Anshuman
2023-07-14 15:34 ` Rodrigo Vivi
2023-07-17 10:53 ` Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 02/10] drm/xe/vm: tidy up xe_runtime_pm usage Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 03/10] drm/xe/debugfs: grab mem_access around forcewake Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 04/10] drm/xe/guc_pc: add missing mem_access for freq_rpe_show Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 05/10] drm/xe/mmio: grab mem_access in xe_mmio_ioctl Matthew Auld
2023-07-13 13:22 ` Matthew Auld [this message]
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 07/10] drm/xe: drop xe_device_mem_access_get() from guc_ct_send Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 08/10] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 09/10] drm/xe: drop xe_device_mem_access_get() from invalidation_vma Matthew Auld
2023-07-13 13:22 ` [Intel-xe] [PATCH v13 10/10] drm/xe: add lockdep annotation for xe_device_mem_access_get() Matthew Auld
2023-07-14 15:40 ` Rodrigo Vivi
2023-07-13 15:29 ` [Intel-xe] ✓ CI.Patch_applied: success for xe_device_mem_access fixes and related bits (rev3) Patchwork
2023-07-13 15:30 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-07-13 15:31 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-07-13 15:35 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-07-13 15:35 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-07-13 15:36 ` [Intel-xe] ✓ CI.checksparse: " 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=20230713132244.459605-18-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