[Intel-gfx] [PATCH 17/19] drm/i915/guc: Convert guc_mmio_reg_state_init to dma_buf_map

[Lucas De Marchi]

Now that the regset list is prepared, convert guc_mmio_reg_state_init()
to use dma_buf_map to copy the array to the final location and
initialize additional fields in ads.reg_state_list.

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>
Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 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 390101ee3661..cb0f543b0e86 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
@@ -372,40 +372,46 @@ static long guc_mmio_reg_state_create(struct intel_guc 
*guc)
        return total * sizeof(struct guc_mmio_reg);
 }
 
-static void guc_mmio_reg_state_init(struct intel_guc *guc,
-                                   struct __guc_ads_blob *blob)
+static void guc_mmio_reg_state_init(struct intel_guc *guc)
 {
+       struct dma_buf_map ads_regset_map;
        struct intel_gt *gt = guc_to_gt(guc);
        struct intel_engine_cs *engine;
-       struct guc_mmio_reg *ads_registers;
        enum intel_engine_id id;
        u32 addr_ggtt, offset;
 
        offset = guc_ads_regset_offset(guc);
        addr_ggtt = intel_guc_ggtt_offset(guc, guc->ads_vma) + offset;
-       ads_registers = (struct guc_mmio_reg *)(((u8 *)blob) + offset);
+       ads_regset_map = DMA_BUF_MAP_INIT_OFFSET(&guc->ads_map, offset);
 
-       memcpy(ads_registers, guc->ads_regset, guc->ads_regset_size);
+       dma_buf_map_memcpy_to(&ads_regset_map, guc->ads_regset,
+                             guc->ads_regset_size);
 
        for_each_engine(engine, gt, id) {
                u32 count = guc->ads_regset_count[id];
-               struct guc_mmio_reg_set *ads_reg_set;
                u8 guc_class;
 
                /* Class index is checked in class converter */
                GEM_BUG_ON(engine->instance >= GUC_MAX_INSTANCES_PER_CLASS);
 
                guc_class = engine_class_to_guc_class(engine->class);
-               ads_reg_set = 
&blob->ads.reg_state_list[guc_class][engine->instance];
 
                if (!count) {
-                       ads_reg_set->address = 0;
-                       ads_reg_set->count = 0;
+                       ads_blob_write(guc,
+                                      
ads.reg_state_list[guc_class][engine->instance].address,
+                                      0);
+                       ads_blob_write(guc,
+                                      
ads.reg_state_list[guc_class][engine->instance].count,
+                                      0);
                        continue;
                }
 
-               ads_reg_set->address = addr_ggtt;
-               ads_reg_set->count = count;
+               ads_blob_write(guc,
+                              
ads.reg_state_list[guc_class][engine->instance].address,
+                              addr_ggtt);
+               ads_blob_write(guc,
+                              
ads.reg_state_list[guc_class][engine->instance].count,
+                              count);
 
                addr_ggtt += count * sizeof(struct guc_mmio_reg);
        }
@@ -635,7 +641,7 @@ static void __guc_ads_init(struct intel_guc *guc)
        blob->ads.gt_system_info = base + ptr_offset(blob, system_info);
 
        /* MMIO save/restore list */
-       guc_mmio_reg_state_init(guc, blob);
+       guc_mmio_reg_state_init(guc);
 
        /* Private Data */
        blob->ads.private_data = base + guc_ads_private_data_offset(guc);
-- 
2.35.0