From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: John Harrison <John.C.Harrison@Intel.com>,
Michal Wajdeczko <michal.wajdeczko@intel.com>
Subject: [PATCH 4/8] drm/i915/guc: Update GuC messages in intel_guc_ct.c
Date: Fri, 20 Jan 2023 17:40:46 +0100 [thread overview]
Message-ID: <20230120164050.1765-5-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20230120164050.1765-1-michal.wajdeczko@intel.com>
Use new macros to have common prefix that also include GT#.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
index 2b22065e87bf..89adfc4193d2 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -11,6 +11,7 @@
#include "i915_drv.h"
#include "intel_guc_ct.h"
+#include "intel_guc_print.h"
#include "gt/intel_gt.h"
static inline struct intel_guc *ct_to_guc(struct intel_guc_ct *ct)
@@ -28,21 +29,16 @@ static inline struct drm_i915_private *ct_to_i915(struct intel_guc_ct *ct)
return ct_to_gt(ct)->i915;
}
-static inline struct drm_device *ct_to_drm(struct intel_guc_ct *ct)
-{
- return &ct_to_i915(ct)->drm;
-}
-
#define CT_ERROR(_ct, _fmt, ...) \
- drm_err(ct_to_drm(_ct), "CT: " _fmt, ##__VA_ARGS__)
+ guc_err(ct_to_guc(_ct), "CT: " _fmt, ##__VA_ARGS__)
#ifdef CONFIG_DRM_I915_DEBUG_GUC
#define CT_DEBUG(_ct, _fmt, ...) \
- drm_dbg(ct_to_drm(_ct), "CT: " _fmt, ##__VA_ARGS__)
+ guc_dbg(ct_to_guc(_ct), "CT: " _fmt, ##__VA_ARGS__)
#else
#define CT_DEBUG(...) do { } while (0)
#endif
#define CT_PROBE_ERROR(_ct, _fmt, ...) \
- i915_probe_error(ct_to_i915(ct), "CT: " _fmt, ##__VA_ARGS__)
+ guc_probe_error(ct_to_guc(ct), "CT: " _fmt, ##__VA_ARGS__)
/**
* DOC: CTB Blob
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 4/8] drm/i915/guc: Update GuC messages in intel_guc_ct.c
Date: Fri, 20 Jan 2023 17:40:46 +0100 [thread overview]
Message-ID: <20230120164050.1765-5-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20230120164050.1765-1-michal.wajdeczko@intel.com>
Use new macros to have common prefix that also include GT#.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
index 2b22065e87bf..89adfc4193d2 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -11,6 +11,7 @@
#include "i915_drv.h"
#include "intel_guc_ct.h"
+#include "intel_guc_print.h"
#include "gt/intel_gt.h"
static inline struct intel_guc *ct_to_guc(struct intel_guc_ct *ct)
@@ -28,21 +29,16 @@ static inline struct drm_i915_private *ct_to_i915(struct intel_guc_ct *ct)
return ct_to_gt(ct)->i915;
}
-static inline struct drm_device *ct_to_drm(struct intel_guc_ct *ct)
-{
- return &ct_to_i915(ct)->drm;
-}
-
#define CT_ERROR(_ct, _fmt, ...) \
- drm_err(ct_to_drm(_ct), "CT: " _fmt, ##__VA_ARGS__)
+ guc_err(ct_to_guc(_ct), "CT: " _fmt, ##__VA_ARGS__)
#ifdef CONFIG_DRM_I915_DEBUG_GUC
#define CT_DEBUG(_ct, _fmt, ...) \
- drm_dbg(ct_to_drm(_ct), "CT: " _fmt, ##__VA_ARGS__)
+ guc_dbg(ct_to_guc(_ct), "CT: " _fmt, ##__VA_ARGS__)
#else
#define CT_DEBUG(...) do { } while (0)
#endif
#define CT_PROBE_ERROR(_ct, _fmt, ...) \
- i915_probe_error(ct_to_i915(ct), "CT: " _fmt, ##__VA_ARGS__)
+ guc_probe_error(ct_to_guc(ct), "CT: " _fmt, ##__VA_ARGS__)
/**
* DOC: CTB Blob
--
2.25.1
next prev parent reply other threads:[~2023-01-20 16:41 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 16:40 [PATCH 0/8] GuC oriented print macros Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-20 16:40 ` [PATCH 1/8] drm/i915/guc: Add " Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-23 23:27 ` John Harrison
2023-01-23 23:27 ` [Intel-gfx] " John Harrison
2023-01-24 10:59 ` Michal Wajdeczko
2023-01-24 10:59 ` [Intel-gfx] " Michal Wajdeczko
2023-01-20 16:40 ` [PATCH 2/8] drm/i915/guc: Update GuC messages in intel_guc.c Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-23 22:48 ` John Harrison
2023-01-23 22:48 ` [Intel-gfx] " John Harrison
2023-01-20 16:40 ` [PATCH 3/8] drm/i915/guc: Update GuC messages in intel_guc_ads.c Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-23 22:50 ` John Harrison
2023-01-23 22:50 ` [Intel-gfx] " John Harrison
2023-01-20 16:40 ` Michal Wajdeczko [this message]
2023-01-20 16:40 ` [Intel-gfx] [PATCH 4/8] drm/i915/guc: Update GuC messages in intel_guc_ct.c Michal Wajdeczko
2023-01-20 19:49 ` kernel test robot
2023-01-20 19:49 ` kernel test robot
2023-01-20 19:49 ` [Intel-gfx] " kernel test robot
2023-01-23 22:54 ` John Harrison
2023-01-23 22:54 ` [Intel-gfx] " John Harrison
2023-01-20 16:40 ` [Intel-gfx] [PATCH 5/8] drm/i915/guc: Update GuC messages in intel_guc_fw.c Michal Wajdeczko
2023-01-20 16:40 ` Michal Wajdeczko
2023-01-23 22:57 ` John Harrison
2023-01-23 22:57 ` [Intel-gfx] " John Harrison
2023-01-20 16:40 ` [PATCH 6/8] drm/i915/guc: Update GuC messages in intel_guc_log.c Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-23 23:01 ` John Harrison
2023-01-23 23:01 ` [Intel-gfx] " John Harrison
2023-01-24 13:42 ` Michal Wajdeczko
2023-01-24 13:42 ` [Intel-gfx] " Michal Wajdeczko
2023-01-20 16:40 ` [PATCH 7/8] drm/i915/guc: Update GuC messages in intel_guc_submission.c Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-23 23:11 ` John Harrison
2023-01-23 23:11 ` [Intel-gfx] " John Harrison
2023-01-20 16:40 ` [PATCH 8/8] drm/i915/guc: Update GT/GuC messages in intel_uc.c Michal Wajdeczko
2023-01-20 16:40 ` [Intel-gfx] " Michal Wajdeczko
2023-01-23 23:19 ` John Harrison
2023-01-23 23:19 ` [Intel-gfx] " John Harrison
2023-01-20 19:37 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for GuC oriented print macros Patchwork
2023-01-20 19:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-21 20:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20230120164050.1765-5-michal.wajdeczko@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=John.C.Harrison@Intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.