Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1347514rwb; Tue, 29 Nov 2022 12:16:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Y1YUNpA3zHK7V0dJyTvoMd6Mgctzo1Gwq4j0/29Bpr+VPwckGVwzTjOjWBGnt8aOofg5S X-Received: by 2002:a17:906:1c12:b0:7b5:f9dd:2f4 with SMTP id k18-20020a1709061c1200b007b5f9dd02f4mr37338356ejg.243.1669752983292; Tue, 29 Nov 2022 12:16:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669752983; cv=none; d=google.com; s=arc-20160816; b=JT5IhZgQUihjwyp5HV54i9S2m2UCWZjlJHoeppu0F8Uvd8FlmPPxBn/NqQuAg/jfZx C1PphIDyjpS4J1/VWp2ALIDxDrkLIephdD0lEZmZ+Uj9I+tShANkWbru3a5CI/ghTiEZ hLsOFvw3OLohNt9KNg4d5hixbG7NWau7O4tsB27nhwXhPZgGHz5zv1+750C572EOERje Dj1+TnYG2YhOYSpMPuioTL5/7FLqE8A0bKTo8YrXz3Eiz2S0NB6vNmfJ7VohBTzgHhVn HCsCBCawLXYId6aMDFXSNjV3TI7rn9SbULES7GGZwhxBLqRzNIRIms7HSFxrypZTAjgM s8Cw== 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=BEjxKDNm3i4FDiWmBekbtVQ5t/EpC9nOnul1c9i1i1M=; b=pmR2XF8aM1J8L8+hRnj15LRimuX6E2BLgKHC2/xd3bR98uySoHqWOz7qWsOzIykQuz rk/heYn7wpYVYqTWWrADUYaRf3Q/L8W8bhT+QcWY5Rs2Cv5Q5AFagUaZF7MnYEyABoFA l758/m5ppCoBY5ZyhrQybZXlLPgMgU/bB43og+gtQSZY7XVVfvO5f5ry8fmNkYDTT/7q 1OSVK5yYdvC8e+E61zTlCpwDCg3LH3Eyi+Yut2VkdUF2aBQ7YLOtO4+dsk2BracqI4M7 zH8rqZ6H3ugoFo45E0CL56IV67JYglAPVYnGsZaKT6HkCEkqRI9Jnzn4624BwJiTlR4d Pg6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Taryu9xn; 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 cw8-20020a170906478800b0078d450cbb02si14199334ejc.452.2022.11.29.12.15.59; Tue, 29 Nov 2022 12:16:23 -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=Taryu9xn; 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 S236798AbiK2TT0 (ORCPT + 84 others); Tue, 29 Nov 2022 14:19:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236230AbiK2TTI (ORCPT ); Tue, 29 Nov 2022 14:19:08 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A63B6C705 for ; Tue, 29 Nov 2022 11:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749479; 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=BEjxKDNm3i4FDiWmBekbtVQ5t/EpC9nOnul1c9i1i1M=; b=Taryu9xn7LuS8c0dGYEZkB9nNj0a7nz0bW0TjxOfTRSglh8anKk2e3H8RCb0mxFe8jiqET h9AlKR8lJOljzO1Dly2Ye7OAmnAkZoamwKHHwPKR0XQ3eHAw2F6kGRNsVQc/7fqXBe7P+b BOJYFPUGDN8RVcomPQ2KFZyZPc9daao= From: Paul Cercueil To: David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v2 06/26] drm: sun4i: Define and use generic PM ops Date: Tue, 29 Nov 2022 19:17:13 +0000 Message-Id: <20221129191733.137897-7-paul@crapouillou.net> In-Reply-To: <20221129191733.137897-1-paul@crapouillou.net> References: <20221129191733.137897-1-paul@crapouillou.net> MIME-Version: 1.0 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 --- Samuel: since the code changed I had to remove your reviewed-by, sorry about that. Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Jernej Skrabec Cc: Samuel Holland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-sunxi@lists.linux.dev --- drivers/gpu/drm/sun4i/sun4i_drv.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index cc94efbbf2d4..178ada09b467 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -339,27 +340,6 @@ static int sun4i_drv_add_endpoints(struct device *dev, return count; } -#ifdef CONFIG_PM_SLEEP -static int sun4i_drv_drm_sys_suspend(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_suspend(drm); -} - -static int sun4i_drv_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 sun4i_drv_drm_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(sun4i_drv_drm_sys_suspend, - sun4i_drv_drm_sys_resume) -}; - static int sun4i_drv_probe(struct platform_device *pdev) { struct component_match *match = NULL; @@ -434,13 +414,15 @@ static const struct of_device_id sun4i_drv_of_table[] = { }; MODULE_DEVICE_TABLE(of, sun4i_drv_of_table); +DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS(sun4i_pm_ops); + static struct platform_driver sun4i_drv_platform_driver = { .probe = sun4i_drv_probe, .remove = sun4i_drv_remove, .driver = { .name = "sun4i-drm", .of_match_table = sun4i_drv_of_table, - .pm = &sun4i_drv_drm_pm_ops, + .pm = pm_sleep_ptr(&sun4i_pm_ops), }, }; drm_module_platform_driver(sun4i_drv_platform_driver); -- 2.35.1