Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1313463rwb; Tue, 29 Nov 2022 11:45:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf4jc6K7ez1HDc/U5fO2tI9u4pN1pqSwivFvYTfovbynAiHegSPbVXoAygNEwjKV1g0H6RES X-Received: by 2002:a05:6402:2409:b0:45c:935b:ae15 with SMTP id t9-20020a056402240900b0045c935bae15mr30759322eda.357.1669751151841; Tue, 29 Nov 2022 11:45:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669751151; cv=none; d=google.com; s=arc-20160816; b=kgeFaP95oL31kcvL05tLN6AQ1KUTGKD6iYp/DQgjvY6uGuhkPDnI1vCnoiO9tB2O7C N/4Vs90v/ZVznOzGknr6X/RrRqpv7BvwtuS3F6VbRIpP+s/iCgOLAZeVKGJQ2txoEIYg Xz2scdmWWPvauwVpNTwEfKVTIre1eLGvTxDt71KBxoJGwmDiqC6Az0p9XdAPAxCKLwtS UImxI3txe7PvxR9M0EvU+a4yKWyCh+9Y9XayBsQAnFkqng2ZYhpdQZ23aoIGwXPCl/QF 66rA1jsYHPeXl1MbrqX6lHAnV3toN6noZs7bm74KASrANiQJpOoju/ddzX5GAsPflJ1G kmwQ== 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=G8DuH3BuKovOG4Q7ExNfPyHxexqJONRgTC1VLQg6L9Q=; b=pE0oXP+YvKlrH7S60Li/SHMW99nFCv+dphhkapk9PZ82DKDoILu5BzEHBmehzvF6Dz QBYMjI0W46j4ZjN1FtGbqXKHLBVo4PM4R34s3y2tC++N+engE1cUZvwa0CghfwoMKP7U G/xrg+Yf5W4/hw0aCFEP2Tz6eaI0JyXMAG2fgAQx8vxUCma3ZYk4rulnFUFZwpTrg415 kK5G54h+jetDg3zCh4+MKgircbU39gREZPrCBL1aG/eM77c7zY+xwGf5ctBseBBORvHH oblArOJbuCEKW0qcKx4LV7GtuG5V5mEkhz037Evs2IV9VwGHQXJveIkLQ0x2T3uAf3tQ VZ/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=XeDFUB1J; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ht16-20020a170907609000b007ae832c0b69si12391174ejc.512.2022.11.29.11.45.30; Tue, 29 Nov 2022 11:45:51 -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=XeDFUB1J; 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 S236712AbiK2TS1 (ORCPT + 84 others); Tue, 29 Nov 2022 14:18:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236574AbiK2TSW (ORCPT ); Tue, 29 Nov 2022 14:18:22 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 305E44298F for ; Tue, 29 Nov 2022 11:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749472; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G8DuH3BuKovOG4Q7ExNfPyHxexqJONRgTC1VLQg6L9Q=; b=XeDFUB1JkUgh0wnq9Xls3sBZht0UmGP/izWeb/iRwRNzHrS979IvpylbCjC2/q+8aUq3tT EOXMv8WFDy5gjLgrVnvlKo9WSBkpvLWBCb0cWc69f1vAl/XjHyvw2TCphvzX22HwJnUhIf 4WmBhw+t+MczTtU+iytYxf4ZzAVrONY= From: Paul Cercueil To: David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2 04/26] drm: rockchip: Define and use generic PM ops Date: Tue, 29 Nov 2022 19:17:11 +0000 Message-Id: <20221129191733.137897-5-paul@crapouillou.net> In-Reply-To: <20221129191733.137897-1-paul@crapouillou.net> References: <20221129191733.137897-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Use the new DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro to create a "struct dev_pm_ops" that can be used by this driver, instead of using custom PM callbacks with the same behaviour. v2: Use the DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro instead of an exported dev_pm_ops. Signed-off-by: Paul Cercueil --- Cc: Sandy Huang Cc: "Heiko Stübner" Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 25 +++------------------ 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 6e0788d14c10..ec117c52cb24 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -236,27 +236,6 @@ static const struct drm_driver rockchip_drm_driver = { .minor = DRIVER_MINOR, }; -#ifdef CONFIG_PM_SLEEP -static int rockchip_drm_sys_suspend(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_suspend(drm); -} - -static int rockchip_drm_sys_resume(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_resume(drm); -} -#endif - -static const struct dev_pm_ops rockchip_drm_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(rockchip_drm_sys_suspend, - rockchip_drm_sys_resume) -}; - #define MAX_ROCKCHIP_SUB_DRIVERS 16 static struct platform_driver *rockchip_sub_drivers[MAX_ROCKCHIP_SUB_DRIVERS]; static int num_rockchip_sub_drivers; @@ -473,6 +452,8 @@ static const struct of_device_id rockchip_drm_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids); +DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS(rockchip_pm_ops); + static struct platform_driver rockchip_drm_platform_driver = { .probe = rockchip_drm_platform_probe, .remove = rockchip_drm_platform_remove, @@ -480,7 +461,7 @@ static struct platform_driver rockchip_drm_platform_driver = { .driver = { .name = "rockchip-drm", .of_match_table = rockchip_drm_dt_ids, - .pm = &rockchip_drm_pm_ops, + .pm = pm_sleep_ptr(&rockchip_pm_ops), }, }; -- 2.35.1