On Tue, Feb 08, 2022 at 02:45:13AM -0800, Lucas De Marchi wrote:
> Use iosys_map to write the policies update so access to IO and system
> memory is abstracted away.
>
> Cc: Matt Roper <matthew.d.ro...@intel.com>
> Cc: Thomas Hellström <thomas.hellst...@linux.intel.com>
> Cc: Daniel Vetter <dan...@ffwll.ch>
> Cc: John Harrison <john.c.harri...@intel.com>
> Cc: Matthew Brost <matthew.br...@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>
Reviewed-by: Matt Atwood <matthew.s.atw...@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 41 ++++++++++++----------
> 1 file changed, 23 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> index b5b3a39f0c28..6a34ab38b45f 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> @@ -130,33 +130,37 @@ static u32 guc_ads_blob_size(struct intel_guc *guc)
> guc_ads_private_data_size(guc);
> }
>
> -static void guc_policies_init(struct intel_guc *guc, struct guc_policies
> *policies)
> +static void guc_policies_init(struct intel_guc *guc)
> {
> struct intel_gt *gt = guc_to_gt(guc);
> struct drm_i915_private *i915 = gt->i915;
> + u32 global_flags = 0;
>
> - policies->dpc_promote_time = GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US;
> - policies->max_num_work_items = GLOBAL_POLICY_MAX_NUM_WI;
> + ads_blob_write(guc, policies.dpc_promote_time,
> + GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US);
> + ads_blob_write(guc, policies.max_num_work_items,
> + GLOBAL_POLICY_MAX_NUM_WI);
>
> - policies->global_flags = 0;
> if (i915->params.reset < 2)
> - policies->global_flags |= GLOBAL_POLICY_DISABLE_ENGINE_RESET;
> + global_flags |= GLOBAL_POLICY_DISABLE_ENGINE_RESET;
>
> - policies->is_valid = 1;
> + ads_blob_write(guc, policies.global_flags, global_flags);
> + ads_blob_write(guc, policies.is_valid, 1);
> }
>
> void intel_guc_ads_print_policy_info(struct intel_guc *guc,
> struct drm_printer *dp)
> {
> - struct __guc_ads_blob *blob = guc->ads_blob;
> -
> - if (unlikely(!blob))
> + if (unlikely(iosys_map_is_null(&guc->ads_map)))
> return;
>
> drm_printf(dp, "Global scheduling policies:\n");
> - drm_printf(dp, " DPC promote time = %u\n",
> blob->policies.dpc_promote_time);
> - drm_printf(dp, " Max num work items = %u\n",
> blob->policies.max_num_work_items);
> - drm_printf(dp, " Flags = %u\n",
> blob->policies.global_flags);
> + drm_printf(dp, " DPC promote time = %u\n",
> + ads_blob_read(guc, policies.dpc_promote_time));
> + drm_printf(dp, " Max num work items = %u\n",
> + ads_blob_read(guc, policies.max_num_work_items));
> + drm_printf(dp, " Flags = %u\n",
> + ads_blob_read(guc, policies.global_flags));
> }
>
> static int guc_action_policies_update(struct intel_guc *guc, u32
> policy_offset)
> @@ -171,23 +175,24 @@ static int guc_action_policies_update(struct intel_guc
> *guc, u32 policy_offset)
>
> int intel_guc_global_policies_update(struct intel_guc *guc)
> {
> - struct __guc_ads_blob *blob = guc->ads_blob;
> struct intel_gt *gt = guc_to_gt(guc);
> + u32 scheduler_policies;
> intel_wakeref_t wakeref;
> int ret;
>
> - if (!blob)
> + if (iosys_map_is_null(&guc->ads_map))
> return -EOPNOTSUPP;
>
> - GEM_BUG_ON(!blob->ads.scheduler_policies);
> + scheduler_policies = ads_blob_read(guc, ads.scheduler_policies);
> + GEM_BUG_ON(!scheduler_policies);
>
> - guc_policies_init(guc, &blob->policies);
> + guc_policies_init(guc);
>
> if (!intel_guc_is_ready(guc))
> return 0;
>
> with_intel_runtime_pm(>->i915->runtime_pm, wakeref)
> - ret = guc_action_policies_update(guc,
> blob->ads.scheduler_policies);
> + ret = guc_action_policies_update(guc, scheduler_policies);
>
> return ret;
> }
> @@ -554,7 +559,7 @@ static void __guc_ads_init(struct intel_guc *guc)
> u32 base;
>
> /* GuC scheduling policies */
> - guc_policies_init(guc, &blob->policies);
> + guc_policies_init(guc);
>
> /* System info */
> fill_engine_enable_masks(gt, &blob->system_info);
> --
> 2.35.1
>
