From patchwork Thu Jul 12 08:36:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10521281 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 9FA706028E for ; Thu, 12 Jul 2018 08:36:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D81429356 for ; Thu, 12 Jul 2018 08:36:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7066529512; Thu, 12 Jul 2018 08:36: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=-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 15C74294E2 for ; Thu, 12 Jul 2018 08:36:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B31A6EEC9; Thu, 12 Jul 2018 08:36:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 57E226EEC9 for ; Thu, 12 Jul 2018 08:36:40 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 12328530-1500050 for multiple; Thu, 12 Jul 2018 09:36:27 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Jul 2018 09:36:33 +0100 Message-Id: <20180712083633.32235-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180712082037.18020-1-chris@chris-wilson.co.uk> References: <20180712082037.18020-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2] RFC drm/i915: Mark runtime_pm as a special class of lock 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 Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.c | 5 +++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3eba3d1ab5b8..2e6d3259f6d0 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -2603,6 +2603,7 @@ static int intel_runtime_suspend(struct device *kdev) DRM_DEBUG_KMS("Suspending device\n"); disable_rpm_wakeref_asserts(dev_priv); + lock_map_acquire(&dev_priv->runtime_pm.lock); /* * We are safe here against re-faults, since the fault handler takes @@ -2637,11 +2638,13 @@ static int intel_runtime_suspend(struct device *kdev) i915_gem_init_swizzling(dev_priv); i915_gem_restore_fences(dev_priv); + lock_map_release(&dev_priv->runtime_pm.lock); enable_rpm_wakeref_asserts(dev_priv); return ret; } + lock_map_release(&dev_priv->runtime_pm.lock); enable_rpm_wakeref_asserts(dev_priv); WARN_ON_ONCE(atomic_read(&dev_priv->runtime_pm.wakeref_count)); @@ -2696,6 +2699,7 @@ static int intel_runtime_resume(struct device *kdev) WARN_ON_ONCE(atomic_read(&dev_priv->runtime_pm.wakeref_count)); disable_rpm_wakeref_asserts(dev_priv); + lock_map_acquire(&dev_priv->runtime_pm.lock); intel_opregion_notify_adapter(dev_priv, PCI_D0); dev_priv->runtime_pm.suspended = false; @@ -2737,6 +2741,7 @@ static int intel_runtime_resume(struct device *kdev) intel_enable_ipc(dev_priv); + lock_map_release(&dev_priv->runtime_pm.lock); enable_rpm_wakeref_asserts(dev_priv); if (ret) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 01dd29837233..be50a0e6d8c9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1251,6 +1251,7 @@ struct skl_wm_params { * For more, read the Documentation/power/runtime_pm.txt. */ struct i915_runtime_pm { + struct lockdep_map lock; atomic_t wakeref_count; bool suspended; bool irqs_enabled; diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 6b5aa3b074ec..dc76a3bab1e3 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -3697,6 +3697,8 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv) ret = pm_runtime_get_sync(kdev); WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret); + lock_map_acquire_read(&dev_priv->runtime_pm.lock); + atomic_inc(&dev_priv->runtime_pm.wakeref_count); assert_rpm_wakelock_held(dev_priv); } @@ -3730,6 +3732,8 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv) return false; } + lock_map_acquire_read(&dev_priv->runtime_pm.lock); + atomic_inc(&dev_priv->runtime_pm.wakeref_count); assert_rpm_wakelock_held(dev_priv); @@ -3761,6 +3765,8 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv) assert_rpm_wakelock_held(dev_priv); pm_runtime_get_noresume(kdev); + lock_map_acquire_read(&dev_priv->runtime_pm.lock); + atomic_inc(&dev_priv->runtime_pm.wakeref_count); } @@ -3780,6 +3786,8 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv) assert_rpm_wakelock_held(dev_priv); atomic_dec(&dev_priv->runtime_pm.wakeref_count); + lock_map_release(&dev_priv->runtime_pm.lock); + pm_runtime_mark_last_busy(kdev); pm_runtime_put_autosuspend(kdev); } @@ -3796,9 +3804,12 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv) */ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) { + static struct lock_class_key lock_key; struct pci_dev *pdev = dev_priv->drm.pdev; struct device *kdev = &pdev->dev; + lockdep_init_map(&dev_priv->runtime_pm.lock, + "i915->runtime_pm", &lock_key, 0); pm_runtime_set_autosuspend_delay(kdev, 10000); /* 10s */ pm_runtime_mark_last_busy(kdev);