Hi Andi,
On Thursday, 20 July 2023 23:07:34 CEST Andi Shyti wrote:
Just a trivial refactoring for reducing the number of code duplicate. This will come at handy in the next commits.
Signed-off-by: Andi Shyti andi.shyti@linux.intel.com Cc: stable@vger.kernel.org # v5.8+
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 44 +++++++++++++----------- 1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c index 9d050b9a19194..202d6ff8b5264 100644 --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c @@ -177,23 +177,31 @@ u32 *gen12_emit_aux_table_inv(struct intel_gt *gt, u32 *cs, const i915_reg_t inv return cs; } +static u32 *intel_emit_pipe_control_cs(struct i915_request *rq, u32 bit_group_0,
u32 bit_group_1, u32 offset)+{
- u32 *cs;
- cs = intel_ring_begin(rq, 6);
- if (IS_ERR(cs))
return cs;- cs = gen12_emit_pipe_control(cs, bit_group_0, bit_group_1,
LRC_PPHWSP_SCRATCH_ADDR);- intel_ring_advance(rq, cs);
- return cs;
+}
static int mtl_dummy_pipe_control(struct i915_request *rq) { /* Wa_14016712196 */ if (IS_MTL_GRAPHICS_STEP(rq->engine->i915, M, STEP_A0, STEP_B0) ||
IS_MTL_GRAPHICS_STEP(rq->engine->i915, P, STEP_A0, STEP_B0)) {u32 *cs;/* dummy PIPE_CONTROL + depth flush */
NIT: Maybe you could keep that comment, above intel_emit_pipe_control_cs(...).
Anyway, LGTM.
Reviewed-by: Janusz Krzysztofik janusz.krzysztofik@linux.intel.com
cs = intel_ring_begin(rq, 6);if (IS_ERR(cs))return PTR_ERR(cs);cs = gen12_emit_pipe_control(cs,0,PIPE_CONTROL_DEPTH_CACHE_FLUSH,LRC_PPHWSP_SCRATCH_ADDR);intel_ring_advance(rq, cs);- }
IS_MTL_GRAPHICS_STEP(rq->engine->i915, P, STEP_A0, STEP_B0))intel_emit_pipe_control_cs(rq,0,PIPE_CONTROL_DEPTH_CACHE_FLUSH,LRC_PPHWSP_SCRATCH_ADDR);return 0; } @@ -210,7 +218,6 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode) u32 bit_group_0 = 0; u32 bit_group_1 = 0; int err;
u32 *cs;err = mtl_dummy_pipe_control(rq); if (err) @@ -244,13 +251,8 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode) else if (engine->class == COMPUTE_CLASS) bit_group_1 &= ~PIPE_CONTROL_3D_ENGINE_FLAGS;
cs = intel_ring_begin(rq, 6);if (IS_ERR(cs))return PTR_ERR(cs);cs = gen12_emit_pipe_control(cs, bit_group_0, bit_group_1,LRC_PPHWSP_SCRATCH_ADDR);intel_ring_advance(rq, cs);
intel_emit_pipe_control_cs(rq, bit_group_0, bit_group_1,LRC_PPHWSP_SCRATCH_ADDR);if (mode & EMIT_INVALIDATE) {
--------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach handlowych.
Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.