| Message ID | 20230203001143.3323433-7-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | More drm_dbg to guc_dbg changes | expand |
On 03.02.2023 01:11, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > Update a bunch more debug prints to use the new GT based scheme. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > --- > drivers/gpu/drm/i915/gt/intel_gt_print.h | 3 +++ > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 3 +-- > drivers/gpu/drm/i915/gt/uc/intel_guc_print.h | 3 +++ > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_print.h b/drivers/gpu/drm/i915/gt/intel_gt_print.h > index 5d9da355ce242..55a336a9ff061 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_print.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_print.h > @@ -28,6 +28,9 @@ > #define gt_err_ratelimited(_gt, _fmt, ...) \ > drm_err_ratelimited(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) > > +#define gt_notice_ratelimited(_gt, _fmt, ...) \ > + dev_notice_ratelimited((_gt)->i915->drm.dev, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) > + > #define gt_probe_error(_gt, _fmt, ...) \ > do { \ > if (i915_error_injected()) \ > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > index c3792ddeec802..818e9e0e66a83 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > @@ -333,8 +333,7 @@ bool intel_guc_check_log_buf_overflow(struct intel_guc_log *log, > log->stats[type].sampled_overflow += 16; > } > > - dev_notice_ratelimited(guc_to_gt(log_to_guc(log))->i915->drm.dev, > - "GuC log buffer overflow\n"); > + guc_notice_ratelimited(log_to_guc(log), "log buffer overflow\n"); > } > > return overflow; > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h > index e75989d4ba067..2465d05638b40 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h > @@ -30,6 +30,9 @@ > #define guc_err_ratelimited(_guc, _fmt, ...) \ > guc_printk((_guc), err_ratelimited, _fmt, ##__VA_ARGS__) > > +#define guc_notice_ratelimited(_guc, _fmt, ...) \ > + guc_printk((_guc), notice_ratelimited, _fmt, ##__VA_ARGS__) > + > #define guc_probe_error(_guc, _fmt, ...) \ > guc_printk((_guc), probe_error, _fmt, ##__VA_ARGS__) > Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_print.h b/drivers/gpu/drm/i915/gt/intel_gt_print.h index 5d9da355ce242..55a336a9ff061 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_print.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_print.h @@ -28,6 +28,9 @@ #define gt_err_ratelimited(_gt, _fmt, ...) \ drm_err_ratelimited(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) +#define gt_notice_ratelimited(_gt, _fmt, ...) \ + dev_notice_ratelimited((_gt)->i915->drm.dev, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + #define gt_probe_error(_gt, _fmt, ...) \ do { \ if (i915_error_injected()) \ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c index c3792ddeec802..818e9e0e66a83 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c @@ -333,8 +333,7 @@ bool intel_guc_check_log_buf_overflow(struct intel_guc_log *log, log->stats[type].sampled_overflow += 16; } - dev_notice_ratelimited(guc_to_gt(log_to_guc(log))->i915->drm.dev, - "GuC log buffer overflow\n"); + guc_notice_ratelimited(log_to_guc(log), "log buffer overflow\n"); } return overflow; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h index e75989d4ba067..2465d05638b40 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h @@ -30,6 +30,9 @@ #define guc_err_ratelimited(_guc, _fmt, ...) \ guc_printk((_guc), err_ratelimited, _fmt, ##__VA_ARGS__) +#define guc_notice_ratelimited(_guc, _fmt, ...) \ + guc_printk((_guc), notice_ratelimited, _fmt, ##__VA_ARGS__) + #define guc_probe_error(_guc, _fmt, ...) \ guc_printk((_guc), probe_error, _fmt, ##__VA_ARGS__)