On Fri, 2019-07-12 at 18:09 -0700, Lucas De Marchi wrote: > From: Tvrtko Ursulin <[email protected]> > > Hide the details of MOCS setup from i915_gem by moving both current > calls > into one in intel_mocs_init. > > Cc: Stuart Summers <[email protected]> > Signed-off-by: Tvrtko Ursulin <[email protected]> > Signed-off-by: Lucas De Marchi <[email protected]>
Reviewed-by: Stuart Summers <[email protected]> > --- > drivers/gpu/drm/i915/gt/intel_mocs.c | 15 +++++++++++---- > drivers/gpu/drm/i915/gt/intel_mocs.h | 3 +-- > drivers/gpu/drm/i915/i915_gem.c | 3 +-- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c > b/drivers/gpu/drm/i915/gt/intel_mocs.c > index 365d8ff11f23..5cd18768b5df 100644 > --- a/drivers/gpu/drm/i915/gt/intel_mocs.c > +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c > @@ -399,14 +399,13 @@ void intel_mocs_init_engine(struct > intel_engine_cs *engine) > * > * This function initializes the MOCS global registers. > */ > -void intel_mocs_init_global(struct intel_gt *gt) > +static void intel_mocs_init_global(struct intel_gt *gt) > { > struct intel_uncore *uncore = gt->uncore; > struct drm_i915_mocs_table table; > unsigned int index; > > - if (!HAS_GLOBAL_MOCS_REGISTERS(gt->i915)) > - return; > + GEM_BUG_ON(!HAS_GLOBAL_MOCS_REGISTERS(gt->i915)); > > if (!get_mocs_settings(gt, &table)) > return; > @@ -575,7 +574,7 @@ static int emit_mocs_l3cc_table(struct > i915_request *rq, > * > * Return: Nothing. > */ > -void intel_mocs_init_l3cc_table(struct intel_gt *gt) > +static void intel_mocs_init_l3cc_table(struct intel_gt *gt) > { > struct intel_uncore *uncore = gt->uncore; > struct drm_i915_mocs_table table; > @@ -653,3 +652,11 @@ int intel_rcs_context_init_mocs(struct > i915_request *rq) > > return 0; > } > + > +void intel_mocs_init(struct intel_gt *gt) > +{ > + intel_mocs_init_l3cc_table(gt); > + > + if (HAS_GLOBAL_MOCS_REGISTERS(gt->i915)) > + intel_mocs_init_global(gt); > +} > diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.h > b/drivers/gpu/drm/i915/gt/intel_mocs.h > index aa3a2df07c82..2c5cbf213819 100644 > --- a/drivers/gpu/drm/i915/gt/intel_mocs.h > +++ b/drivers/gpu/drm/i915/gt/intel_mocs.h > @@ -55,8 +55,7 @@ struct intel_engine_cs; > struct intel_gt; > > int intel_rcs_context_init_mocs(struct i915_request *rq); > -void intel_mocs_init_l3cc_table(struct intel_gt *gt); > -void intel_mocs_init_global(struct intel_gt *gt); > +void intel_mocs_init(struct intel_gt *gt); > void intel_mocs_init_engine(struct intel_engine_cs *engine); > > #endif > diff --git a/drivers/gpu/drm/i915/i915_gem.c > b/drivers/gpu/drm/i915/i915_gem.c > index d23e156f6659..7980ee9bf8a8 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1254,8 +1254,7 @@ int i915_gem_init_hw(struct drm_i915_private > *i915) > goto out; > } > > - intel_mocs_init_global(gt); > - intel_mocs_init_l3cc_table(gt); > + intel_mocs_init(gt); > > intel_engines_set_scheduler_caps(i915); >
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
