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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 2A76BC433EF for ; Thu, 23 Sep 2021 09:18:35 +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 D846C61214 for ; Thu, 23 Sep 2021 09:18:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D846C61214 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0694C6E0FB; Thu, 23 Sep 2021 09:18:34 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E9536E0FB; Thu, 23 Sep 2021 09:18:33 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="203300182" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="203300182" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 02:18:33 -0700 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="558250490" Received: from ideacone-mobl1.ger.corp.intel.com (HELO [10.252.8.21]) ([10.252.8.21]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 02:18:31 -0700 Subject: Re: [PATCH v6 3/9] drm/i915/gt: Increase suspend timeout To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: maarten.lankhorst@linux.intel.com References: <20210922062527.865433-1-thomas.hellstrom@linux.intel.com> <20210922062527.865433-4-thomas.hellstrom@linux.intel.com> From: Matthew Auld Message-ID: <14313c48-8817-fc9f-2a38-32d49d69a21a@intel.com> Date: Thu, 23 Sep 2021 10:18:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210922062527.865433-4-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 22/09/2021 07:25, Thomas Hellström wrote: > With GuC submission on DG1, the execution of the requests times out > for the gem_exec_suspend igt test case after executing around 800-900 > of 1000 submitted requests. > > Given the time we allow elsewhere for fences to signal (in the order of > seconds), increase the timeout before we mark the gt wedged and proceed. > > Signed-off-by: Thomas Hellström Acked-by: Matthew Auld > --- > drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c > index dea8e2479897..f84f2bfe2de0 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c > @@ -19,6 +19,8 @@ > #include "intel_rps.h" > #include "intel_wakeref.h" > > +#define I915_GT_SUSPEND_IDLE_TIMEOUT (HZ / 2) > + > static void user_forcewake(struct intel_gt *gt, bool suspend) > { > int count = atomic_read(>->user_wakeref); > @@ -279,7 +281,7 @@ static void wait_for_suspend(struct intel_gt *gt) > if (!intel_gt_pm_is_awake(gt)) > return; > > - if (intel_gt_wait_for_idle(gt, I915_GEM_IDLE_TIMEOUT) == -ETIME) { > + if (intel_gt_wait_for_idle(gt, I915_GT_SUSPEND_IDLE_TIMEOUT) == -ETIME) { > /* > * Forcibly cancel outstanding work and leave > * the gpu quiet. > 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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 DF81AC433F5 for ; Thu, 23 Sep 2021 09:18:38 +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 A7D3661214 for ; Thu, 23 Sep 2021 09:18:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A7D3661214 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A0136E0FE; Thu, 23 Sep 2021 09:18:34 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E9536E0FB; Thu, 23 Sep 2021 09:18:33 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="203300182" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="203300182" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 02:18:33 -0700 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="558250490" Received: from ideacone-mobl1.ger.corp.intel.com (HELO [10.252.8.21]) ([10.252.8.21]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 02:18:31 -0700 To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: maarten.lankhorst@linux.intel.com References: <20210922062527.865433-1-thomas.hellstrom@linux.intel.com> <20210922062527.865433-4-thomas.hellstrom@linux.intel.com> From: Matthew Auld Message-ID: <14313c48-8817-fc9f-2a38-32d49d69a21a@intel.com> Date: Thu, 23 Sep 2021 10:18:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210922062527.865433-4-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH v6 3/9] drm/i915/gt: Increase suspend timeout 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 22/09/2021 07:25, Thomas Hellström wrote: > With GuC submission on DG1, the execution of the requests times out > for the gem_exec_suspend igt test case after executing around 800-900 > of 1000 submitted requests. > > Given the time we allow elsewhere for fences to signal (in the order of > seconds), increase the timeout before we mark the gt wedged and proceed. > > Signed-off-by: Thomas Hellström Acked-by: Matthew Auld > --- > drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c > index dea8e2479897..f84f2bfe2de0 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c > @@ -19,6 +19,8 @@ > #include "intel_rps.h" > #include "intel_wakeref.h" > > +#define I915_GT_SUSPEND_IDLE_TIMEOUT (HZ / 2) > + > static void user_forcewake(struct intel_gt *gt, bool suspend) > { > int count = atomic_read(>->user_wakeref); > @@ -279,7 +281,7 @@ static void wait_for_suspend(struct intel_gt *gt) > if (!intel_gt_pm_is_awake(gt)) > return; > > - if (intel_gt_wait_for_idle(gt, I915_GEM_IDLE_TIMEOUT) == -ETIME) { > + if (intel_gt_wait_for_idle(gt, I915_GT_SUSPEND_IDLE_TIMEOUT) == -ETIME) { > /* > * Forcibly cancel outstanding work and leave > * the gpu quiet. >