From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BCB46C4332F for ; Tue, 13 Dec 2022 13:21:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6968E10E316; Tue, 13 Dec 2022 13:21:13 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7A1310E30C for ; Tue, 13 Dec 2022 13:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670937670; x=1702473670; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=5OkBCVI8MgrkL2w9b6kfFSdPPNAogc8NZ1kS/6K2abs=; b=BzAomRYUYGHajFnsdxArmMEnz3jqebuyqcQMe8J5+w5+r/v6O3nnDcle Euu801SG5N9sJzCPgGxP4hsiPhPCaFsqQaE5XCU6dMC73Z+qNRmK7CjdY MuOeowSrohPicxuLdOisOHyY38uJKwKrp/rHCk/ZzE5dsJeZhlJVxz2h4 z95rvbiBFvG062EAQzARJfBQ2rDlbW36GzfSW7vdPbLo4klXWjBiksQZ+ //qv+sVp7Cgj4vUf/F5R2b5RiYMq0GJqc72PL2xE3pQ6kYv9AfLMJX82W 0s2jmt9AyyS58coRlZ1FlKqEj/yGvyq8QF+xcJmnL+Crdfg3IKFidygAx Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="382430146" X-IronPort-AV: E=Sophos;i="5.96,241,1665471600"; d="scan'208";a="382430146" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2022 05:21:09 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="650714395" X-IronPort-AV: E=Sophos;i="5.96,241,1665471600"; d="scan'208";a="650714395" Received: from lherman-mobl.ger.corp.intel.com (HELO [10.213.234.101]) ([10.213.234.101]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2022 05:21:07 -0800 Message-ID: <6d9cdcfa-01d2-d1b0-e754-3d73a488c789@linux.intel.com> Date: Tue, 13 Dec 2022 13:21:05 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US To: Andrzej Hajda , intel-gfx@lists.freedesktop.org References: <20221213121951.1515023-1-andrzej.hajda@intel.com> <20221213121951.1515023-2-andrzej.hajda@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: <20221213121951.1515023-2-andrzej.hajda@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/selftest: use igt_vma_move_to_active_unlocked if possible X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 13/12/2022 12:19, Andrzej Hajda wrote: > Helper replaces common sequence of calls. > > Signed-off-by: Andrzej Hajda > --- > .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 8 ++------ > drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 8 ++------ > drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 +++--------- > drivers/gpu/drm/i915/gt/selftest_lrc.c | 4 +--- > drivers/gpu/drm/i915/gt/selftest_mocs.c | 4 +--- > drivers/gpu/drm/i915/gt/selftest_workarounds.c | 12 +++--------- > 6 files changed, 12 insertions(+), 36 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > index ac02fb03659208..9c6a64a0de5c0b 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > @@ -1549,9 +1549,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, > goto err_unpin; > } > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, 0); > - i915_vma_unlock(vma); > + err = igt_vma_move_to_active_unlocked(vma, rq, 0); > if (err) > goto skip_request; > > @@ -1684,9 +1682,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, > goto err_unpin; > } > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE); > - i915_vma_unlock(vma); > + err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE); > if (err) > goto skip_request; > > diff --git a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c > index c147038230c462..20a232a140b0f2 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c > +++ b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c > @@ -130,15 +130,11 @@ int igt_gpu_fill_dw(struct intel_context *ce, > goto err_batch; > } > > - i915_vma_lock(batch); > - err = i915_vma_move_to_active(batch, rq, 0); > - i915_vma_unlock(batch); > + err = igt_vma_move_to_active_unlocked(batch, rq, 0); > if (err) > goto skip_request; > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE); > - i915_vma_unlock(vma); > + err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE); > if (err) > goto skip_request; > > diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c > index a619057543fd94..736b89a8ecf54f 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c > +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c > @@ -2763,13 +2763,11 @@ static int create_gang(struct intel_engine_cs *engine, > rq->batch = i915_vma_get(vma); > i915_request_get(rq); > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, 0); > + err = igt_vma_move_to_active_unlocked(vma, rq, 0); > if (!err) > err = rq->engine->emit_bb_start(rq, > i915_vma_offset(vma), > PAGE_SIZE, 0); > - i915_vma_unlock(vma); > i915_request_add(rq); > if (err) > goto err_rq; > @@ -3177,9 +3175,7 @@ create_gpr_client(struct intel_engine_cs *engine, > goto out_batch; > } > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, 0); > - i915_vma_unlock(vma); > + err = igt_vma_move_to_active_unlocked(vma, rq, 0); > > i915_vma_lock(batch); > if (!err) > @@ -3514,13 +3510,11 @@ static int smoke_submit(struct preempt_smoke *smoke, > } > > if (vma) { > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, 0); > + err = igt_vma_move_to_active_unlocked(vma, rq, 0); > if (!err) > err = rq->engine->emit_bb_start(rq, > i915_vma_offset(vma), > PAGE_SIZE, 0); > - i915_vma_unlock(vma); > } > > i915_request_add(rq); > diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c > index a61ae9d7e0a220..a78a3d2c2e16e8 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c > +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c > @@ -599,9 +599,7 @@ __gpr_read(struct intel_context *ce, struct i915_vma *scratch, u32 *slot) > *cs++ = 0; > } > > - i915_vma_lock(scratch); > - err = i915_vma_move_to_active(scratch, rq, EXEC_OBJECT_WRITE); > - i915_vma_unlock(scratch); > + err = igt_vma_move_to_active_unlocked(scratch, rq, EXEC_OBJECT_WRITE); > > i915_request_get(rq); > i915_request_add(rq); > diff --git a/drivers/gpu/drm/i915/gt/selftest_mocs.c b/drivers/gpu/drm/i915/gt/selftest_mocs.c > index f27cc28608d4ff..ca009a6a13bdbb 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_mocs.c > +++ b/drivers/gpu/drm/i915/gt/selftest_mocs.c > @@ -228,9 +228,7 @@ static int check_mocs_engine(struct live_mocs *arg, > if (IS_ERR(rq)) > return PTR_ERR(rq); > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE); > - i915_vma_unlock(vma); > + err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE); > > /* Read the mocs tables back using SRM */ > offset = i915_ggtt_offset(vma); > diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c > index 9c5449709161c0..14a8b25b6204a7 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c > @@ -138,9 +138,7 @@ read_nonprivs(struct intel_context *ce) > goto err_pin; > } > > - i915_vma_lock(vma); > - err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE); > - i915_vma_unlock(vma); > + err = igt_vma_move_to_active_unlocked(vma, rq, EXEC_OBJECT_WRITE); > if (err) > goto err_req; > > @@ -853,9 +851,7 @@ static int read_whitelisted_registers(struct intel_context *ce, > if (IS_ERR(rq)) > return PTR_ERR(rq); > > - i915_vma_lock(results); > - err = i915_vma_move_to_active(results, rq, EXEC_OBJECT_WRITE); > - i915_vma_unlock(results); > + err = igt_vma_move_to_active_unlocked(results, rq, EXEC_OBJECT_WRITE); > if (err) > goto err_req; > > @@ -935,9 +931,7 @@ static int scrub_whitelisted_registers(struct intel_context *ce) > goto err_request; > } > > - i915_vma_lock(batch); > - err = i915_vma_move_to_active(batch, rq, 0); > - i915_vma_unlock(batch); > + err = igt_vma_move_to_active_unlocked(batch, rq, 0); > if (err) > goto err_request; > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko