From patchwork Mon Nov 7 17:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 16603 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2201497wru; Mon, 7 Nov 2022 09:55:45 -0800 (PST) X-Google-Smtp-Source: AMsMyM6PhoKIzOXQMe/slzBjVd5ZONd1HapTO6lz83QslZRUjUU4KIJa6SbLn9GBV5npSlToQaV7 X-Received: by 2002:a17:902:bd88:b0:187:3aa8:5e0f with SMTP id q8-20020a170902bd8800b001873aa85e0fmr35337336pls.105.1667843745474; Mon, 07 Nov 2022 09:55:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667843745; cv=none; d=google.com; s=arc-20160816; b=sRAXrrcZzJLo+BfBAei8j7b3chNioLK97X1T1ePXt02wd6F7QXyhmWzn4cvpkPcb0C A6PJPD3T+zyr1V4N1plSfAm3b3CTW1hs/XahKV8KXWSao78yMfcxjcEw/4kQnoLHRpWP GrQjwDih7gF6OLRpg7n3QD+LySIoQmgm7qR3a2FnAyDXqWmxh3AufumLjNfhvfzbknp0 fVjbmu9PygTpgvfPALeaf4DmHduCXpwtL/eqNYVyhlme7DPxfrJJqrSEy0Yqc2HlxmhS CkyC+3PKggskeo+xAhQ9ymlvxxanL5Ko2wYr2zu1lZdRXzIJHAQg2nqBqOvX4pQqly/5 3RMg== 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=U/tEoyaSzgCjLFBBFxGEhWlA0ueX0gH414aDBJ34Uqk=; b=VhOz6r4q3UwLlrRsQtNYdh6SHqBuMlWE2COg5SmcR2ZH9PuLUI4a0oZu+Ig7G69Lxw ckdsKrQf1qBAYs8wpSBhRmfW5vi11Jl2vGXkSUlwPHyGEITy2Cx9kbRG66G6L99lWPCs LiIytKo4ZzVA+w1RCVy2GPE40JQrepqhhQO4pR+J4eBsqYLq0T9/PVfucmlW2TDbogax C7WhupIwb+Bh4fvuHrExWb8diTuSdvw2eNmUFScDyjlYfeRyNTatVm/0DmXqLn9N64Rb 9KiaIDCWzlUE3AjiNmGsahb+CH6FX3QHUq0KL+/EbzkFoKIMdmEO9QM4FLyV9gTvgKQv iN4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=s5x6gJB0; 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 e5-20020a170902ef4500b0017f871eb680si11252469plx.269.2022.11.07.09.55.30; Mon, 07 Nov 2022 09:55:45 -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=s5x6gJB0; 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 S232483AbiKGRy4 (ORCPT + 99 others); Mon, 7 Nov 2022 12:54:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232369AbiKGRyM (ORCPT ); Mon, 7 Nov 2022 12:54:12 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D03E24968 for ; Mon, 7 Nov 2022 09:53:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1667843586; 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=U/tEoyaSzgCjLFBBFxGEhWlA0ueX0gH414aDBJ34Uqk=; b=s5x6gJB0oQvdi9PxxKMObWjBnPttc+tIKgp3iV4JP6g4i87boCxDyjZA/XoT/rKmnXe7t8 xsktO8YC1dL/BiuJLBoa6YnWHzQMKkXinVg2EN+ugTEBlcoleFv5aHpBsM8lZV+SEHRZnV LW/vSG/9vQPVgw8OhbbX7mHviYNoaEE= 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 , Lucas Stach , Russell King , Christian Gmeiner , etnaviv@lists.freedesktop.org Subject: [PATCH 12/26] drm: etnaviv: Remove #ifdef guards for PM related functions Date: Mon, 7 Nov 2022 17:52:42 +0000 Message-Id: <20221107175256.360839-2-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?1748860923233849057?= X-GMAIL-MSGID: =?utf-8?q?1748860923233849057?= Use the RUNTIME_PM_OPS() and pm_ptr() macros to handle the .runtime_suspend/.runtime_resume callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM 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. Some #ifdef CONFIG_PM guards were protecting simple statements, and were also converted to "if (IS_ENABLED(CONFIG_PM))". Note that this driver should probably use the DEFINE_RUNTIME_DEV_PM_OPS() macro instead, which will provide .suspend/.resume callbacks, pointing to pm_runtime_force_suspend() and pm_runtime_force_resume() respectively; unless those callbacks really aren't needed. Signed-off-by: Paul Cercueil --- Cc: Lucas Stach Cc: Russell King Cc: Christian Gmeiner Cc: etnaviv@lists.freedesktop.org --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 +++++++++++---------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 37018bc55810..e9a5444ec1c7 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1605,7 +1605,6 @@ static int etnaviv_gpu_hw_suspend(struct etnaviv_gpu *gpu) return etnaviv_gpu_clk_disable(gpu); } -#ifdef CONFIG_PM static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) { int ret; @@ -1621,7 +1620,6 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) return 0; } -#endif static int etnaviv_gpu_cooling_get_max_state(struct thermal_cooling_device *cdev, @@ -1689,11 +1687,10 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, if (ret) goto out_workqueue; -#ifdef CONFIG_PM - ret = pm_runtime_get_sync(gpu->dev); -#else - ret = etnaviv_gpu_clk_enable(gpu); -#endif + if (IS_ENABLED(CONFIG_PM)) + ret = pm_runtime_get_sync(gpu->dev); + else + ret = etnaviv_gpu_clk_enable(gpu); if (ret < 0) goto out_sched; @@ -1737,12 +1734,12 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master, etnaviv_sched_fini(gpu); -#ifdef CONFIG_PM - pm_runtime_get_sync(gpu->dev); - pm_runtime_put_sync_suspend(gpu->dev); -#else - etnaviv_gpu_hw_suspend(gpu); -#endif + if (IS_ENABLED(CONFIG_PM)) { + pm_runtime_get_sync(gpu->dev); + pm_runtime_put_sync_suspend(gpu->dev); + } else { + etnaviv_gpu_hw_suspend(gpu); + } if (gpu->mmu_context) etnaviv_iommu_context_put(gpu->mmu_context); @@ -1856,7 +1853,6 @@ static int etnaviv_gpu_platform_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM static int etnaviv_gpu_rpm_suspend(struct device *dev) { struct etnaviv_gpu *gpu = dev_get_drvdata(dev); @@ -1899,18 +1895,16 @@ static int etnaviv_gpu_rpm_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops etnaviv_gpu_pm_ops = { - SET_RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume, - NULL) + RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume, NULL) }; struct platform_driver etnaviv_gpu_driver = { .driver = { .name = "etnaviv-gpu", .owner = THIS_MODULE, - .pm = &etnaviv_gpu_pm_ops, + .pm = pm_ptr(&etnaviv_gpu_pm_ops), .of_match_table = etnaviv_gpu_match, }, .probe = etnaviv_gpu_platform_probe,