| Message ID | 20210907171916.2548047-8-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i915: Introduce Xe_HP compute engines | expand |
On 07/09/2021 18:19, Matt Roper wrote: > We have to specify in the Render Control Unit Mode register > when CCS is enabled. > > Bspec: 46034 > Original-patch-by: Michel Thierry > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com> > Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > .../drm/i915/gt/intel_execlists_submission.c | 26 +++++++++++++++++++ > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 26 +++++++++++++++++++ > drivers/gpu/drm/i915/i915_reg.h | 3 +++ > 3 files changed, 55 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > index 2b36ec7f3a04..046f7da67ba6 100644 > --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > @@ -2874,6 +2874,29 @@ static int execlists_resume(struct intel_engine_cs *engine) > return 0; > } > > +static int gen12_rcs_resume(struct intel_engine_cs *engine) > +{ > + int ret; > + > + ret = execlists_resume(engine); > + if (ret) > + return ret; > + > + /* > + * Multi Context programming. > + * just need to program this register once no matter how many CCS Just > + * engines there are. Since some of the CCS engines might be fused off, > + * we can't do this as part of the init of a specific CCS and we do > + * it during RCS init instead. RCS and all CCS engines are reset I don't really understand the "can't" part - clearly it would be doable if a specific vfunc was assigned to one ccs only, the one which is present of course. Not saying that would be nicer since I think it has it's own downside. Perhaps nicest solution is to add an engine flag saying "enables rcu" and then execlists and guc resume check that and do stuff? No strong opinion yet, just discussing. > + * together, so post-reset re-init is covered as well. > + */ > + if (CCS_MASK(engine->gt)) > + intel_uncore_write(engine->uncore, GEN12_RCU_MODE, > + _MASKED_BIT_ENABLE(GEN12_RCU_MODE_CCS_ENABLE)); > + > + return 0; > +} > + > static void execlists_reset_prepare(struct intel_engine_cs *engine) > { > ENGINE_TRACE(engine, "depth<-%d\n", > @@ -3394,6 +3417,9 @@ static void rcs_submission_override(struct intel_engine_cs *engine) > engine->emit_fini_breadcrumb = gen8_emit_fini_breadcrumb_rcs; > break; > } > + > + if (engine->class == RENDER_CLASS) > + engine->resume = gen12_rcs_resume; > } > > int intel_execlists_submission_setup(struct intel_engine_cs *engine) > 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 2f5bf7aa7e3b..db956255d076 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -2350,6 +2350,29 @@ static bool guc_sched_engine_disabled(struct i915_sched_engine *sched_engine) > return !sched_engine->tasklet.callback; > } > > +static int gen12_rcs_resume(struct intel_engine_cs *engine) > +{ > + int ret; > + > + ret = guc_resume(engine); > + if (ret) > + return ret; > + > + /* > + * Multi Context programming. > + * just need to program this register once no matter how many CCS > + * engines there are. Since some of the CCS engines might be fused off, > + * we can't do this as part of the init of a specific CCS and we do > + * it during RCS init instead. RCS and all CCS engines are reset > + * together, so post-reset re-init is covered as well. > + */ > + if (CCS_MASK(engine->gt)) > + intel_uncore_write(engine->uncore, GEN12_RCU_MODE, > + _MASKED_BIT_ENABLE(GEN12_RCU_MODE_CCS_ENABLE)); Duplicating the write from gen12_rcs_resume looks passable but when with the whole comment then hmm.. How about a helper is added which both would call? Like intel_engine_enable_rcu_mode() or something? Regards, Tvrtko > + > + return 0; > +} > + > static void guc_set_default_submission(struct intel_engine_cs *engine) > { > engine->submit_request = guc_submit_request; > @@ -2464,6 +2487,9 @@ static void rcs_submission_override(struct intel_engine_cs *engine) > engine->emit_fini_breadcrumb = gen8_emit_fini_breadcrumb_rcs; > break; > } > + > + if (engine->class == RENDER_CLASS) > + engine->resume = gen12_rcs_resume; > } > > static inline void guc_default_irqs(struct intel_engine_cs *engine) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 5b68c02c35af..57f9456f8c61 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -498,6 +498,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define ECOBITS_PPGTT_CACHE64B (3 << 8) > #define ECOBITS_PPGTT_CACHE4B (0 << 8) > > +#define GEN12_RCU_MODE _MMIO(0x14800) > +#define GEN12_RCU_MODE_CCS_ENABLE REG_BIT(0) > + > #define GAB_CTL _MMIO(0x24000) > #define GAB_CTL_CONT_AFTER_PAGEFAULT (1 << 8) > >
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c index 2b36ec7f3a04..046f7da67ba6 100644 --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c @@ -2874,6 +2874,29 @@ static int execlists_resume(struct intel_engine_cs *engine) return 0; } +static int gen12_rcs_resume(struct intel_engine_cs *engine) +{ + int ret; + + ret = execlists_resume(engine); + if (ret) + return ret; + + /* + * Multi Context programming. + * just need to program this register once no matter how many CCS + * engines there are. Since some of the CCS engines might be fused off, + * we can't do this as part of the init of a specific CCS and we do + * it during RCS init instead. RCS and all CCS engines are reset + * together, so post-reset re-init is covered as well. + */ + if (CCS_MASK(engine->gt)) + intel_uncore_write(engine->uncore, GEN12_RCU_MODE, + _MASKED_BIT_ENABLE(GEN12_RCU_MODE_CCS_ENABLE)); + + return 0; +} + static void execlists_reset_prepare(struct intel_engine_cs *engine) { ENGINE_TRACE(engine, "depth<-%d\n", @@ -3394,6 +3417,9 @@ static void rcs_submission_override(struct intel_engine_cs *engine) engine->emit_fini_breadcrumb = gen8_emit_fini_breadcrumb_rcs; break; } + + if (engine->class == RENDER_CLASS) + engine->resume = gen12_rcs_resume; } int intel_execlists_submission_setup(struct intel_engine_cs *engine) 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 2f5bf7aa7e3b..db956255d076 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -2350,6 +2350,29 @@ static bool guc_sched_engine_disabled(struct i915_sched_engine *sched_engine) return !sched_engine->tasklet.callback; } +static int gen12_rcs_resume(struct intel_engine_cs *engine) +{ + int ret; + + ret = guc_resume(engine); + if (ret) + return ret; + + /* + * Multi Context programming. + * just need to program this register once no matter how many CCS + * engines there are. Since some of the CCS engines might be fused off, + * we can't do this as part of the init of a specific CCS and we do + * it during RCS init instead. RCS and all CCS engines are reset + * together, so post-reset re-init is covered as well. + */ + if (CCS_MASK(engine->gt)) + intel_uncore_write(engine->uncore, GEN12_RCU_MODE, + _MASKED_BIT_ENABLE(GEN12_RCU_MODE_CCS_ENABLE)); + + return 0; +} + static void guc_set_default_submission(struct intel_engine_cs *engine) { engine->submit_request = guc_submit_request; @@ -2464,6 +2487,9 @@ static void rcs_submission_override(struct intel_engine_cs *engine) engine->emit_fini_breadcrumb = gen8_emit_fini_breadcrumb_rcs; break; } + + if (engine->class == RENDER_CLASS) + engine->resume = gen12_rcs_resume; } static inline void guc_default_irqs(struct intel_engine_cs *engine) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 5b68c02c35af..57f9456f8c61 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -498,6 +498,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) #define ECOBITS_PPGTT_CACHE64B (3 << 8) #define ECOBITS_PPGTT_CACHE4B (0 << 8) +#define GEN12_RCU_MODE _MMIO(0x14800) +#define GEN12_RCU_MODE_CCS_ENABLE REG_BIT(0) + #define GAB_CTL _MMIO(0x24000) #define GAB_CTL_CONT_AFTER_PAGEFAULT (1 << 8)