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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 42105C433E6 for ; Thu, 4 Feb 2021 16:12:53 +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 6DAB864E2C for ; Thu, 4 Feb 2021 16:12:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DAB864E2C 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 005A56E0DD; Thu, 4 Feb 2021 16:12:52 +0000 (UTC) Received: from fireflyinternet.com (unknown [77.68.26.236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0ED7C6E0DD for ; Thu, 4 Feb 2021 16:12:49 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.69.177; Received: from localhost (unverified [78.156.69.177]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP (TLS) id 23788788-1500050 for multiple; Thu, 04 Feb 2021 16:12:47 +0000 MIME-Version: 1.0 In-Reply-To: <911ddc88-e105-c770-6b56-f1963144d83f@linux.intel.com> References: <20210201085715.27435-1-chris@chris-wilson.co.uk> <20210201085715.27435-32-chris@chris-wilson.co.uk> <911ddc88-e105-c770-6b56-f1963144d83f@linux.intel.com> From: Chris Wilson To: Tvrtko Ursulin , intel-gfx@lists.freedesktop.org Date: Thu, 04 Feb 2021 16:12:46 +0000 Message-ID: <161245516616.3075.3787689019297534557@build.alporthouse.com> User-Agent: alot/0.9 Subject: Re: [Intel-gfx] [PATCH 32/57] drm/i915: Move needs-breadcrumb flags to scheduler 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-04 15:28:30) > > On 01/02/2021 08:56, Chris Wilson wrote: > > Whether the scheduler depends on interrupt delivery for forward progress > > is a property of the scheduler backend not of the underlying engine, so > > move the flag from inside the engine to i915_sched_engine. > > > > Signed-off-by: Chris Wilson > > --- > > drivers/gpu/drm/i915/gt/intel_engine.h | 6 ++++++ > > drivers/gpu/drm/i915/gt/intel_engine_types.h | 13 +++---------- > > drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- > > drivers/gpu/drm/i915/i915_scheduler_types.h | 7 +++++++ > > 4 files changed, 17 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h > > index ca3a9cb06328..db5419ba1dc8 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_engine.h > > +++ b/drivers/gpu/drm/i915/gt/intel_engine.h > > @@ -285,4 +285,10 @@ intel_engine_has_timeslices(struct intel_engine_cs *engine) > > return i915_sched_has_timeslices(intel_engine_get_scheduler(engine)); > > } > > > > +static inline bool > > +intel_engine_needs_breadcrumb_tasklet(struct intel_engine_cs *engine) > > +{ > > + return i915_sched_needs_breadcrumb_tasklet(intel_engine_get_scheduler(engine)); > > +} > > + > > #endif /* _INTEL_RINGBUFFER_H_ */ > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h > > index 96a0aec29672..f856bd9b7dae 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > > @@ -442,10 +442,9 @@ struct intel_engine_cs { > > #define I915_ENGINE_SUPPORTS_STATS BIT(1) > > #define I915_ENGINE_HAS_PREEMPTION BIT(2) > > #define I915_ENGINE_HAS_SEMAPHORES BIT(3) > > -#define I915_ENGINE_NEEDS_BREADCRUMB_TASKLET BIT(4) > > -#define I915_ENGINE_IS_VIRTUAL BIT(5) > > -#define I915_ENGINE_HAS_RELATIVE_MMIO BIT(6) > > -#define I915_ENGINE_REQUIRES_CMD_PARSER BIT(7) > > +#define I915_ENGINE_IS_VIRTUAL BIT(4) > > +#define I915_ENGINE_HAS_RELATIVE_MMIO BIT(5) > > +#define I915_ENGINE_REQUIRES_CMD_PARSER BIT(6) > > unsigned int flags; > > > > /* > > @@ -540,12 +539,6 @@ intel_engine_has_semaphores(const struct intel_engine_cs *engine) > > return engine->flags & I915_ENGINE_HAS_SEMAPHORES; > > } > > > > -static inline bool > > -intel_engine_needs_breadcrumb_tasklet(const struct intel_engine_cs *engine) > > -{ > > - return engine->flags & I915_ENGINE_NEEDS_BREADCRUMB_TASKLET; > > -} > > - > > static inline bool > > intel_engine_is_virtual(const struct intel_engine_cs *engine) > > { > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > index 887f38fb671f..e8c66d868c59 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > @@ -606,7 +606,6 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine) > > } > > engine->set_default_submission = guc_set_default_submission; > > > > - engine->flags |= I915_ENGINE_NEEDS_BREADCRUMB_TASKLET; > > engine->flags |= I915_ENGINE_HAS_PREEMPTION; > > > > /* > > @@ -656,6 +655,7 @@ int intel_guc_submission_setup(struct intel_engine_cs *engine) > > > > tasklet_setup(&engine->sched.tasklet, guc_submission_tasklet); > > __set_bit(I915_SCHED_ACTIVE_BIT, &engine->sched.flags); > > + __set_bit(I915_SCHED_NEEDS_BREADCRUMB_BIT, &engine->sched.flags); > > Bah here my idea from earlier falls apart a bit. Don't know. On the positive side, we've eliminated this patch by moving the irq_handler to the engine! -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx