| Message ID | 20231025143515.254468-2-andi.shyti@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add gt_to_guc and guc_to_i915 helpers | expand |
Hi Andi, On 10/25/2023 4:35 PM, Andi Shyti wrote: > Given a reference to "guc", the guc_to_i915() returns the > pointer to "i915" private data. > > Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/intel_gt.h | 5 +++++ > drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 10 +++++----- > drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 ++-- > 8 files changed, 17 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h > index 970bedf6b78a..12a638f05d63 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt.h > @@ -114,6 +114,11 @@ static inline struct intel_gt *gsc_to_gt(struct intel_gsc *gsc) > return container_of(gsc, struct intel_gt, gsc); > } > > +static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) > +{ > + return guc_to_gt(guc)->i915; > +} > + We don't want inline functions in headers files[1]. Otherwise the series looks fine to me: Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> [1] https://patchwork.freedesktop.org/series/124069/ Regards, Nirmoy > void intel_gt_common_init_early(struct intel_gt *gt); > int intel_root_gt_init_early(struct drm_i915_private *i915); > int intel_gt_assign_ggtt(struct intel_gt *gt); > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c > index 3f3df1166b86..2b450c43bbd7 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c > @@ -330,7 +330,7 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc) > > static u32 guc_ctl_devid(struct intel_guc *guc) > { > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > > return (INTEL_DEVID(i915) << 16) | INTEL_REVID(i915); > } > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c > index a4da0208c883..a1cd40d80517 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c > @@ -355,7 +355,7 @@ guc_capture_alloc_steered_lists(struct intel_guc *guc, > static const struct __guc_mmio_reg_descr_group * > guc_capture_get_device_reglist(struct intel_guc *guc) > { > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > const struct __guc_mmio_reg_descr_group *lists; > > if (GRAPHICS_VER(i915) >= 12) > 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 89e314b3756b..4e147de5118f 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > @@ -265,7 +265,7 @@ int intel_guc_ct_init(struct intel_guc_ct *ct) > u32 *cmds; > int err; > > - err = i915_inject_probe_error(guc_to_gt(guc)->i915, -ENXIO); > + err = i915_inject_probe_error(guc_to_i915(guc), -ENXIO); > if (err) > return err; > > 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 55bc8b55fbc0..bf16351c9349 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > @@ -520,7 +520,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log) > static int guc_log_relay_create(struct intel_guc_log *log) > { > struct intel_guc *guc = log_to_guc(log); > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > struct rchan *guc_log_relay_chan; > size_t n_subbufs, subbuf_size; > int ret; > @@ -573,7 +573,7 @@ static void guc_log_relay_destroy(struct intel_guc_log *log) > static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) > { > struct intel_guc *guc = log_to_guc(log); > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > intel_wakeref_t wakeref; > > _guc_log_copy_debuglogs_for_relay(log); > @@ -589,7 +589,7 @@ static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) > static u32 __get_default_log_level(struct intel_guc_log *log) > { > struct intel_guc *guc = log_to_guc(log); > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > > /* A negative value means "use platform/config default" */ > if (i915->params.guc_log_level < 0) { > @@ -664,7 +664,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log) > int intel_guc_log_set_level(struct intel_guc_log *log, u32 level) > { > struct intel_guc *guc = log_to_guc(log); > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > intel_wakeref_t wakeref; > int ret = 0; > > @@ -796,7 +796,7 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log) > static void guc_log_relay_stop(struct intel_guc_log *log) > { > struct intel_guc *guc = log_to_guc(log); > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > > if (!log->relay.started) > return; > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c > index 1adec6de223c..9df7927304ae 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c > @@ -14,7 +14,7 @@ static bool __guc_rc_supported(struct intel_guc *guc) > { > /* GuC RC is unavailable for pre-Gen12 */ > return guc->submission_supported && > - GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12; > + GRAPHICS_VER(guc_to_i915(guc)) >= 12; > } > > static bool __guc_rc_selected(struct intel_guc *guc) > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c > index 2dfb07cc4b33..3e681ab6fbf9 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c > @@ -34,7 +34,7 @@ static bool __detect_slpc_supported(struct intel_guc *guc) > { > /* GuC SLPC is unavailable for pre-Gen12 */ > return guc->submission_supported && > - GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12; > + GRAPHICS_VER(guc_to_i915(guc)) >= 12; > } > > static bool __guc_slpc_selected(struct intel_guc *guc) > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index d37698bd6b91..669f2892bf74 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -4624,12 +4624,12 @@ static bool __guc_submission_supported(struct intel_guc *guc) > { > /* GuC submission is unavailable for pre-Gen11 */ > return intel_guc_is_supported(guc) && > - GRAPHICS_VER(guc_to_gt(guc)->i915) >= 11; > + GRAPHICS_VER(guc_to_i915(guc)) >= 11; > } > > static bool __guc_submission_selected(struct intel_guc *guc) > { > - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; > + struct drm_i915_private *i915 = guc_to_i915(guc); > > if (!intel_guc_submission_is_supported(guc)) > return false;
Hi Nirmoy, > > +static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) > > +{ > > + return guc_to_gt(guc)->i915; > > +} > > + > > We don't want inline functions in headers files[1]. Otherwise the series > looks fine to me: the reason for that patch is that we were including the i915_drv.h just for that inline function and we were doing it inside the gt/. In this patch I am not changing any header dependency. I guess the original idea from Matt was to have a generic network of intel_gt_needs_wa_xxx(), but it didn't develop further. > Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> Thanks, Andi
On 10/25/2023 4:53 PM, Andi Shyti wrote: > Hi Nirmoy, > >>> +static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) >>> +{ >>> + return guc_to_gt(guc)->i915; >>> +} >>> + >> We don't want inline functions in headers files[1]. Otherwise the series >> looks fine to me: > the reason for that patch is that we were including the > i915_drv.h just for that inline function and we were doing it > inside the gt/. > > In this patch I am not changing any header dependency. Sounds fair, thanks, Nirmoy > > I guess the original idea from Matt was to have a generic network > of intel_gt_needs_wa_xxx(), but it didn't develop further. > >> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> > Thanks, > Andi
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h index 970bedf6b78a..12a638f05d63 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.h +++ b/drivers/gpu/drm/i915/gt/intel_gt.h @@ -114,6 +114,11 @@ static inline struct intel_gt *gsc_to_gt(struct intel_gsc *gsc) return container_of(gsc, struct intel_gt, gsc); } +static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) +{ + return guc_to_gt(guc)->i915; +} + void intel_gt_common_init_early(struct intel_gt *gt); int intel_root_gt_init_early(struct drm_i915_private *i915); int intel_gt_assign_ggtt(struct intel_gt *gt); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index 3f3df1166b86..2b450c43bbd7 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -330,7 +330,7 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc) static u32 guc_ctl_devid(struct intel_guc *guc) { - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); return (INTEL_DEVID(i915) << 16) | INTEL_REVID(i915); } diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c index a4da0208c883..a1cd40d80517 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c @@ -355,7 +355,7 @@ guc_capture_alloc_steered_lists(struct intel_guc *guc, static const struct __guc_mmio_reg_descr_group * guc_capture_get_device_reglist(struct intel_guc *guc) { - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); const struct __guc_mmio_reg_descr_group *lists; if (GRAPHICS_VER(i915) >= 12) 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 89e314b3756b..4e147de5118f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -265,7 +265,7 @@ int intel_guc_ct_init(struct intel_guc_ct *ct) u32 *cmds; int err; - err = i915_inject_probe_error(guc_to_gt(guc)->i915, -ENXIO); + err = i915_inject_probe_error(guc_to_i915(guc), -ENXIO); if (err) return err; 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 55bc8b55fbc0..bf16351c9349 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c @@ -520,7 +520,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log) static int guc_log_relay_create(struct intel_guc_log *log) { struct intel_guc *guc = log_to_guc(log); - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); struct rchan *guc_log_relay_chan; size_t n_subbufs, subbuf_size; int ret; @@ -573,7 +573,7 @@ static void guc_log_relay_destroy(struct intel_guc_log *log) static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) { struct intel_guc *guc = log_to_guc(log); - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); intel_wakeref_t wakeref; _guc_log_copy_debuglogs_for_relay(log); @@ -589,7 +589,7 @@ static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) static u32 __get_default_log_level(struct intel_guc_log *log) { struct intel_guc *guc = log_to_guc(log); - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); /* A negative value means "use platform/config default" */ if (i915->params.guc_log_level < 0) { @@ -664,7 +664,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log) int intel_guc_log_set_level(struct intel_guc_log *log, u32 level) { struct intel_guc *guc = log_to_guc(log); - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); intel_wakeref_t wakeref; int ret = 0; @@ -796,7 +796,7 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log) static void guc_log_relay_stop(struct intel_guc_log *log) { struct intel_guc *guc = log_to_guc(log); - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); if (!log->relay.started) return; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c index 1adec6de223c..9df7927304ae 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c @@ -14,7 +14,7 @@ static bool __guc_rc_supported(struct intel_guc *guc) { /* GuC RC is unavailable for pre-Gen12 */ return guc->submission_supported && - GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12; + GRAPHICS_VER(guc_to_i915(guc)) >= 12; } static bool __guc_rc_selected(struct intel_guc *guc) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c index 2dfb07cc4b33..3e681ab6fbf9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c @@ -34,7 +34,7 @@ static bool __detect_slpc_supported(struct intel_guc *guc) { /* GuC SLPC is unavailable for pre-Gen12 */ return guc->submission_supported && - GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12; + GRAPHICS_VER(guc_to_i915(guc)) >= 12; } static bool __guc_slpc_selected(struct intel_guc *guc) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index d37698bd6b91..669f2892bf74 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -4624,12 +4624,12 @@ static bool __guc_submission_supported(struct intel_guc *guc) { /* GuC submission is unavailable for pre-Gen11 */ return intel_guc_is_supported(guc) && - GRAPHICS_VER(guc_to_gt(guc)->i915) >= 11; + GRAPHICS_VER(guc_to_i915(guc)) >= 11; } static bool __guc_submission_selected(struct intel_guc *guc) { - struct drm_i915_private *i915 = guc_to_gt(guc)->i915; + struct drm_i915_private *i915 = guc_to_i915(guc); if (!intel_guc_submission_is_supported(guc)) return false;
Given a reference to "guc", the guc_to_i915() returns the pointer to "i915" private data. Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_gt.h | 5 +++++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 10 +++++----- drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 ++-- 8 files changed, 17 insertions(+), 12 deletions(-)