[Intel-gfx] [PATCH 4/4] drm/i915: Move MOCS setup to intel_mocs.c

[Chris Wilson]

Quoting Lucas De Marchi (2019-07-26 01:12:08)
> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> 
> Hide the details of MOCS setup from i915_gem by moving both current calls
> into one in intel_mocs_init.
> 
> Cc: Stuart Summers <stuart.summers at intel.com>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> Reviewed-by: Stuart Summers <stuart.summers at intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20190713010940.17711-21-lucas.demarchi@intel.com
> ---
>  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 9399c0ec08f1..d437d35f3347 100644
> --- a/drivers/gpu/drm/i915/gt/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
> @@ -411,14 +411,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;
> @@ -587,7 +586,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;
> @@ -665,3 +664,11 @@ int intel_rcs_context_init_mocs(struct i915_request *rq)
>  
>         return 0;
>  }
> +
> +void intel_mocs_init(struct intel_gt *gt)

* quietly mutters intel_gt_init_mocs() (to be called from
intel_gt_init() [or better name], formerly known as i915_gem_init_hw).
-Chris