From patchwork Fri Oct 23 01:32:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Elf X-Patchwork-Id: 7469081 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E8A26BEEA4 for ; Fri, 23 Oct 2015 01:33:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 318662080F for ; Fri, 23 Oct 2015 01:33:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5428820808 for ; Fri, 23 Oct 2015 01:33:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9CE46E618; Thu, 22 Oct 2015 18:33:31 -0700 (PDT) X-Original-To: Intel-GFX@lists.freedesktop.org Delivered-To: Intel-GFX@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 4433F6E618 for ; Thu, 22 Oct 2015 18:33:31 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 22 Oct 2015 18:33:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,185,1444719600"; d="scan'208";a="586357810" Received: from telf-linux2.isw.intel.com ([10.102.226.163]) by FMSMGA003.fm.intel.com with ESMTP; 22 Oct 2015 18:33:30 -0700 From: Tomas Elf To: Intel-GFX@Lists.FreeDesktop.Org Date: Fri, 23 Oct 2015 02:32:32 +0100 Message-Id: <1445563962-20753-11-git-send-email-tomas.elf@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@intel.com> References: <1445563962-20753-1-git-send-email-tomas.elf@intel.com> Subject: [Intel-gfx] [PATCH 10/20] drm/i915: Watchdog timeout: DRM kernel interface enablement 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Final enablement patch for GPU hang recovery using watchdog timeout. Added execbuf flag for watchdog timeout in DRM kernel interface. Signed-off-by: Tomas Elf --- drivers/gpu/drm/i915/intel_lrc.c | 6 ++---- include/uapi/drm/i915_drm.h | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 30cd0ac..9d01fc3 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1160,10 +1160,6 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, u32 instp_mask; int ret; bool watchdog_running = false; - /* - * NB: Place-holder until watchdog timeout is enabled through DRM - * execbuf interface - */ bool enable_watchdog = false; instp_mode = args->flags & I915_EXEC_CONSTANTS_MASK; @@ -1201,6 +1197,8 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, if (ret) return ret; + enable_watchdog = args->flags & I915_EXEC_ENABLE_WATCHDOG; + /* Start watchdog timer */ if (enable_watchdog) { if (!intel_ring_supports_watchdog(ring)) diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 67cebe6..79e6fc3 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -776,7 +776,10 @@ struct drm_i915_gem_execbuffer2 { */ #define I915_EXEC_RESOURCE_STREAMER (1<<15) -#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_RESOURCE_STREAMER<<1) +/* Enable watchdog timer for this batch buffer */ +#define I915_EXEC_ENABLE_WATCHDOG (1<<16) + +#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_ENABLE_WATCHDOG<<1) #define I915_EXEC_CONTEXT_ID_MASK (0xffffffff) #define i915_execbuffer2_set_context_id(eb2, context) \