From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 37FD910E1CB for ; Tue, 25 Oct 2022 12:29:09 +0000 (UTC) Message-ID: Date: Tue, 25 Oct 2022 14:29:07 +0200 Content-Language: en-US To: =?UTF-8?Q?Zbigniew_Kempczy=c5=84ski?= References: <513fe4a81e23cff178117d899cfe5f99d9bb17e1.1666680959.git.karolina.drobnik@intel.com> From: Karolina Drobnik In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t v2 2/3] lib/intel_batchbuffer: Add support for custom engine layouts List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 25.10.2022 11:18, Zbigniew Kempczyński wrote: > On Tue, Oct 25, 2022 at 09:15:00AM +0200, Karolina Drobnik wrote: >> Don't assume fixed engine ids and use context configuration in >> intel_bb to find the appropriate engine when executing the batchbuffer. >> >> Signed-off-by: Karolina Drobnik >> --- >> lib/intel_batchbuffer.c | 49 ++++++++++++++++++++++++++++++++++------- >> 1 file changed, 41 insertions(+), 8 deletions(-) >> >> diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c >> index 0b18f86a..5358b82b 100644 >> --- a/lib/intel_batchbuffer.c >> +++ b/lib/intel_batchbuffer.c >> @@ -1491,6 +1491,29 @@ static bool aux_needs_softpin(int i915) >> return intel_gen(intel_get_drm_devid(i915)) >= 12; >> } >> >> +static bool has_ctx_cfg(struct intel_bb *ibb) >> +{ >> + return ibb->cfg && (ibb->cfg->num_engines > 0); > > Brackets are not necessary. I added them to improve readability. Can remove them, no problem. >> +} >> + >> +static uint32_t find_engine(struct intel_bb *ibb, unsigned int class) >> +{ >> + intel_ctx_cfg_t *cfg; >> + unsigned int i; >> + uint32_t engine_id = -1; >> + >> + cfg = ibb->cfg; >> + for (i = 0; i < cfg->num_engines; i++) { >> + if (cfg->engines[i].engine_class == class) >> + engine_id = i; >> + } >> + >> + /* Make sure we actually found the engine */ >> + igt_assert(engine_id != -1); > > Add some info what's wrong here with igt_assert_f(). Good call, I forgot about that helper. > > With above fixed: > > Reviewed-by: Zbigniew Kempczyński > Thanks, Karolina > -- > Zbigniew >> + >> + return engine_id; >> +} >> + >> /** >> * intel_bb_create: >> * @i915: drm fd >> @@ -2792,34 +2815,44 @@ void intel_bb_flush(struct intel_bb *ibb, uint32_t ring) >> * intel_bb_flush_render: >> * @ibb: batchbuffer >> * >> - * If batch is not empty emit batch buffer end, execute on render ring >> - * and reset the batch. Context used to execute is batch context. >> + * If batch is not empty emit batch buffer end, find the render engine id, >> + * execute on the ring and reset the batch. Context used to execute >> + * is batch context. >> */ >> void intel_bb_flush_render(struct intel_bb *ibb) >> { >> + uint32_t ring; >> + >> if (intel_bb_emit_flush_common(ibb) == 0) >> return; >> >> - intel_bb_exec_with_ring(ibb, I915_EXEC_RENDER); >> + if (has_ctx_cfg(ibb)) >> + ring = find_engine(ibb, I915_ENGINE_CLASS_RENDER); >> + else >> + ring = I915_EXEC_RENDER; >> + >> + intel_bb_exec_with_ring(ibb, ring); >> } >> >> /* >> * intel_bb_flush_blit: >> * @ibb: batchbuffer >> * >> - * If batch is not empty emit batch buffer end, execute on default/blit ring >> - * (depends on gen) and reset the batch. >> + * If batch is not empty emit batch buffer end, find a suitable ring >> + * (depending on gen and context configuration) and reset the batch. >> * Context used to execute is batch context. >> */ >> void intel_bb_flush_blit(struct intel_bb *ibb) >> { >> - uint32_t ring = I915_EXEC_DEFAULT; >> + uint32_t ring; >> >> if (intel_bb_emit_flush_common(ibb) == 0) >> return; >> >> - if (HAS_BLT_RING(ibb->devid)) >> - ring = I915_EXEC_BLT; >> + if (has_ctx_cfg(ibb)) >> + ring = find_engine(ibb, I915_ENGINE_CLASS_COPY); >> + else >> + ring = HAS_BLT_RING(ibb->devid) ? I915_EXEC_BLT : I915_EXEC_DEFAULT; >> >> intel_bb_exec_with_ring(ibb, ring); >> } >> -- >> 2.25.1 >>