| Message ID | 20230124170522.1808-2-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | GuC oriented print macros | expand |
On 1/24/2023 09:05, Michal Wajdeczko wrote: > While we do have GT oriented print macros, add few more GuC > specific to have common look and feel across all messages > related to the GuC and to avoid chasing the gt pointer. > > We will use these macros shortly in upcoming patches. > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_print.h | 48 ++++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_print.h > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h > new file mode 100644 > index 000000000000..e75989d4ba06 > --- /dev/null > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h > @@ -0,0 +1,48 @@ > +/* SPDX-License-Identifier: MIT */ > +/* > + * Copyright © 2023 Intel Corporation > + */ > + > +#ifndef __INTEL_GUC_PRINT__ > +#define __INTEL_GUC_PRINT__ > + > +#include "gt/intel_gt.h" > +#include "gt/intel_gt_print.h" > + > +#define guc_printk(_guc, _level, _fmt, ...) \ > + gt_##_level(guc_to_gt(_guc), "GUC: " _fmt, ##__VA_ARGS__) > + > +#define guc_err(_guc, _fmt, ...) \ > + guc_printk((_guc), err, _fmt, ##__VA_ARGS__) > + > +#define guc_warn(_guc, _fmt, ...) \ > + guc_printk((_guc), warn, _fmt, ##__VA_ARGS__) > + > +#define guc_notice(_guc, _fmt, ...) \ > + guc_printk((_guc), notice, _fmt, ##__VA_ARGS__) > + > +#define guc_info(_guc, _fmt, ...) \ > + guc_printk((_guc), info, _fmt, ##__VA_ARGS__) > + > +#define guc_dbg(_guc, _fmt, ...) \ > + guc_printk((_guc), dbg, _fmt, ##__VA_ARGS__) > + > +#define guc_err_ratelimited(_guc, _fmt, ...) \ > + guc_printk((_guc), err_ratelimited, _fmt, ##__VA_ARGS__) > + > +#define guc_probe_error(_guc, _fmt, ...) \ > + guc_printk((_guc), probe_error, _fmt, ##__VA_ARGS__) > + > +#define guc_WARN(_guc, _cond, _fmt, ...) \ > + gt_WARN(guc_to_gt(_guc), _cond, "GUC: " _fmt, ##__VA_ARGS__) > + > +#define guc_WARN_ONCE(_guc, _cond, _fmt, ...) \ > + gt_WARN_ONCE(guc_to_gt(_guc), _cond, "GUC: " _fmt, ##__VA_ARGS__) > + > +#define guc_WARN_ON(_guc, _cond) \ > + gt_WARN(guc_to_gt(_guc), _cond, "%s(%s)", "guc_WARN_ON", __stringify(_cond)) > + > +#define guc_WARN_ON_ONCE(_guc, _cond) \ > + gt_WARN_ONCE(guc_to_gt(_guc), _cond, "%s(%s)", "guc_WARN_ON_ONCE", __stringify(_cond)) > + > +#endif /* __INTEL_GUC_PRINT__ */
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h new file mode 100644 index 000000000000..e75989d4ba06 --- /dev/null +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_print.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2023 Intel Corporation + */ + +#ifndef __INTEL_GUC_PRINT__ +#define __INTEL_GUC_PRINT__ + +#include "gt/intel_gt.h" +#include "gt/intel_gt_print.h" + +#define guc_printk(_guc, _level, _fmt, ...) \ + gt_##_level(guc_to_gt(_guc), "GUC: " _fmt, ##__VA_ARGS__) + +#define guc_err(_guc, _fmt, ...) \ + guc_printk((_guc), err, _fmt, ##__VA_ARGS__) + +#define guc_warn(_guc, _fmt, ...) \ + guc_printk((_guc), warn, _fmt, ##__VA_ARGS__) + +#define guc_notice(_guc, _fmt, ...) \ + guc_printk((_guc), notice, _fmt, ##__VA_ARGS__) + +#define guc_info(_guc, _fmt, ...) \ + guc_printk((_guc), info, _fmt, ##__VA_ARGS__) + +#define guc_dbg(_guc, _fmt, ...) \ + guc_printk((_guc), dbg, _fmt, ##__VA_ARGS__) + +#define guc_err_ratelimited(_guc, _fmt, ...) \ + guc_printk((_guc), err_ratelimited, _fmt, ##__VA_ARGS__) + +#define guc_probe_error(_guc, _fmt, ...) \ + guc_printk((_guc), probe_error, _fmt, ##__VA_ARGS__) + +#define guc_WARN(_guc, _cond, _fmt, ...) \ + gt_WARN(guc_to_gt(_guc), _cond, "GUC: " _fmt, ##__VA_ARGS__) + +#define guc_WARN_ONCE(_guc, _cond, _fmt, ...) \ + gt_WARN_ONCE(guc_to_gt(_guc), _cond, "GUC: " _fmt, ##__VA_ARGS__) + +#define guc_WARN_ON(_guc, _cond) \ + gt_WARN(guc_to_gt(_guc), _cond, "%s(%s)", "guc_WARN_ON", __stringify(_cond)) + +#define guc_WARN_ON_ONCE(_guc, _cond) \ + gt_WARN_ONCE(guc_to_gt(_guc), _cond, "%s(%s)", "guc_WARN_ON_ONCE", __stringify(_cond)) + +#endif /* __INTEL_GUC_PRINT__ */
While we do have GT oriented print macros, add few more GuC specific to have common look and feel across all messages related to the GuC and to avoid chasing the gt pointer. We will use these macros shortly in upcoming patches. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_guc_print.h | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_print.h