From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>,
Julia Filipchuk <julia.filipchuk@intel.com>,
John Harrison <John.C.Harrison@Intel.com>
Subject: [PATCH 1/6] drm/xe/guc: Fix GUC_{SUBMIT,FIRMWARE}_VER helper macros
Date: Thu, 12 Sep 2024 22:38:12 +0200 [thread overview]
Message-ID: <20240912203817.1880-2-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20240912203817.1880-1-michal.wajdeczko@intel.com>
Those macros rely on non-existing MAKE_VER_STRUCT macro, while the
correct one that should be used is named MAKE_GUC_VER_STRUCT.
Fixes: 4eb0aab6e443 ("drm/xe/guc: Bump minimum required GuC version to v70.29.2")
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Julia Filipchuk <julia.filipchuk@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/xe/xe_guc.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h
index c3e6b51f7a09..42116b167c98 100644
--- a/drivers/gpu/drm/xe/xe_guc.h
+++ b/drivers/gpu/drm/xe/xe_guc.h
@@ -18,8 +18,10 @@
*/
#define MAKE_GUC_VER(maj, min, pat) (((maj) << 16) | ((min) << 8) | (pat))
#define MAKE_GUC_VER_STRUCT(ver) MAKE_GUC_VER((ver).major, (ver).minor, (ver).patch)
-#define GUC_SUBMIT_VER(guc) MAKE_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_COMPATIBILITY])
-#define GUC_FIRMWARE_VER(guc) MAKE_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_RELEASE])
+#define GUC_SUBMIT_VER(guc) \
+ MAKE_GUC_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_COMPATIBILITY])
+#define GUC_FIRMWARE_VER(guc) \
+ MAKE_GUC_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_RELEASE])
struct drm_printer;
--
2.43.0
next prev parent reply other threads:[~2024-09-12 20:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 20:38 [PATCH 0/6] PF: Initial support to save/restore VF GuC state Michal Wajdeczko
2024-09-12 20:38 ` Michal Wajdeczko [this message]
2024-09-12 20:38 ` [PATCH 2/6] drm/xe/guc: Add PF2GUC_SAVE_RESTORE_VF to ABI Michal Wajdeczko
2024-09-12 20:38 ` [PATCH 3/6] drm/xe/pf: Add functions to save and restore VF GuC state Michal Wajdeczko
2024-09-13 12:00 ` Michal Wajdeczko
2024-09-12 20:38 ` [PATCH 4/6] drm/xe/pf: Save VF GuC state when pausing VF Michal Wajdeczko
2024-09-12 20:38 ` [PATCH 5/6] drm/xe/pf: Allow to view and replace VF GuC state over debugfs Michal Wajdeczko
2024-09-12 20:38 ` [PATCH 6/6] drm/xe/pf: Allow to trigger VF GuC state restore from debugfs Michal Wajdeczko
2024-09-12 20:43 ` ✓ CI.Patch_applied: success for PF: Initial support to save/restore VF GuC state Patchwork
2024-09-12 20:44 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-12 20:45 ` ✓ CI.KUnit: success " Patchwork
2024-09-12 20:50 ` ✗ CI.Build: failure " Patchwork
2024-09-13 15:15 ` ✓ CI.Patch_applied: success for PF: Initial support to save/restore VF GuC state (rev2) Patchwork
2024-09-13 15:16 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-13 15:17 ` ✓ CI.KUnit: success " Patchwork
2024-09-13 15:28 ` ✓ CI.Build: " Patchwork
2024-09-13 15:31 ` ✓ CI.Hooks: " Patchwork
2024-09-13 15:32 ` ✓ CI.checksparse: " Patchwork
2024-09-13 15:50 ` ✓ CI.BAT: " Patchwork
2024-09-14 7:08 ` ✗ CI.FULL: failure " Patchwork
2024-09-16 10:59 ` Michal Wajdeczko
2024-09-16 9:57 ` [PATCH 0/6] PF: Initial support to save/restore VF GuC state Michał Winiarski
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=20240912203817.1880-2-michal.wajdeczko@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=John.C.Harrison@Intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=julia.filipchuk@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