From patchwork Thu May 2 23:26:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 10927755 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 A391992A for ; Thu, 2 May 2019 23:27:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 934321FE84 for ; Thu, 2 May 2019 23:27:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8788126223; Thu, 2 May 2019 23:27:07 +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 EF92C1FE84 for ; Thu, 2 May 2019 23:27:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A003893C0; Thu, 2 May 2019 23:27:05 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F601893B8 for ; Thu, 2 May 2019 23:27:04 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2019 16:27:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,423,1549958400"; d="scan'208";a="147715140" Received: from ideak-desk.fi.intel.com ([10.237.72.204]) by orsmga003.jf.intel.com with ESMTP; 02 May 2019 16:27:03 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Fri, 3 May 2019 02:26:39 +0300 Message-Id: <20190502232648.4450-2-imre.deak@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502232648.4450-1-imre.deak@intel.com> References: <20190502232648.4450-1-imre.deak@intel.com> Subject: [Intel-gfx] [PATCH 01/10] drm/i915: Add support for tracking wakerefs w/o power-on guarantee 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 It's useful to track runtime PM refs that don't guarantee a device power-on state to the rest of the driver. One such case is holding a reference that will be put asynchronously, during which normal users without their own reference shouldn't access the HW. A follow-up patch will add support for disabling display power domains asynchronously which needs this. For this we can track all references with a separate wakeref_track_count and references guaranteeing a power-on state with the current wakeref_count. Follow-up patches will make use of the API added here, so add a __used__ attribute quirk to keep git bisect working. No functional changes. Cc: Chris Wilson Signed-off-by: Imre Deak --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_runtime_pm.c | 121 ++++++++++++++++++++---- 2 files changed, 102 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9a634ba57ff9..9fb26634a6be 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1177,6 +1177,7 @@ struct skl_wm_params { */ struct i915_runtime_pm { atomic_t wakeref_count; + atomic_t wakeref_track_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 30e7cb9d5801..4a7bfc945322 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -59,6 +59,12 @@ * present for a given platform. */ +static void +assert_raw_rpm_wakelock_held(struct drm_i915_private *i915) +{ + WARN_ON(!atomic_read(&i915->runtime_pm.wakeref_track_count)); +} + #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) #include @@ -100,17 +106,18 @@ static void init_intel_runtime_pm_wakeref(struct drm_i915_private *i915) struct i915_runtime_pm *rpm = &i915->runtime_pm; spin_lock_init(&rpm->debug.lock); + atomic_set(&rpm->wakeref_track_count, 0); } static noinline depot_stack_handle_t -track_intel_runtime_pm_wakeref(struct drm_i915_private *i915) +track_intel_runtime_pm_wakeref_raw(struct drm_i915_private *i915) { struct i915_runtime_pm *rpm = &i915->runtime_pm; depot_stack_handle_t stack, *stacks; unsigned long flags; - atomic_inc(&rpm->wakeref_count); - assert_rpm_wakelock_held(i915); + atomic_inc(&rpm->wakeref_track_count); + assert_raw_rpm_wakelock_held(i915); if (!HAS_RUNTIME_PM(i915)) return -1; @@ -139,6 +146,15 @@ track_intel_runtime_pm_wakeref(struct drm_i915_private *i915) return stack; } +static noinline depot_stack_handle_t +track_intel_runtime_pm_wakeref(struct drm_i915_private *i915) +{ + atomic_inc(&i915->runtime_pm.wakeref_count); + assert_rpm_wakelock_held(i915); + + return track_intel_runtime_pm_wakeref_raw(i915); +} + static void cancel_intel_runtime_pm_wakeref(struct drm_i915_private *i915, depot_stack_handle_t stack) { @@ -163,7 +179,7 @@ static void cancel_intel_runtime_pm_wakeref(struct drm_i915_private *i915, if (WARN(!found, "Unmatched wakeref (tracking %lu), count %u\n", - rpm->debug.count, atomic_read(&rpm->wakeref_count))) { + rpm->debug.count, atomic_read(&rpm->wakeref_track_count))) { char *buf; buf = kmalloc(PAGE_SIZE, GFP_NOWAIT | __GFP_NOWARN); @@ -235,15 +251,15 @@ __print_intel_runtime_pm_wakeref(struct drm_printer *p, } static noinline void -untrack_intel_runtime_pm_wakeref(struct drm_i915_private *i915) +untrack_intel_runtime_pm_wakeref_raw(struct drm_i915_private *i915) { struct i915_runtime_pm *rpm = &i915->runtime_pm; struct intel_runtime_pm_debug dbg = {}; struct drm_printer p; unsigned long flags; - assert_rpm_wakelock_held(i915); - if (atomic_dec_and_lock_irqsave(&rpm->wakeref_count, + assert_raw_rpm_wakelock_held(i915); + if (atomic_dec_and_lock_irqsave(&rpm->wakeref_track_count, &rpm->debug.lock, flags)) { dbg = rpm->debug; @@ -263,6 +279,15 @@ untrack_intel_runtime_pm_wakeref(struct drm_i915_private *i915) kfree(dbg.owners); } +static noinline void +untrack_intel_runtime_pm_wakeref(struct drm_i915_private *i915) +{ + untrack_intel_runtime_pm_wakeref_raw(i915); + + assert_rpm_wakelock_held(i915); + atomic_dec(&i915->runtime_pm.wakeref_count); +} + void print_intel_runtime_pm_wakeref(struct drm_i915_private *i915, struct drm_printer *p) { @@ -308,15 +333,33 @@ static void init_intel_runtime_pm_wakeref(struct drm_i915_private *i915) } static depot_stack_handle_t -track_intel_runtime_pm_wakeref(struct drm_i915_private *i915) +track_intel_runtime_pm_wakeref_raw(struct drm_i915_private *i915) { - atomic_inc(&i915->runtime_pm.wakeref_count); - assert_rpm_wakelock_held(i915); + atomic_inc(&i915->runtime_pm.wakeref_track_count); + assert_raw_rpm_wakelock_held(i915); + return -1; } +static depot_stack_handle_t +track_intel_runtime_pm_wakeref(struct drm_i915_private *i915) +{ + atomic_inc(&i915->runtime_pm.wakeref_count); + assert_rpm_wakelock_held(i915); + + return track_intel_runtime_pm_wakeref_raw(i915); +} + +static void untrack_intel_runtime_pm_wakeref_raw(struct drm_i915_private *i915) +{ + assert_raw_rpm_wakelock_held(i915); + atomic_dec(&i915->runtime_pm.wakeref_track_count); +} + static void untrack_intel_runtime_pm_wakeref(struct drm_i915_private *i915) { + untrack_intel_runtime_pm_wakeref_raw(i915); + assert_rpm_wakelock_held(i915); atomic_dec(&i915->runtime_pm.wakeref_count); } @@ -4347,7 +4390,7 @@ static void intel_power_domains_verify_state(struct drm_i915_private *i915) * * Returns: the wakeref cookie to pass to intel_runtime_pm_put() */ -intel_wakeref_t intel_runtime_pm_get(struct drm_i915_private *i915) +static void __intel_runtime_pm_get(struct drm_i915_private *i915) { struct pci_dev *pdev = i915->drm.pdev; struct device *kdev = &pdev->dev; @@ -4355,6 +4398,19 @@ intel_wakeref_t intel_runtime_pm_get(struct drm_i915_private *i915) ret = pm_runtime_get_sync(kdev); WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret); +} + +__attribute__((__used__)) +static intel_wakeref_t intel_runtime_pm_get_raw(struct drm_i915_private *i915) +{ + __intel_runtime_pm_get(i915); + + return track_intel_runtime_pm_wakeref_raw(i915); +} + +intel_wakeref_t intel_runtime_pm_get(struct drm_i915_private *i915) +{ + __intel_runtime_pm_get(i915); return track_intel_runtime_pm_wakeref(i915); } @@ -4430,23 +4486,48 @@ intel_wakeref_t intel_runtime_pm_get_noresume(struct drm_i915_private *i915) * intel_runtime_pm_get() and might power down the corresponding * hardware block right away if this is the last reference. */ +static void __intel_runtime_pm_put_unchecked(struct drm_i915_private *i915) +{ + struct pci_dev *pdev = i915->drm.pdev; + struct device *kdev = &pdev->dev; + + pm_runtime_mark_last_busy(kdev); + pm_runtime_put_autosuspend(kdev); +} + +static void intel_runtime_pm_put_unchecked_raw(struct drm_i915_private *i915) +{ + untrack_intel_runtime_pm_wakeref_raw(i915); + __intel_runtime_pm_put_unchecked(i915); +} + void intel_runtime_pm_put_unchecked(struct drm_i915_private *i915) { - struct pci_dev *pdev = i915->drm.pdev; - struct device *kdev = &pdev->dev; - untrack_intel_runtime_pm_wakeref(i915); - - pm_runtime_mark_last_busy(kdev); - pm_runtime_put_autosuspend(kdev); + __intel_runtime_pm_put_unchecked(i915); } #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) +__attribute__((__used__)) +static void intel_runtime_pm_put_raw(struct drm_i915_private *i915, + intel_wakeref_t wref) +{ + cancel_intel_runtime_pm_wakeref(i915, wref); + intel_runtime_pm_put_unchecked_raw(i915); +} + void intel_runtime_pm_put(struct drm_i915_private *i915, intel_wakeref_t wref) { cancel_intel_runtime_pm_wakeref(i915, wref); intel_runtime_pm_put_unchecked(i915); } +#else +__attribute__((__used__)) +static void intel_runtime_pm_put_raw(struct drm_i915_private *i915, + intel_wakeref_t wref) +{ + intel_runtime_pm_put_unchecked_raw(i915); +} #endif /** @@ -4521,12 +4602,12 @@ void intel_runtime_pm_cleanup(struct drm_i915_private *i915) struct i915_runtime_pm *rpm = &i915->runtime_pm; int count; - count = atomic_fetch_inc(&rpm->wakeref_count); /* balance untrack */ + count = atomic_fetch_inc(&rpm->wakeref_track_count); /* balance untrack */ WARN(count, - "i915->runtime_pm.wakeref_count=%d on cleanup\n", + "i915->runtime_pm.wakeref_track_count=%d on cleanup\n", count); - untrack_intel_runtime_pm_wakeref(i915); + untrack_intel_runtime_pm_wakeref_raw(i915); } void intel_runtime_pm_init_early(struct drm_i915_private *i915)