From patchwork Fri May 17 16:22:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Wajdeczko X-Patchwork-Id: 10948227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA574912 for ; Fri, 17 May 2019 16:22:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C972A28113 for ; Fri, 17 May 2019 16:22:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDE72283EE; Fri, 17 May 2019 16:22:42 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A19528346 for ; Fri, 17 May 2019 16:22:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B0E028993B; Fri, 17 May 2019 16:22:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A705898FA for ; Fri, 17 May 2019 16:22:34 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 09:22:34 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 17 May 2019 09:22:33 -0700 Received: from mwajdecz-MOBL1.ger.corp.intel.com (mwajdecz-mobl1.ger.corp.intel.com [172.28.174.50]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x4HGMT7G016212; Fri, 17 May 2019 17:22:32 +0100 From: Michal Wajdeczko To: intel-gfx@lists.freedesktop.org Date: Fri, 17 May 2019 16:22:26 +0000 Message-Id: <20190517162227.6436-7-michal.wajdeczko@intel.com> X-Mailer: git-send-email 2.10.1.windows.1 In-Reply-To: <20190517162227.6436-1-michal.wajdeczko@intel.com> References: <20190517162227.6436-1-michal.wajdeczko@intel.com> Subject: [Intel-gfx] [PATCH 6/7] drm/i915/uc: Stop GuC submission during reset prepare X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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 Knowing that GuC will be reset soon, perform only minimal cleanup actions (ie. doorbells) without talking with GuC. Signed-off-by: Michal Wajdeczko Cc: Chris Wilson Cc: Daniele Ceraolo Spurio --- drivers/gpu/drm/i915/intel_guc_submission.c | 25 +++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_submission.h | 1 + drivers/gpu/drm/i915/intel_uc.c | 3 +++ 3 files changed, 29 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c index ea0e3734d37c..8889442a31df 100644 --- a/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c @@ -1208,6 +1208,12 @@ static void __guc_client_disable(struct intel_guc_client *client) guc_proc_desc_fini(client); } +static void __guc_client_stop(struct intel_guc_client *client) +{ + __fini_doorbell(client); + __update_doorbell_desc(client, GUC_DOORBELL_INVALID); +} + static int guc_clients_enable(struct intel_guc *guc) { int ret; @@ -1236,6 +1242,15 @@ static void guc_clients_disable(struct intel_guc *guc) __guc_client_disable(guc->execbuf_client); } +static void guc_clients_stop(struct intel_guc *guc) +{ + if (guc->preempt_client) + __guc_client_stop(guc->preempt_client); + + if (guc->execbuf_client) + __guc_client_stop(guc->execbuf_client); +} + /* * Set up the memory resources to be shared with the GuC (via the GGTT) * at firmware loading time. @@ -1455,6 +1470,16 @@ void intel_guc_submission_disable(struct intel_guc *guc) guc_clients_disable(guc); } +void intel_guc_submission_stop(struct intel_guc *guc) +{ + struct drm_i915_private *i915 = guc_to_i915(guc); + + GEM_BUG_ON(i915->gt.awake); /* GT should be parked first */ + + guc_interrupts_release(i915); + guc_clients_stop(guc); +} + #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/intel_guc.c" #endif diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/intel_guc_submission.h index 7d823a513b9c..fbfe7b3b0957 100644 --- a/drivers/gpu/drm/i915/intel_guc_submission.h +++ b/drivers/gpu/drm/i915/intel_guc_submission.h @@ -81,6 +81,7 @@ struct intel_guc_client { int intel_guc_submission_init(struct intel_guc *guc); int intel_guc_submission_enable(struct intel_guc *guc); +void intel_guc_submission_stop(struct intel_guc *guc); void intel_guc_submission_disable(struct intel_guc *guc); void intel_guc_submission_fini(struct intel_guc *guc); int intel_guc_preempt_work_create(struct intel_guc *guc); diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 36c53a42927c..51dcdb2764ce 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -502,6 +502,9 @@ void intel_uc_reset_prepare(struct drm_i915_private *i915) if (!intel_guc_is_alive(guc)) return; + if (USES_GUC_SUBMISSION(i915)) + intel_guc_submission_stop(guc); + guc_stop_communication(guc); __uc_sanitize(i915); }