drm/i915/guc: Convert capture list to iosys_map

Use iosys_map to write the fields ads.capture_*.

Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220216174147.3073235-14-lucas.demarchi@intel.com

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 c3c31b679e7909212ca06884abad768cb4255006..ec0ccdf98dfabce34a2df2c39323ba6ad9c4d3ae 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
@@ -580,7 +580,7 @@ static void guc_init_golden_context(struct intel_guc *guc)
        GEM_BUG_ON(guc->ads_golden_ctxt_size != total_size);
 }
 
-static void guc_capture_list_init(struct intel_guc *guc, struct __guc_ads_blob *blob)
+static void guc_capture_list_init(struct intel_guc *guc)
 {
        int i, j;
        u32 addr_ggtt, offset;
@@ -592,11 +592,11 @@ static void guc_capture_list_init(struct intel_guc *guc, struct __guc_ads_blob *
 
        for (i = 0; i < GUC_CAPTURE_LIST_INDEX_MAX; i++) {
                for (j = 0; j < GUC_MAX_ENGINE_CLASSES; j++) {
-                       blob->ads.capture_instance[i][j] = addr_ggtt;
-                       blob->ads.capture_class[i][j] = addr_ggtt;
+                       ads_blob_write(guc, ads.capture_instance[i][j], addr_ggtt);
+                       ads_blob_write(guc, ads.capture_class[i][j], addr_ggtt);
                }
 
-               blob->ads.capture_global[i] = addr_ggtt;
+               ads_blob_write(guc, ads.capture_global[i], addr_ggtt);
        }
 }
 
@@ -636,7 +636,7 @@ static void __guc_ads_init(struct intel_guc *guc)
        base = intel_guc_ggtt_offset(guc, guc->ads_vma);
 
        /* Capture list for hang debug */
-       guc_capture_list_init(guc, blob);
+       guc_capture_list_init(guc);
 
        /* ADS */
        blob->ads.scheduler_policies = base + ptr_offset(blob, policies);