Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB385C4332F for ; Thu, 20 Oct 2022 17:57:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229876AbiJTR5m (ORCPT ); Thu, 20 Oct 2022 13:57:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbiJTR5l (ORCPT ); Thu, 20 Oct 2022 13:57:41 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E171199F5D for ; Thu, 20 Oct 2022 10:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666288659; x=1697824659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G5SeP6hMbKGGbqIANcB+W4q5oQzdkPzPsG+hKbPRgP0=; b=OUsi2xt/5XOCkVJO6mhs4fFZ+MX94vcS1Fwmh2Bnrj9D/ACi87iLr6Hs T8DXZk0BuFaLJFuLTgXu31fhbzRPDhfn8G5X+A1/YcEZrnweddk8V8swQ c8BjVsDN/y81nMe6J0nX8W7u2v/dT2SpAsq2zrYAAdJi6PI1Cs3AlBKir jCeW/ZNkqmZQdjpPNgBmg+Sq/mdVg54W3h26SXE5598Qz1KQXNqNd4USB K1+ZSN9A+ZEpak69yOB0+1EZL3qAeZQHf5l+THKh+B730N8HIa0KiPlWp AtFbmWp2xUpBkfpkGg15alWjSMNv20fGLDF3K21TOwIKjbqmN33+WZ6R1 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="286510964" X-IronPort-AV: E=Sophos;i="5.95,199,1661842800"; d="scan'208";a="286510964" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2022 10:57:38 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="772517074" X-IronPort-AV: E=Sophos;i="5.95,199,1661842800"; d="scan'208";a="772517074" Received: from gna-nuc-dev34.igk.intel.com ([10.102.80.34]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2022 10:57:35 -0700 From: Maciej Kwapulinski To: Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Greg Kroah-Hartman , Arnd Bergmann , Jonathan Corbet , Derek Kiernan , Dragan Cvetic , Andy Shevchenko , Linus Walleij , Olof Johansson Cc: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, Maciej Kwapulinski , Mikolaj Grzybowski , Tomasz Jankowski , Jianxun Zhang Subject: [PATCH v5 09/10] gna: add power management Date: Thu, 20 Oct 2022 19:53:33 +0200 Message-Id: <20221020175334.1820519-10-maciej.kwapulinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221020175334.1820519-1-maciej.kwapulinski@linux.intel.com> References: <20221020175334.1820519-1-maciej.kwapulinski@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Implement power management in GNA driver Signed-off-by: Maciej Kwapulinski Tested-by: Mikolaj Grzybowski Co-developed-by: Tomasz Jankowski Signed-off-by: Tomasz Jankowski Co-developed-by: Jianxun Zhang Signed-off-by: Jianxun Zhang --- drivers/gpu/drm/gna/gna_device.c | 47 +++++++++++++++++++++++++++++++ drivers/gpu/drm/gna/gna_device.h | 3 ++ drivers/gpu/drm/gna/gna_pci.c | 3 ++ drivers/gpu/drm/gna/gna_request.c | 15 ++++++++++ 4 files changed, 68 insertions(+) diff --git a/drivers/gpu/drm/gna/gna_device.c b/drivers/gpu/drm/gna/gna_device.c index 2ef5be16dc9a..aee409e3b4ea 100644 --- a/drivers/gpu/drm/gna/gna_device.c +++ b/drivers/gpu/drm/gna/gna_device.c @@ -32,6 +32,32 @@ static const struct drm_ioctl_desc gna_drm_ioctls[] = { DRM_IOCTL_DEF_DRV(GNA_WAIT, gna_wait_ioctl, DRM_RENDER_ALLOW), }; +static int __maybe_unused gna_runtime_suspend(struct device *dev) +{ + struct drm_device *drm_dev = dev_get_drvdata(dev); + struct gna_device *gna_priv = to_gna_device(drm_dev); + u32 val = gna_reg_read(gna_priv, GNA_MMIO_D0I3C); + + dev_dbg(dev, "%s D0I3, reg %.8x\n", __func__, val); + + return 0; +} + +static int __maybe_unused gna_runtime_resume(struct device *dev) +{ + struct drm_device *drm_dev = dev_get_drvdata(dev); + struct gna_device *gna_priv = to_gna_device(drm_dev); + u32 val = gna_reg_read(gna_priv, GNA_MMIO_D0I3C); + + dev_dbg(dev, "%s D0I3, reg %.8x\n", __func__, val); + + return 0; +} + +const struct dev_pm_ops __maybe_unused gna_pm = { + SET_RUNTIME_PM_OPS(gna_runtime_suspend, gna_runtime_resume, NULL) +}; + static void gna_drm_dev_fini(struct drm_device *dev, void *ptr) { @@ -49,6 +75,22 @@ static int gna_drm_dev_init(struct drm_device *dev) return drmm_add_action_or_reset(dev, gna_drm_dev_fini, NULL); } +static void gna_pm_init(struct device *dev) +{ + pm_runtime_set_autosuspend_delay(dev, 2000); + pm_runtime_use_autosuspend(dev); + pm_runtime_mark_last_busy(dev); + pm_runtime_allow(dev); + pm_runtime_put_noidle(dev); +} + +static void gna_pm_fini(struct drm_device *drm, void *data) +{ + struct device *dev = data; + + pm_runtime_get_noresume(dev); +} + static irqreturn_t gna_interrupt(int irq, void *priv) { struct gna_device *gna_priv; @@ -170,6 +212,11 @@ int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem if (err) return err; + gna_pm_init(parent); + err = drmm_add_action(drm_dev, gna_pm_fini, parent); + if (err) + return err; + return 0; } diff --git a/drivers/gpu/drm/gna/gna_device.h b/drivers/gpu/drm/gna/gna_device.h index ffdc3d1d1f87..6eae0f2f44df 100644 --- a/drivers/gpu/drm/gna/gna_device.h +++ b/drivers/gpu/drm/gna/gna_device.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "gna_gem.h" @@ -78,6 +79,8 @@ int gna_score_ioctl(struct drm_device *dev, void *data, int gna_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file); +extern const struct dev_pm_ops __maybe_unused gna_pm; + static inline u32 gna_reg_read(struct gna_device *gna_priv, u32 reg) { return readl(gna_priv->iobase + reg); diff --git a/drivers/gpu/drm/gna/gna_pci.c b/drivers/gpu/drm/gna/gna_pci.c index 034554b417a8..eaae42142bfb 100644 --- a/drivers/gpu/drm/gna/gna_pci.c +++ b/drivers/gpu/drm/gna/gna_pci.c @@ -138,6 +138,9 @@ static struct pci_driver gna_pci_driver = { .name = DRIVER_NAME, .id_table = gna_pci_ids, .probe = gna_pci_probe, + .driver = { + .pm = &gna_pm, + }, }; module_pci_driver(gna_pci_driver); diff --git a/drivers/gpu/drm/gna/gna_request.c b/drivers/gpu/drm/gna/gna_request.c index 9efaea61ac68..1d9572bedcc2 100644 --- a/drivers/gpu/drm/gna/gna_request.c +++ b/drivers/gpu/drm/gna/gna_request.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,14 @@ static void gna_request_process(struct work_struct *work) score_request->drv_perf.pre_processing = ktime_get_ns(); + ret = pm_runtime_get_sync(gna_dev(gna_priv)); + if (ret < 0 && ret != -EACCES) { + dev_warn(gna_dev(gna_priv), "pm_runtime_get_sync() failed: %d\n", ret); + score_request->status = -ENODEV; + pm_runtime_put_noidle(gna_dev(gna_priv)); + goto tail; + } + /* Set busy flag before kicking off HW. The isr will clear it and wake up us. There is * no difference if isr is missed in a timeout situation of the last request. We just * always set it busy and let the wait_event_timeout check the reset. @@ -120,6 +129,8 @@ static void gna_request_process(struct work_struct *work) ret = gna_score(score_request); if (ret) { + if (pm_runtime_put(gna_dev(gna_priv)) < 0) + dev_warn(gna_dev(gna_priv), "pm_runtime_put() failed: %d\n", ret); score_request->status = ret; goto tail; } @@ -142,6 +153,10 @@ static void gna_request_process(struct work_struct *work) if (ret < 0 && score_request->status == 0) score_request->status = ret; // -ETIMEDOUT + ret = pm_runtime_put(gna_dev(gna_priv)); + if (ret < 0) + dev_warn(gna_dev(gna_priv), "pm_runtime_put() failed: %d\n", ret); + gna_mmu_clear(gna_priv); for (i = 0, buffer = score_request->buffer_list; i < score_request->buffer_count; i++, buffer++) -- 2.25.1