From patchwork Mon Apr 8 09:17:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10889073 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 2BB2414DB for ; Mon, 8 Apr 2019 09:19:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1583F28399 for ; Mon, 8 Apr 2019 09:19:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A3C2283C5; Mon, 8 Apr 2019 09:19:48 +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 99D1B283A2 for ; Mon, 8 Apr 2019 09:19:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61479891F8; Mon, 8 Apr 2019 09:19: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 B6875891F2 for ; Mon, 8 Apr 2019 09:19:36 +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 16169478-1500050 for multiple; Mon, 08 Apr 2019 10:17:42 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 8 Apr 2019 10:17:07 +0100 Message-Id: <20190408091728.20207-8-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408091728.20207-1-chris@chris-wilson.co.uk> References: <20190408091728.20207-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 08/29] drm/i915: Introduce struct intel_wakeref 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP For controlling runtime pm of the GT and engines, we would like to have a callback to do extra work the first time we wake up and the last time we drop the wakeref. This first/last access needs serialisation and so we encompass a mutex with the regular intel_wakeref_t tracker. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/Makefile.header-test | 3 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_wakeref.c | 51 +++++++++++++++ drivers/gpu/drm/i915/intel_wakeref.h | 77 +++++++++++++++++++++++ 5 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_wakeref.c create mode 100644 drivers/gpu/drm/i915/intel_wakeref.h diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 40130cf5c003..233bad5e361f 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -50,6 +50,7 @@ i915-y += i915_drv.o \ intel_device_info.o \ intel_pm.o \ intel_runtime_pm.o \ + intel_wakeref.o \ intel_uncore.o # core library code diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test index 96a5d90629ec..e6b3e7588860 100644 --- a/drivers/gpu/drm/i915/Makefile.header-test +++ b/drivers/gpu/drm/i915/Makefile.header-test @@ -31,7 +31,8 @@ header_test := \ intel_psr.h \ intel_sdvo.h \ intel_sprite.h \ - intel_tv.h + intel_tv.h \ + intel_wakeref.h quiet_cmd_header_test = HDRTEST $@ cmd_header_test = echo "\#include \"$( $@ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fad5306f07da..62a7e91acd7f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -74,6 +74,7 @@ #include "intel_opregion.h" #include "intel_uc.h" #include "intel_uncore.h" +#include "intel_wakeref.h" #include "intel_wopcm.h" #include "i915_gem.h" @@ -134,8 +135,6 @@ bool i915_error_injected(void); __i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \ fmt, ##__VA_ARGS__) -typedef depot_stack_handle_t intel_wakeref_t; - enum hpd_pin { HPD_NONE = 0, HPD_TV = HPD_NONE, /* TV is known to be unreliable */ diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c new file mode 100644 index 000000000000..c133c91cf277 --- /dev/null +++ b/drivers/gpu/drm/i915/intel_wakeref.c @@ -0,0 +1,51 @@ +/* + * SPDX-License-Identifier: MIT + * + * Copyright © 2019 Intel Corporation + */ + +#include "intel_drv.h" +#include "intel_wakeref.h" + +void __intel_wakeref_get_once(struct drm_i915_private *i915, + struct intel_wakeref_count *wc, + bool (*fn)(struct intel_wakeref_count *wc)) +{ + /* + * Treat get/put as different subclasses, as we may need to run + * the put callback from under the shrinker and do not want to + * cross-contanimate that callback with any extra work performed + * upon acquiring the wakeref. + */ + mutex_lock_nested(&wc->mutex, SINGLE_DEPTH_NESTING); + if (!atomic_read(&wc->count)) { + wc->wakeref = intel_runtime_pm_get(i915); + if (unlikely(!fn(wc))) { + intel_runtime_pm_put(i915, wc->wakeref); + mutex_unlock(&wc->mutex); + return; + } + + smp_mb__before_atomic(); /* release wc->count */ + } + atomic_inc(&wc->count); + mutex_unlock(&wc->mutex); +} + +void __intel_wakeref_put_once(struct drm_i915_private *i915, + struct intel_wakeref_count *wc, + bool (*fn)(struct intel_wakeref_count *wc)) +{ + if (likely(fn(wc))) + intel_runtime_pm_put(i915, wc->wakeref); + else + atomic_inc(&wc->count); + mutex_unlock(&wc->mutex); +} + +void __intel_wakeref_init(struct intel_wakeref_count *wc, + struct lock_class_key *key) +{ + __mutex_init(&wc->mutex, "wakeref", key); + atomic_set(&wc->count, 0); +} diff --git a/drivers/gpu/drm/i915/intel_wakeref.h b/drivers/gpu/drm/i915/intel_wakeref.h new file mode 100644 index 000000000000..cd4d8f57e502 --- /dev/null +++ b/drivers/gpu/drm/i915/intel_wakeref.h @@ -0,0 +1,77 @@ +/* + * SPDX-License-Identifier: MIT + * + * Copyright © 2019 Intel Corporation + */ + +#ifndef INTEL_WAKEREF_H +#define INTEL_WAKEREF_H + +#include +#include +#include + +struct drm_i915_private; + +typedef depot_stack_handle_t intel_wakeref_t; + +struct intel_wakeref_count { + atomic_t count; + struct mutex mutex; + intel_wakeref_t wakeref; +}; + +void __intel_wakeref_init(struct intel_wakeref_count *wc, + struct lock_class_key *key); +#define intel_wakeref_init(wc) do { \ + static struct lock_class_key __key; \ + \ + __intel_wakeref_init((wc), &__key); \ +} while (0) + +void __intel_wakeref_get_once(struct drm_i915_private *i915, + struct intel_wakeref_count *wc, + bool (*fn)(struct intel_wakeref_count *wc)); +void __intel_wakeref_put_once(struct drm_i915_private *i915, + struct intel_wakeref_count *wc, + bool (*fn)(struct intel_wakeref_count *wc)); + +static inline void +intel_wakeref_get_once(struct drm_i915_private *i915, + struct intel_wakeref_count *wc, + bool (*fn)(struct intel_wakeref_count *wc)) +{ + if (unlikely(!atomic_inc_not_zero(&wc->count))) + __intel_wakeref_get_once(i915, wc, fn); +} + +static inline void +intel_wakeref_put_once(struct drm_i915_private *i915, + struct intel_wakeref_count *wc, + bool (*fn)(struct intel_wakeref_count *wc)) +{ + if (atomic_dec_and_mutex_lock(&wc->count, &wc->mutex)) + __intel_wakeref_put_once(i915, wc, fn); +} + +static inline void +intel_wakeref_lock(struct intel_wakeref_count *wc) + __acquires(wc->mutex) +{ + mutex_lock(&wc->mutex); +} + +static inline void +intel_wakeref_unlock(struct intel_wakeref_count *wc) + __releases(wc->mutex) +{ + mutex_unlock(&wc->mutex); +} + +static inline bool +intel_wakeref_active(struct intel_wakeref_count *wc) +{ + return atomic_read(&wc->count); +} + +#endif /* INTEL_WAKEREF_H */