From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 06/19] drm/i915/guc: Convert golden context init to dma_buf_map Date: Wed, 26 Jan 2022 12:36:49 -0800 [thread overview] Message-ID: <20220126203702.1784589-7-lucas.demarchi@intel.com> (raw) In-Reply-To: <20220126203702.1784589-1-lucas.demarchi@intel.com> Now the map is saved during creation, so use it to initialize the golden context, reading from shmem and writing to either system or IO memory. 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> --- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 25 +++++++++++----------- 1 file changed, 13 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 01d2c1ead680..bcf52ac4fe35 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c @@ -473,18 +473,17 @@ static struct intel_engine_cs *find_engine_state(struct intel_gt *gt, u8 engine_ static void guc_init_golden_context(struct intel_guc *guc) { - struct __guc_ads_blob *blob = guc->ads_blob; struct intel_engine_cs *engine; struct intel_gt *gt = guc_to_gt(guc); + struct dma_buf_map golden_context_map; u32 addr_ggtt, offset; u32 total_size = 0, alloc_size, real_size; u8 engine_class, guc_class; - u8 *ptr; if (!intel_uc_uses_guc_submission(>->uc)) return; - GEM_BUG_ON(!blob); + GEM_BUG_ON(dma_buf_map_is_null(&guc->ads_map)); /* * Go back and fill in the golden context data now that it is @@ -492,15 +491,15 @@ static void guc_init_golden_context(struct intel_guc *guc) */ offset = guc_ads_golden_ctxt_offset(guc); addr_ggtt = intel_guc_ggtt_offset(guc, guc->ads_vma) + offset; - ptr = ((u8 *)blob) + offset; + + golden_context_map = DMA_BUF_MAP_INIT_OFFSET(&guc->ads_map, offset); for (engine_class = 0; engine_class <= MAX_ENGINE_CLASS; ++engine_class) { if (engine_class == OTHER_CLASS) continue; guc_class = engine_class_to_guc_class(engine_class); - - if (!blob->system_info.engine_enabled_masks[guc_class]) + if (!ads_blob_read(guc, system_info.engine_enabled_masks[guc_class])) continue; real_size = intel_engine_context_size(gt, engine_class); @@ -511,18 +510,20 @@ static void guc_init_golden_context(struct intel_guc *guc) if (!engine) { drm_err(>->i915->drm, "No engine state recorded for class %d!\n", engine_class); - blob->ads.eng_state_size[guc_class] = 0; - blob->ads.golden_context_lrca[guc_class] = 0; + ads_blob_write(guc, ads.eng_state_size[guc_class], 0); + ads_blob_write(guc, ads.golden_context_lrca[guc_class], 0); continue; } - GEM_BUG_ON(blob->ads.eng_state_size[guc_class] != + GEM_BUG_ON(ads_blob_read(guc, ads.eng_state_size[guc_class]) != real_size - LRC_SKIP_SIZE); - GEM_BUG_ON(blob->ads.golden_context_lrca[guc_class] != addr_ggtt); + GEM_BUG_ON(ads_blob_read(guc, ads.golden_context_lrca[guc_class]) != addr_ggtt); + addr_ggtt += alloc_size; - shmem_read(engine->default_state, 0, ptr, real_size); - ptr += alloc_size; + shmem_read_to_dma_buf_map(engine->default_state, 0, + &golden_context_map, real_size); + dma_buf_map_incr(&golden_context_map, alloc_size); } GEM_BUG_ON(guc->ads_golden_ctxt_size != total_size); -- 2.35.0
WARNING: multiple messages have this Message-ID (diff)
From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Matthew Brost" <matthew.brost@intel.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org, "Daniele Ceraolo Spurio" <daniele.ceraolospurio@intel.com>, "John Harrison" <John.C.Harrison@Intel.com> Subject: [PATCH 06/19] drm/i915/guc: Convert golden context init to dma_buf_map Date: Wed, 26 Jan 2022 12:36:49 -0800 [thread overview] Message-ID: <20220126203702.1784589-7-lucas.demarchi@intel.com> (raw) In-Reply-To: <20220126203702.1784589-1-lucas.demarchi@intel.com> Now the map is saved during creation, so use it to initialize the golden context, reading from shmem and writing to either system or IO memory. 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> --- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 25 +++++++++++----------- 1 file changed, 13 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 01d2c1ead680..bcf52ac4fe35 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c @@ -473,18 +473,17 @@ static struct intel_engine_cs *find_engine_state(struct intel_gt *gt, u8 engine_ static void guc_init_golden_context(struct intel_guc *guc) { - struct __guc_ads_blob *blob = guc->ads_blob; struct intel_engine_cs *engine; struct intel_gt *gt = guc_to_gt(guc); + struct dma_buf_map golden_context_map; u32 addr_ggtt, offset; u32 total_size = 0, alloc_size, real_size; u8 engine_class, guc_class; - u8 *ptr; if (!intel_uc_uses_guc_submission(>->uc)) return; - GEM_BUG_ON(!blob); + GEM_BUG_ON(dma_buf_map_is_null(&guc->ads_map)); /* * Go back and fill in the golden context data now that it is @@ -492,15 +491,15 @@ static void guc_init_golden_context(struct intel_guc *guc) */ offset = guc_ads_golden_ctxt_offset(guc); addr_ggtt = intel_guc_ggtt_offset(guc, guc->ads_vma) + offset; - ptr = ((u8 *)blob) + offset; + + golden_context_map = DMA_BUF_MAP_INIT_OFFSET(&guc->ads_map, offset); for (engine_class = 0; engine_class <= MAX_ENGINE_CLASS; ++engine_class) { if (engine_class == OTHER_CLASS) continue; guc_class = engine_class_to_guc_class(engine_class); - - if (!blob->system_info.engine_enabled_masks[guc_class]) + if (!ads_blob_read(guc, system_info.engine_enabled_masks[guc_class])) continue; real_size = intel_engine_context_size(gt, engine_class); @@ -511,18 +510,20 @@ static void guc_init_golden_context(struct intel_guc *guc) if (!engine) { drm_err(>->i915->drm, "No engine state recorded for class %d!\n", engine_class); - blob->ads.eng_state_size[guc_class] = 0; - blob->ads.golden_context_lrca[guc_class] = 0; + ads_blob_write(guc, ads.eng_state_size[guc_class], 0); + ads_blob_write(guc, ads.golden_context_lrca[guc_class], 0); continue; } - GEM_BUG_ON(blob->ads.eng_state_size[guc_class] != + GEM_BUG_ON(ads_blob_read(guc, ads.eng_state_size[guc_class]) != real_size - LRC_SKIP_SIZE); - GEM_BUG_ON(blob->ads.golden_context_lrca[guc_class] != addr_ggtt); + GEM_BUG_ON(ads_blob_read(guc, ads.golden_context_lrca[guc_class]) != addr_ggtt); + addr_ggtt += alloc_size; - shmem_read(engine->default_state, 0, ptr, real_size); - ptr += alloc_size; + shmem_read_to_dma_buf_map(engine->default_state, 0, + &golden_context_map, real_size); + dma_buf_map_incr(&golden_context_map, alloc_size); } GEM_BUG_ON(guc->ads_golden_ctxt_size != total_size); -- 2.35.0
next prev parent reply other threads:[~2022-01-26 20:36 UTC|newest] Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-26 20:36 [PATCH 00/19] drm/i915/guc: Refactor ADS access to use dma_buf_map Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi 2022-01-26 20:36 ` [PATCH 01/19] dma-buf-map: Add read/write helpers Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi 2022-01-27 7:24 ` Christian König 2022-01-27 7:24 ` [Intel-gfx] " Christian König 2022-01-27 7:24 ` Christian König 2022-01-27 7:36 ` Matthew Brost 2022-01-27 7:36 ` [Intel-gfx] " Matthew Brost 2022-01-27 7:36 ` Matthew Brost 2022-01-27 7:59 ` Christian König 2022-01-27 7:59 ` [Intel-gfx] " Christian König 2022-01-27 7:59 ` Christian König 2022-01-27 9:02 ` [Intel-gfx] " Daniel Vetter 2022-01-27 9:02 ` Daniel Vetter 2022-01-27 14:26 ` Thomas Zimmermann 2022-01-27 14:26 ` [Intel-gfx] " Thomas Zimmermann 2022-01-27 14:26 ` Thomas Zimmermann 2022-01-27 16:34 ` Lucas De Marchi 2022-01-27 16:34 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 16:34 ` Lucas De Marchi 2022-01-28 8:32 ` Thomas Zimmermann 2022-01-28 8:32 ` [Intel-gfx] " Thomas Zimmermann 2022-01-28 8:32 ` Thomas Zimmermann 2022-01-26 20:36 ` [PATCH 02/19] dma-buf-map: Add helper to initialize second map Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 7:27 ` Christian König 2022-01-27 7:27 ` [Intel-gfx] " Christian König 2022-01-27 7:27 ` Christian König 2022-01-27 7:57 ` Lucas De Marchi 2022-01-27 7:57 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 7:57 ` Lucas De Marchi 2022-01-27 8:02 ` Christian König 2022-01-27 8:02 ` [Intel-gfx] " Christian König 2022-01-27 8:02 ` Christian König 2022-01-27 8:18 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 8:55 ` Christian König 2022-01-27 9:12 ` Lucas De Marchi 2022-01-27 9:12 ` Lucas De Marchi 2022-01-27 9:21 ` Christian König 2022-01-27 9:21 ` Christian König 2022-01-27 8:57 ` Daniel Vetter 2022-01-27 8:57 ` [Intel-gfx] " Daniel Vetter 2022-01-27 8:57 ` Daniel Vetter 2022-01-27 9:33 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 10:00 ` Daniel Vetter 2022-01-27 10:00 ` Daniel Vetter 2022-01-27 10:21 ` Christian König 2022-01-27 11:16 ` Daniel Vetter 2022-01-27 11:16 ` Daniel Vetter 2022-01-27 11:44 ` [Linaro-mm-sig] " Christian König 2022-01-27 11:44 ` [Intel-gfx] [Linaro-mm-sig] " Christian König 2022-01-27 11:56 ` [Linaro-mm-sig] Re: [Intel-gfx] " Daniel Vetter 2022-01-27 11:56 ` Daniel Vetter 2022-01-27 11:56 ` [Intel-gfx] [Linaro-mm-sig] " Daniel Vetter 2022-01-27 16:13 ` [Linaro-mm-sig] Re: [Intel-gfx] " Lucas De Marchi 2022-01-27 16:13 ` [Intel-gfx] [Linaro-mm-sig] " Lucas De Marchi 2022-01-27 16:13 ` [Linaro-mm-sig] Re: [Intel-gfx] " Lucas De Marchi 2022-01-27 14:52 ` Thomas Zimmermann 2022-01-27 16:12 ` Lucas De Marchi 2022-01-27 14:33 ` Thomas Zimmermann 2022-01-27 14:33 ` [Intel-gfx] " Thomas Zimmermann 2022-01-27 14:33 ` Thomas Zimmermann 2022-01-27 15:59 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 15:59 ` Lucas De Marchi 2022-01-28 8:15 ` Thomas Zimmermann 2022-01-28 8:34 ` Thomas Zimmermann 2022-01-26 20:36 ` [PATCH 03/19] drm/i915/gt: Add helper for shmem copy to dma_buf_map Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] [PATCH 04/19] drm/i915/guc: Keep dma_buf_map of ads_blob around Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi 2022-01-26 20:36 ` [PATCH 05/19] drm/i915/guc: Add read/write helpers for ADS blob Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi [this message] 2022-01-26 20:36 ` [PATCH 06/19] drm/i915/guc: Convert golden context init to dma_buf_map Lucas De Marchi 2022-01-26 20:36 ` [PATCH 07/19] drm/i915/guc: Convert policies update " Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [PATCH 08/19] drm/i915/guc: Convert engine record " Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [PATCH 09/19] dma-buf-map: Add wrapper over memset Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 7:28 ` Christian König 2022-01-27 7:28 ` [Intel-gfx] " Christian König 2022-01-27 7:28 ` Christian König 2022-01-27 14:54 ` Thomas Zimmermann 2022-01-27 14:54 ` [Intel-gfx] " Thomas Zimmermann 2022-01-27 14:54 ` Thomas Zimmermann 2022-01-27 15:38 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 15:38 ` Lucas De Marchi 2022-01-27 15:47 ` Thomas Zimmermann 2022-01-26 20:36 ` [PATCH 10/19] drm/i915/guc: Convert guc_ads_private_data_reset to dma_buf_map Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [PATCH 11/19] drm/i915/guc: Convert golden context prep " Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [PATCH 12/19] drm/i915/guc: Replace check for golden context size Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] [PATCH 13/19] drm/i915/guc: Convert mapping table to dma_buf_map Lucas De Marchi 2022-01-26 20:36 ` Lucas De Marchi 2022-01-26 20:36 ` [PATCH 14/19] drm/i915/guc: Convert capture list " Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [PATCH 15/19] drm/i915/guc: Prepare for error propagation Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:36 ` [PATCH 16/19] drm/i915/guc: Use a single pass to calculate regset Lucas De Marchi 2022-01-26 20:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-27 0:29 ` kernel test robot 2022-01-27 0:29 ` kernel test robot 2022-01-27 0:29 ` [Intel-gfx] " kernel test robot 2022-01-27 2:02 ` kernel test robot 2022-01-27 2:02 ` kernel test robot 2022-01-27 2:02 ` [Intel-gfx] " kernel test robot 2022-01-27 2:02 ` kernel test robot 2022-01-27 4:37 ` kernel test robot 2022-01-27 4:37 ` kernel test robot 2022-01-27 4:37 ` [Intel-gfx] " kernel test robot 2022-02-01 22:42 ` Daniele Ceraolo Spurio 2022-02-01 22:42 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-02-03 23:44 ` Lucas De Marchi 2022-02-03 23:44 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:37 ` [PATCH 17/19] drm/i915/guc: Convert guc_mmio_reg_state_init to dma_buf_map Lucas De Marchi 2022-01-26 20:37 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:37 ` [PATCH 18/19] drm/i915/guc: Convert __guc_ads_init " Lucas De Marchi 2022-01-26 20:37 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 20:37 ` [PATCH 19/19] drm/i915/guc: Remove plain ads_blob pointer Lucas De Marchi 2022-01-26 20:37 ` [Intel-gfx] " Lucas De Marchi 2022-01-26 23:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/guc: Refactor ADS access to use dma_buf_map Patchwork 2022-01-26 23:19 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-01-26 23:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-01-26 23:42 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork 2022-01-27 5:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220126203702.1784589-7-lucas.demarchi@intel.com \ --to=lucas.demarchi@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=thomas.hellstrom@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.