From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Subject: [PATCH 4/4] drm/xe/vf: Ignore force-wake requests if VF
Date: Mon, 10 Jun 2024 20:37:57 +0200 [thread overview]
Message-ID: <20240610183757.1812-5-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20240610183757.1812-1-michal.wajdeczko@intel.com>
The control and ack force-wake registers are not accessible for
the VF drivers. To avoid changing existing code logic that tracks
woken domains, simply ignore all attempts to access control or ack
registers if we are running as a VF driver.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
drivers/gpu/drm/xe/xe_force_wake.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c
index b0baa9094418..4d472192e87b 100644
--- a/drivers/gpu/drm/xe/xe_force_wake.c
+++ b/drivers/gpu/drm/xe/xe_force_wake.c
@@ -12,6 +12,7 @@
#include "xe_gt.h"
#include "xe_gt_printk.h"
#include "xe_mmio.h"
+#include "xe_sriov.h"
#define XE_FORCE_WAKE_ACK_TIMEOUT_MS 50
@@ -101,6 +102,9 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw)
static void __domain_ctl(struct xe_gt *gt, struct xe_force_wake_domain *domain, bool wake)
{
+ if (IS_SRIOV(gt_to_xe(gt)))
+ return;
+
xe_mmio_write32(gt, domain->reg_ctl, domain->mask | (wake ? domain->val : 0));
}
@@ -109,6 +113,9 @@ static int __domain_wait(struct xe_gt *gt, struct xe_force_wake_domain *domain,
u32 value;
int ret;
+ if (IS_SRIOV(gt_to_xe(gt)))
+ return 0;
+
ret = xe_mmio_wait32(gt, domain->reg_ack, domain->val, wake ? domain->val : 0,
XE_FORCE_WAKE_ACK_TIMEOUT_MS * USEC_PER_MSEC,
&value, true);
--
2.43.0
next prev parent reply other threads:[~2024-06-10 18:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 18:37 [PATCH 0/4] Prepare Xe force-wake code for VFs Michal Wajdeczko
2024-06-10 18:37 ` [PATCH 1/4] drm/xe: Prefer GT oriented messages in xe_force_wake.c Michal Wajdeczko
2024-06-10 19:44 ` Rodrigo Vivi
2024-06-10 18:37 ` [PATCH 2/4] drm/xe: Include additional info on failed force-wake operation Michal Wajdeczko
2024-06-10 19:47 ` Rodrigo Vivi
2024-06-10 18:37 ` [PATCH 3/4] drm/xe: Combine common force-wake code into helpers Michal Wajdeczko
2024-06-10 19:51 ` Rodrigo Vivi
2024-06-10 18:37 ` Michal Wajdeczko [this message]
2024-06-10 19:51 ` [PATCH 4/4] drm/xe/vf: Ignore force-wake requests if VF Rodrigo Vivi
2024-06-10 18:54 ` ✓ CI.Patch_applied: success for Prepare Xe force-wake code for VFs Patchwork
2024-06-10 18:54 ` ✓ CI.checkpatch: " Patchwork
2024-06-10 18:55 ` ✓ CI.KUnit: " Patchwork
2024-06-10 19:07 ` ✓ CI.Build: " Patchwork
2024-06-10 19:09 ` ✓ CI.Hooks: " Patchwork
2024-06-10 19:10 ` ✓ CI.checksparse: " Patchwork
2024-06-11 6:09 ` ✓ CI.Patch_applied: success for Prepare Xe force-wake code for VFs (rev2) Patchwork
2024-06-11 6:09 ` ✓ CI.checkpatch: " Patchwork
2024-06-11 6:10 ` ✓ CI.KUnit: " Patchwork
2024-06-11 6:22 ` ✓ CI.Build: " Patchwork
2024-06-11 6:24 ` ✗ CI.Hooks: failure " Patchwork
2024-06-11 6:25 ` ✓ CI.checksparse: success " Patchwork
2024-06-11 7:08 ` ✓ CI.BAT: " Patchwork
2024-06-11 8:45 ` ✓ CI.FULL: " 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=20240610183757.1812-5-michal.wajdeczko@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/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