From patchwork Wed Aug 17 10:14:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akash.goel@intel.com X-Patchwork-Id: 9285489 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 7AC1A600CB for ; Wed, 17 Aug 2016 10:01:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A9712880E for ; Wed, 17 Aug 2016 10:01:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F6262882C; Wed, 17 Aug 2016 10:01:17 +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.2 required=2.0 tests=BAYES_00, 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 0FDD42880E for ; Wed, 17 Aug 2016 10:01:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 887A56E7D9; Wed, 17 Aug 2016 10:01:16 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 96FE16E7DB for ; Wed, 17 Aug 2016 10:01:08 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 17 Aug 2016 03:01:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,529,1464678000"; d="scan'208";a="749856372" Received: from akashgoe-desktop.iind.intel.com ([10.223.82.36]) by FMSMGA003.fm.intel.com with ESMTP; 17 Aug 2016 03:01:07 -0700 From: akash.goel@intel.com To: intel-gfx@lists.freedesktop.org Date: Wed, 17 Aug 2016 15:44:19 +0530 Message-Id: <1471428859-10339-20-git-send-email-akash.goel@intel.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1471428859-10339-1-git-send-email-akash.goel@intel.com> References: <1471428859-10339-1-git-send-email-akash.goel@intel.com> Cc: Akash Goel Subject: [Intel-gfx] [PATCH 19/19] drm/i915: Sync against the GuC log buffer flush work item on system suspend 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 From: Akash Goel The GuC log buffer flush work item does a register access to send the ack to GuC and this work item, if not synced before suspend, can potentially get executed after the GFX device is suspended. The work item function uses rpm_get/rpm_put calls around the Hw access, this covers the runtime suspend case but for system suspend case (which can be done asychronously/forcefully) sync would be required as kernel can potentially schedule the work items even after some devices, including GFX, have been put to suspend. Also sync has to be done conditionally i.e. only for the system suspend case, as sync along with rpm_get/rpm_put calls can cause a deadlock for rpm suspend path. Cc: Imre Deak Signed-off-by: Akash Goel Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +++++++- drivers/gpu/drm/i915/intel_guc.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index cdee60b..2ae0ad4 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1427,7 +1427,7 @@ static int i915_drm_suspend(struct drm_device *dev) goto out; } - intel_guc_suspend(dev); + intel_guc_suspend(dev, false); intel_display_suspend(dev); @@ -2321,7 +2321,7 @@ static int intel_runtime_suspend(struct device *device) i915_gem_release_all_mmaps(dev_priv); mutex_unlock(&dev->struct_mutex); - intel_guc_suspend(dev); + intel_guc_suspend(dev, true); intel_runtime_pm_disable_interrupts(dev_priv); diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index ef0c116..1af8a8b 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -1519,7 +1519,7 @@ void i915_guc_submission_fini(struct drm_i915_private *dev_priv) * intel_guc_suspend() - notify GuC entering suspend state * @dev: drm device */ -int intel_guc_suspend(struct drm_device *dev) +int intel_guc_suspend(struct drm_device *dev, bool rpm_suspend) { struct drm_i915_private *dev_priv = to_i915(dev); struct intel_guc *guc = &dev_priv->guc; @@ -1530,6 +1530,12 @@ int intel_guc_suspend(struct drm_device *dev) return 0; gen9_disable_guc_interrupts(dev_priv); + /* Sync is needed only for the system suspend case, runtime suspend + * case is covered due to rpm get/put calls used around Hw access in + * the work item function. + */ + if (!rpm_suspend && (i915.guc_log_level >= 0)) + flush_work(&dev_priv->guc.log.flush_work); ctx = dev_priv->kernel_context; diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index b56fe24..1367314 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -172,7 +172,7 @@ extern void intel_guc_init(struct drm_device *dev); extern int intel_guc_setup(struct drm_device *dev); extern void intel_guc_fini(struct drm_device *dev); extern const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status); -extern int intel_guc_suspend(struct drm_device *dev); +extern int intel_guc_suspend(struct drm_device *dev, bool rpm_suspend); extern int intel_guc_resume(struct drm_device *dev); /* i915_guc_submission.c */