| Message ID | 20230124170522.1808-5-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: > Use new macros to have common prefix that also include GT#. > > v2: drop unused helpers > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@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_ct.c | 23 ++++------------------- > 1 file changed, 4 insertions(+), 19 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..1803a633ed64 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > @@ -11,38 +11,23 @@ > > #include "i915_drv.h" > #include "intel_guc_ct.h" > -#include "gt/intel_gt.h" > +#include "intel_guc_print.h" > > static inline struct intel_guc *ct_to_guc(struct intel_guc_ct *ct) > { > return container_of(ct, struct intel_guc, ct); > } > > -static inline struct intel_gt *ct_to_gt(struct intel_guc_ct *ct) > -{ > - return guc_to_gt(ct_to_guc(ct)); > -} > - > -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
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..1803a633ed64 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -11,38 +11,23 @@ #include "i915_drv.h" #include "intel_guc_ct.h" -#include "gt/intel_gt.h" +#include "intel_guc_print.h" static inline struct intel_guc *ct_to_guc(struct intel_guc_ct *ct) { return container_of(ct, struct intel_guc, ct); } -static inline struct intel_gt *ct_to_gt(struct intel_guc_ct *ct) -{ - return guc_to_gt(ct_to_guc(ct)); -} - -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
Use new macros to have common prefix that also include GT#. v2: drop unused helpers 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 | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)