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=-14.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 BD527C433B4 for ; Wed, 28 Apr 2021 15:55:27 +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 24C4261222 for ; Wed, 28 Apr 2021 15:55:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24C4261222 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BD5F6E111; Wed, 28 Apr 2021 15:55:26 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A9C16E12B; Wed, 28 Apr 2021 15:55:24 +0000 (UTC) IronPort-SDR: /n68qnikTEAmDLl01lLras7Pewz5o7dZIYGn5/UacYW/QIOHYT1VnDW6nTvHK+ZFdgkOry10hV tIt9OC6WrMWw== X-IronPort-AV: E=McAfee;i="6200,9189,9968"; a="196884270" X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="196884270" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 08:55:22 -0700 IronPort-SDR: 9o1j4xISKxlXTAWuw2HxRVhmXPvNcfip+c2DIAgdLM6+3oiE2sQg2LcZUR6z41oqx9sjhiTAmX b9lEhopxxSSg== X-IronPort-AV: E=Sophos;i="5.82,258,1613462400"; d="scan'208";a="387764711" Received: from akuligox-mobl.ger.corp.intel.com (HELO [10.213.207.221]) ([10.213.207.221]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2021 08:55:21 -0700 Subject: Re: [Intel-gfx] [PATCH 03/21] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem To: Jason Ekstrand , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210423223131.879208-1-jason@jlekstrand.net> <20210423223131.879208-4-jason@jlekstrand.net> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <417fe44a-61f9-c90a-c255-309db5bb48ab@linux.intel.com> Date: Wed, 28 Apr 2021 16:55:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210423223131.879208-4-jason@jlekstrand.net> Content-Language: en-US X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 23/04/2021 23:31, Jason Ekstrand wrote: > Instead of handling it like a context param, unconditionally set it when > intel_contexts are created. This doesn't fix anything but does simplify > the code a bit. > > Signed-off-by: Jason Ekstrand > --- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 43 +++---------------- > .../gpu/drm/i915/gem/i915_gem_context_types.h | 4 -- > drivers/gpu/drm/i915/gt/intel_context_param.h | 3 +- > 3 files changed, 6 insertions(+), 44 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > index 35bcdeddfbf3f..1091cc04a242a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > @@ -233,7 +233,11 @@ static void intel_context_set_gem(struct intel_context *ce, > intel_engine_has_timeslices(ce->engine)) > __set_bit(CONTEXT_USE_SEMAPHORES, &ce->flags); > > - intel_context_set_watchdog_us(ce, ctx->watchdog.timeout_us); > + if (IS_ACTIVE(CONFIG_DRM_I915_REQUEST_TIMEOUT) && > + ctx->i915->params.request_timeout_ms) { > + unsigned int timeout_ms = ctx->i915->params.request_timeout_ms; > + intel_context_set_watchdog_us(ce, (u64)timeout_ms * 1000); Blank line between declarations and code please, or just lose the local. Otherwise looks okay. Slight change that same GEM context can now have a mix of different request expirations isn't interesting I think. At least the change goes away by the end of the series. Regards, Tvrtko > + } > } > > static void __free_engines(struct i915_gem_engines *e, unsigned int count) > @@ -792,41 +796,6 @@ static void __assign_timeline(struct i915_gem_context *ctx, > context_apply_all(ctx, __apply_timeline, timeline); > } > > -static int __apply_watchdog(struct intel_context *ce, void *timeout_us) > -{ > - return intel_context_set_watchdog_us(ce, (uintptr_t)timeout_us); > -} > - > -static int > -__set_watchdog(struct i915_gem_context *ctx, unsigned long timeout_us) > -{ > - int ret; > - > - ret = context_apply_all(ctx, __apply_watchdog, > - (void *)(uintptr_t)timeout_us); > - if (!ret) > - ctx->watchdog.timeout_us = timeout_us; > - > - return ret; > -} > - > -static void __set_default_fence_expiry(struct i915_gem_context *ctx) > -{ > - struct drm_i915_private *i915 = ctx->i915; > - int ret; > - > - if (!IS_ACTIVE(CONFIG_DRM_I915_REQUEST_TIMEOUT) || > - !i915->params.request_timeout_ms) > - return; > - > - /* Default expiry for user fences. */ > - ret = __set_watchdog(ctx, i915->params.request_timeout_ms * 1000); > - if (ret) > - drm_notice(&i915->drm, > - "Failed to configure default fence expiry! (%d)", > - ret); > -} > - > static struct i915_gem_context * > i915_gem_create_context(struct drm_i915_private *i915, unsigned int flags) > { > @@ -871,8 +840,6 @@ i915_gem_create_context(struct drm_i915_private *i915, unsigned int flags) > intel_timeline_put(timeline); > } > > - __set_default_fence_expiry(ctx); > - > trace_i915_context_create(ctx); > > return ctx; > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > index 5ae71ec936f7c..676592e27e7d2 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > @@ -153,10 +153,6 @@ struct i915_gem_context { > */ > atomic_t active_count; > > - struct { > - u64 timeout_us; > - } watchdog; > - > /** > * @hang_timestamp: The last time(s) this context caused a GPU hang > */ > diff --git a/drivers/gpu/drm/i915/gt/intel_context_param.h b/drivers/gpu/drm/i915/gt/intel_context_param.h > index dffedd983693d..0c69cb42d075c 100644 > --- a/drivers/gpu/drm/i915/gt/intel_context_param.h > +++ b/drivers/gpu/drm/i915/gt/intel_context_param.h > @@ -10,11 +10,10 @@ > > #include "intel_context.h" > > -static inline int > +static inline void > intel_context_set_watchdog_us(struct intel_context *ce, u64 timeout_us) > { > ce->watchdog.timeout_us = timeout_us; > - return 0; > } > > #endif /* INTEL_CONTEXT_PARAM_H */ > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel