From patchwork Mon Nov 7 17:52:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 16613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2201821wru; Mon, 7 Nov 2022 09:56:30 -0800 (PST) X-Google-Smtp-Source: AMsMyM41pAQpXCIIZU7H8DfSgSAInj4PR5usCBZFjYsg5sFJOyaWAbfyagkd3AkH6ZK+hkJnKvUq X-Received: by 2002:a17:902:f601:b0:186:7b95:f773 with SMTP id n1-20020a170902f60100b001867b95f773mr860036plg.152.1667843789777; Mon, 07 Nov 2022 09:56:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667843789; cv=none; d=google.com; s=arc-20160816; b=tgrMOstXQX/9HTOCoCUEFcKitrRxkIDd+nzh4AsUNAvkALWW87nzoY/GTcIF/ld02M SX/0tk7xqLg3FLevQPKpMSbfTcuTxXpYIBjixt2Qye2zRUL1EbqDtkBKtxTZYTAhyQIj L6cmSmlrXXaTXTCJ3YRyUxJlShGLtWtx2b7D9gPuXFotYpm0wMme7TCg9xCOV/DGJvoD F4fO0o/Ly6AjBV7PrUqdgSBfYXuniU+r9MUJihAfqBXAMVYE+tasLZDs0X/pNpZalrzX mDc0XgcoNRA1axWgBpYRL+JORyhUtv9yp43LABFtvWZoG82ip68Dz5M/h//3fpXu5Bws u2PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Nveh5A0ZF11TSwS4JhZjKC3Y/bPmA5nmXXuqH0bCb0s=; b=n684XtGReKAOd83jPFPaX+nlvoy5z3CKMCaznZxXI4uvRi8zGD9QqQKUgpO5BjaRkW nKuOU/3xNT0y9Kh9JAEufS6tnN3c5wsvg0wwdbV8zdqxPu1eUtm0SDqFc84whOKHBGUQ C88zufw8twpYP3LajKmw3XfuwCPJqxC9hzWpzoaUXtcBxDnNgY4Wi7TvuXzGyzAcwMwN P5+y0vV+iyt0h20OYqwjMAQ5XKvF81gNi48tuQSSN9XqoP0A2Yws+w6z740F6l1qteI4 P2jPd4L/sVc+XYpCTiTma6wjGv42/c2JCKRi/jwEpAttFnO9wAg0lWD/8OQg6ack/uCG 1Eog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=I8zUD5O3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p35-20020a634f63000000b00442e77a852bsi11784551pgl.457.2022.11.07.09.56.16; Mon, 07 Nov 2022 09:56:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=I8zUD5O3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232574AbiKGRzw (ORCPT + 99 others); Mon, 7 Nov 2022 12:55:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232559AbiKGRyZ (ORCPT ); Mon, 7 Nov 2022 12:54:25 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3A6C55B5 for ; Mon, 7 Nov 2022 09:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1667843589; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nveh5A0ZF11TSwS4JhZjKC3Y/bPmA5nmXXuqH0bCb0s=; b=I8zUD5O3Bx1m2wIDTORObkapN5qU/n+Su4ptCE+Ovuh6LAXXMJB1lM4OibbpHF35qBUxu6 f2OSNvVVe3vGJN8tUOlIUVJTrxeNLIVIBG+chjckV/MYzxlH/VxQl+QVEp0b8DeBJEKv+0 QjCHo8S8IIfHjvChJnS2kmTqPM5J5Cg= From: Paul Cercueil To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Tomi Valkeinen Subject: [PATCH 15/26] drm: omap: Remove #ifdef guards for PM related functions Date: Mon, 7 Nov 2022 17:52:45 +0000 Message-Id: <20221107175256.360839-5-paul@crapouillou.net> In-Reply-To: <20221107175256.360839-1-paul@crapouillou.net> References: <20221107175106.360578-1-paul@crapouillou.net> <20221107175256.360839-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748860969678132516?= X-GMAIL-MSGID: =?utf-8?q?1748860969678132516?= Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle the .suspend/.resume callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_SUSPEND is disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. The #ifdef CONFIG_PM guard around omap_gem_resume() was also removed, and replaced by a "if (IS_ENABLED(CONFIG_PM_SLEEP))" guard in-line. The change to CONFIG_PM_SLEEP is because it is only ever called in this configuration. Signed-off-by: Paul Cercueil --- Cc: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 ++---- drivers/gpu/drm/omapdrm/omap_drv.c | 7 +++---- drivers/gpu/drm/omapdrm/omap_gem.c | 5 +++-- drivers/gpu/drm/omapdrm/omap_gem.h | 2 -- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index 61a27dd7392e..14cc4cb457d1 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -1161,7 +1161,6 @@ int tiler_map_show(struct seq_file *s, void *arg) } #endif -#ifdef CONFIG_PM_SLEEP static int omap_dmm_resume(struct device *dev) { struct tcm_area area; @@ -1185,9 +1184,8 @@ static int omap_dmm_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(omap_dmm_pm_ops, NULL, omap_dmm_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(omap_dmm_pm_ops, NULL, omap_dmm_resume); #if defined(CONFIG_OF) static const struct dmm_platform_data dmm_omap4_platform_data = { @@ -1218,7 +1216,7 @@ struct platform_driver omap_dmm_driver = { .owner = THIS_MODULE, .name = DMM_DRIVER_NAME, .of_match_table = of_match_ptr(dmm_of_match), - .pm = &omap_dmm_pm_ops, + .pm = pm_sleep_ptr(&omap_dmm_pm_ops), }, }; diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index eaf67b9e5f12..5f22e63e26c7 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -877,7 +877,6 @@ static int pdev_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int omap_drm_suspend(struct device *dev) { struct omap_drm_private *priv = dev_get_drvdata(dev); @@ -895,14 +894,14 @@ static int omap_drm_resume(struct device *dev) return omap_gem_resume(drm_dev); } -#endif -static SIMPLE_DEV_PM_OPS(omapdrm_pm_ops, omap_drm_suspend, omap_drm_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(omapdrm_pm_ops, + omap_drm_suspend, omap_drm_resume); static struct platform_driver pdev = { .driver = { .name = "omapdrm", - .pm = &omapdrm_pm_ops, + .pm = pm_sleep_ptr(&omapdrm_pm_ops), }, .probe = pdev_probe, .remove = pdev_remove, diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index cf571796fd26..119e829c40de 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1104,7 +1104,6 @@ void *omap_gem_vaddr(struct drm_gem_object *obj) * Power Management */ -#ifdef CONFIG_PM /* re-pin objects in DMM in resume path: */ int omap_gem_resume(struct drm_device *dev) { @@ -1112,6 +1111,9 @@ int omap_gem_resume(struct drm_device *dev) struct omap_gem_object *omap_obj; int ret = 0; + if (!IS_ENABLED(CONFIG_PM_SLEEP)) + return 0; + mutex_lock(&priv->list_lock); list_for_each_entry(omap_obj, &priv->obj_list, mm_list) { if (omap_obj->block) { @@ -1133,7 +1135,6 @@ int omap_gem_resume(struct drm_device *dev) mutex_unlock(&priv->list_lock); return ret; } -#endif /* ----------------------------------------------------------------------------- * DebugFS diff --git a/drivers/gpu/drm/omapdrm/omap_gem.h b/drivers/gpu/drm/omapdrm/omap_gem.h index 4d4488939f6b..edcd92ecc2ea 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.h +++ b/drivers/gpu/drm/omapdrm/omap_gem.h @@ -32,9 +32,7 @@ union omap_gem_size; void omap_gem_init(struct drm_device *dev); void omap_gem_deinit(struct drm_device *dev); -#ifdef CONFIG_PM int omap_gem_resume(struct drm_device *dev); -#endif #ifdef CONFIG_DEBUG_FS void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m);