From patchwork Fri Jul 1 11:22:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9209743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 712956075F for ; Fri, 1 Jul 2016 11:22:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62C8128526 for ; Fri, 1 Jul 2016 11:22:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57D0B2868D; Fri, 1 Jul 2016 11:22:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 067E428526 for ; Fri, 1 Jul 2016 11:22:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 015E36EA35; Fri, 1 Jul 2016 11:22:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E61D6EA32 for ; Fri, 1 Jul 2016 11:22:37 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id r201so4575171wme.0 for ; Fri, 01 Jul 2016 04:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xzAdzvKja8CNhapwStdGInknog5r4oAdQXkiZ/LXV40=; b=wiQphaosR80lID7/h/s6ivsvyS413kWhnmJcSyJLp8f6Diuu5gxBXrRgdn7EZ7yjzi o4DhA3wwK5WiHFS+fP5bjBEnXB0TerUFtMiUHBRe72W+GYqO2Os/d1EJV699s6HBTJ2J Ks5TmqO2AyNn+etjvIOgsY701RE+GLZWRidCkYLwbqeQt+uc3WUFHavFPwiLx4e8perY 6gdWGK2g3BIp+9GKVx33/P08glzuGCAjIibe1hvTewxg5gU0lHHkGgEe+NS/Wt16aQVN JQ+rp4yqpleaKn+NPP/ztGGwSYfqb0o50kXN5zcDnW/JVYh20HMeSjb11geo42o9/wpO 9XFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xzAdzvKja8CNhapwStdGInknog5r4oAdQXkiZ/LXV40=; b=CdOmOnLIRUIGYgwzVUM9i7ybO+M343ajA/GYamFnJgvkhqsTrJgNtp2B+qtxykeqne XKypEiMrkwNk7snXE9B3BnhpsgKOB0KWylYWwdd3wrj38CCvzRJHXc4T0N4u4PGQEduw G0uPPkjs6/AohTktbMdkkB/Xq5fdusObl+rDj4ArCj16JjH4JT9wXNIS8d1AdLBJ3M7T UpbXhwOjZWUCXPuDpx4QsT2OTVxcy8+m03TejUSLHrZSB59qDxLMjCSFtcvxPszzFpi/ +TVE/dcbeRik0/nnLUQdMBdEW4SH/T6Uwzn3aMhSYZFBZvQq7X423pRy08wgKfiTd545 W0+Q== X-Gm-Message-State: ALyK8tLQrMBTrbyNXQBzX+xBJn+r96fi5p3lHn3Gyl1BJgr1FdeBRMwy6jiRVkAszfMe8A== X-Received: by 10.194.114.228 with SMTP id jj4mr3052039wjb.121.1467372155244; Fri, 01 Jul 2016 04:22:35 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id bc9sm2918396wjc.45.2016.07.01.04.22.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 04:22:34 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 1 Jul 2016 12:22:04 +0100 Message-Id: <1467372140-30422-5-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1467372140-30422-1-git-send-email-chris@chris-wilson.co.uk> References: <1467372140-30422-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 04/20] drm/i915: Make queueing the hangcheck work inline X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Since the function is a small wrapper around schedule_delayed_work(), move it inline to remove the function call overhead for the principle caller. Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_drv.h | 18 +++++++++++++++++- drivers/gpu/drm/i915/i915_irq.c | 17 ----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f4aa727e522a..4948c90c9bd4 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2932,7 +2932,23 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv); bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port); /* i915_irq.c */ -void i915_queue_hangcheck(struct drm_i915_private *dev_priv); +static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv) +{ + unsigned long delay; + + if (unlikely(!i915.enable_hangcheck)) + return; + + /* Don't continually defer the hangcheck so that it is always run at + * least once after work has been scheduled on any ring. Otherwise, + * we will ignore a hung ring if a second ring is kept busy. + */ + + delay = round_jiffies_up_relative(DRM_I915_HANGCHECK_JIFFIES); + queue_delayed_work(system_long_wq, + &dev_priv->gpu_error.hangcheck_work, delay); +} + __printf(3, 4) void i915_handle_error(struct drm_i915_private *dev_priv, u32 engine_mask, diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 3ad4ef9250d8..83f40baeb1f3 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3247,23 +3247,6 @@ out: ENABLE_RPM_WAKEREF_ASSERTS(dev_priv); } -void i915_queue_hangcheck(struct drm_i915_private *dev_priv) -{ - unsigned long delay; - - if (!i915.enable_hangcheck) - return; - - /* Don't continually defer the hangcheck so that it is always run at - * least once after work has been scheduled on any ring. Otherwise, - * we will ignore a hung ring if a second ring is kept busy. - */ - - delay = round_jiffies_up_relative(DRM_I915_HANGCHECK_JIFFIES); - queue_delayed_work(system_long_wq, - &dev_priv->gpu_error.hangcheck_work, delay); -} - static void ibx_irq_reset(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private;