Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1314531rwb; Tue, 29 Nov 2022 11:46:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf5EW/KB+9vgaRYSjvkLiNsXS/464U3jgbgp2bEwLL9n5WoDXT9y8apLzAzl73c/vHqugpjo X-Received: by 2002:a17:90b:3d90:b0:212:de1c:a007 with SMTP id pq16-20020a17090b3d9000b00212de1ca007mr69181849pjb.30.1669751218167; Tue, 29 Nov 2022 11:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669751218; cv=none; d=google.com; s=arc-20160816; b=L2Ckv8IKdgK0KtVQ8GpPCwnKgpsyHH9k0/4Dzpu2shWLiWN63a+sDGwj9Bl6t+plkb Lfl8lEdumcrWyoYWVDUlUP1klWuKye92Sxc5sajy4F66FMTnkYpNHXJE6bq9msqlflF7 SL0dBz47gZFj4DcxBzHUIeGS436ybRAKVG4f4UOypYaAMXHdoBzsja1nVU5vroA3ygD9 uupT4kTs45Ff2cVXMRU8bsEj9AbRnD1poTaI/LqL1QUK9w0uRSQds2fQyGKwBRHB3WLk /u+3v68dM4JuoZs0q/GeyiZLWuZfr7a80rJGR8vcN4SLijSFHsyrQKTt+G63JjgQIpBT PqNw== 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=V3kGaBl+P4U1/h949YafFHG5seRrZ54TXepde/Fhij8=; b=CPGhQ0dav7v/kJxsC8vt113UL8M62ZXL881r0rSAZaSwjbu30tw//M797jpijSa5oT VhIMTHHrLQI4VKxXwIqbxYtK+jgsvqd2s4B3VVxcB3ApLWM63T+sqhroUb6fD+3e8rUF GmLSTyTjWgHcstiBWlG1YAtAoHT8DfsaeBpH9KVjMrkO9ucvCGRFZncwzWmzigEYeClo rGabsJSLYZ8VHAS+ogZN3yPvpsGkNpvoFHi1PI9P8HDQMd+SPoXjEDLq7HxnkM7CojIu Ot0cYPuHrGXaXm4vrbhrhO+xWBpSZG2ALJZwDOSUvG5jcWfoJ1HO1E/Rp+ZRivpCnGb3 ds9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=kwEYPgxo; 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 o9-20020a170902d4c900b00186a16c000dsi16764551plg.313.2022.11.29.11.46.47; Tue, 29 Nov 2022 11:46:58 -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=kwEYPgxo; 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 S236771AbiK2TTM (ORCPT + 84 others); Tue, 29 Nov 2022 14:19:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236732AbiK2TTC (ORCPT ); Tue, 29 Nov 2022 14:19:02 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 144965B851; Tue, 29 Nov 2022 11:18:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749478; 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=V3kGaBl+P4U1/h949YafFHG5seRrZ54TXepde/Fhij8=; b=kwEYPgxoRUvmgmDZgDfr7K/4Nn5SbezOwCc0k/h3X080oKq9a9Xj70tanEW+KEEOVuPxpJ rL45gmZBqARfV7xGUCwObl2/Edrqr2czan00pClSefHDumeRA65jH//CWM7h5mxiEOgXIR ggmTDVYzhX+bVVSx1kFWhbvczDnvX6o= From: Paul Cercueil To: David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org Subject: [PATCH v2 05/26] drm: tegra: Define and use generic PM ops Date: Tue, 29 Nov 2022 19:17:12 +0000 Message-Id: <20221129191733.137897-6-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 --- Cc: Thierry Reding Cc: Jonathan Hunter Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/tegra/drm.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index a1f909dac89a..c844444ff522 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1329,25 +1329,6 @@ static int host1x_drm_remove(struct host1x_device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int host1x_drm_suspend(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_suspend(drm); -} - -static int host1x_drm_resume(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_resume(drm); -} -#endif - -static SIMPLE_DEV_PM_OPS(host1x_drm_pm_ops, host1x_drm_suspend, - host1x_drm_resume); - static const struct of_device_id host1x_drm_subdevs[] = { { .compatible = "nvidia,tegra20-dc", }, { .compatible = "nvidia,tegra20-hdmi", }, @@ -1389,10 +1370,12 @@ static const struct of_device_id host1x_drm_subdevs[] = { { /* sentinel */ } }; +DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS(tegra_pm_ops); + static struct host1x_driver host1x_drm_driver = { .driver = { .name = "drm", - .pm = &host1x_drm_pm_ops, + .pm = pm_sleep_ptr(&tegra_pm_ops), }, .probe = host1x_drm_probe, .remove = host1x_drm_remove, -- 2.35.1