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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F41CC433DB for ; Tue, 2 Feb 2021 13:26:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 61D5D64EC5 for ; Tue, 2 Feb 2021 13:26:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61D5D64EC5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D81326E1B3; Tue, 2 Feb 2021 13:26:32 +0000 (UTC) Received: from fireflyinternet.com (unknown [77.68.26.236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7C3CD6E1B3 for ; Tue, 2 Feb 2021 13:26:31 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from localhost (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP (TLS) id 23772238-1500050 for multiple; Tue, 02 Feb 2021 13:26:27 +0000 MIME-Version: 1.0 In-Reply-To: <77b97a4c-5bcb-5025-cf4a-f2f4b75a0f47@linux.intel.com> References: <20210201085715.27435-1-chris@chris-wilson.co.uk> <20210201085715.27435-17-chris@chris-wilson.co.uk> <77b97a4c-5bcb-5025-cf4a-f2f4b75a0f47@linux.intel.com> From: Chris Wilson To: Tvrtko Ursulin , intel-gfx@lists.freedesktop.org Date: Tue, 02 Feb 2021 13:26:27 +0000 Message-ID: <161227238747.1150.1387305898508836921@build.alporthouse.com> User-Agent: alot/0.9 Subject: Re: [Intel-gfx] [PATCH 17/57] drm/i915: Extract request suspension from the execlists 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Quoting Tvrtko Ursulin (2021-02-02 13:15:52) > > On 01/02/2021 08:56, Chris Wilson wrote: > > +void __i915_sched_resume_request(struct intel_engine_cs *engine, > > + struct i915_request *rq) > > +{ > > + LIST_HEAD(list); > > + > > + lockdep_assert_held(&engine->active.lock); > > + > > + if (rq_prio(rq) > engine->execlists.queue_priority_hint) { > > + engine->execlists.queue_priority_hint = rq_prio(rq); > > + tasklet_hi_schedule(&engine->execlists.tasklet); > > + } > > + > > + if (!i915_request_on_hold(rq)) > > + return; > > + > > + ENGINE_TRACE(engine, "resuming request %llx:%lld\n", > > + rq->fence.context, rq->fence.seqno); > > + > > + /* > > + * Move this request back to the priority queue, and all of its > > + * children and grandchildren that were suspended along with it. > > + */ > > + do { > > + struct i915_dependency *p; > > + > > + RQ_TRACE(rq, "hold release\n"); > > + > > + GEM_BUG_ON(!i915_request_on_hold(rq)); > > + GEM_BUG_ON(!i915_sw_fence_signaled(&rq->submit)); > > + > > + i915_request_clear_hold(rq); > > + list_del_init(&rq->sched.link); > > + > > + queue_request(engine, rq); > > + > > + /* Also release any children on this engine that are ready */ > > + for_each_waiter(p, rq) { > > + struct i915_request *w = > > + container_of(p->waiter, typeof(*w), sched); > > + > > + if (p->flags & I915_DEPENDENCY_WEAK) > > + continue; > > + > > + /* Propagate any change in error status */ > > + if (rq->fence.error) > > + i915_request_set_error_once(w, rq->fence.error); > > + > > + if (w->engine != engine) > > + continue; > > + > > + /* We also treat the on-hold status as a visited bit */ > > + if (!i915_request_on_hold(w)) > > + continue; > > + > > + /* Check that no other parents are also on hold [BFS] */ > > + if (hold_request(w)) > > + continue; > > hold_request() appears deleted in the patch so possible rebase error. The secret is we get to de-duplicate after having duplicated hold_request() in i915_scheduler in an earlier patch, drm/i915: Extract request submission from execlists -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx