From patchwork Mon Mar 8 09:16:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395373 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1546539jai; Mon, 8 Mar 2021 01:17:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYlWB7II24KBmNI2GtdzwCzdzCMOnmFiRbx5hDji1FKXTKErrPMDhbgIsSpR0yvHu0wt9Z X-Received: by 2002:a17:906:33c5:: with SMTP id w5mr14493144eja.319.1615195052031; Mon, 08 Mar 2021 01:17:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615195052; cv=none; d=google.com; s=arc-20160816; b=wXk1fSJVNAe7sb1oKDYHOPsmnTcUZ+GOBndxuiweBNxhwPf1pfuGur/sxVc28ysE8v WMYVidmV12g6Cst3UkDyYWc+Zk6Gu56dEYeUa7X3SiDnmkxwRpK9lUafPGzjCEr0nu6I RUpfROTbR/OJG+hqnF/lSE4d7aE08xMPgMVZXM3Vb1ICHiVrT/N8AYIjsVrG8/M0VtN8 SOeOzvEEwe1IgmR5JxxtA6iQDQLVfz5zvUY2Kwmy5DedqcZnSJonBvaHDoZicQRFIaOR Zw1v2On6ZM1RCgaUROe7NF5hlonnf2FVUUc8Ag3doNE11PoSGSB6AuHnJ4tglpO6ukvk J/bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=KIiRUMn2zbUAbTCCCaOOS6Ioymx172KJZHR6sOJkB3E=; b=sxKjsUbdHioUTUYmpIO/cgWKmDP0T7EezINOhm+v/zCA2CaLZiPaWZvwHavp/sKWRz wCCZcUap5Nmon3d44neKXctfHATLnPspkE44eargeqkmgGmkuKLlMgacjxfVNXIEYKrR F1krkbZwWLTpVMOnSdnkmn0nkah4PsGbuv+9lOfUd3ybTBUyZiTIbIsBIbGGwK/TJAwY svVUTGrE/X031E9ZvKYFavS8yR8KK/EUN9ZbBf2noc1ohqCApBqKfnQiqzCKXRqIp1Nz yz8vIgMaAnrOQy5ZL9lCA6/5ZOH8W8Xxx+smlnMZThebQVsT9Z3WjZyKNvZAor4ndVMy EPiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="p/CFh9WX"; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p32si7678046edd.89.2021.03.08.01.17.31; Mon, 08 Mar 2021 01:17:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="p/CFh9WX"; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbhCHJQ5 (ORCPT + 7 others); Mon, 8 Mar 2021 04:16:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229730AbhCHJQy (ORCPT ); Mon, 8 Mar 2021 04:16:54 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F060FC06175F for ; Mon, 8 Mar 2021 01:16:53 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id w203-20020a1c49d40000b029010c706d0642so7738109wma.0 for ; Mon, 08 Mar 2021 01:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KIiRUMn2zbUAbTCCCaOOS6Ioymx172KJZHR6sOJkB3E=; b=p/CFh9WX6Zn2+eBgka+a2isZ6yuDutvVbcFKrocpz2AG6JzgayQgCHbNasO73R2G3Y a86OlA3iAl8OAqWKJIj7r/5XE0+nyxAnHhwTyK01+WuB4qF5rpcjE0N6jP8fwoem03Yn 58yc7n6uebtC64hoM6hTnQJdL+d1Xs+eR2Mdwp6qbyMoyNdX55sKUE6x1XxPPkUWH6nX olcZwE/dpyoYcSuD+8rOBpaP6TtBHUBm5St5ZzdSTlJDvf37Iclz8nM1FxgaeOHl+f6k 0bkah0mVPO1cerqyEqmjydxvedbe7Nci1NMMdBs7n/iqkU4/nn70pqBCDlvJLYhnUti8 WTsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KIiRUMn2zbUAbTCCCaOOS6Ioymx172KJZHR6sOJkB3E=; b=Q3DBFS1bfQVyJiwfisTJe3wRkNRgKWUSWEeHzez0cM6eUrcFzi3bQkzbMLXY4NaCsH 6cvh7q1d99aDbWWQ6CvRGuj+wTV+xC00wICTCDQ8gmBTHNzcp4gLbKaceYSR7aIHM34/ 1Nx2c496Vt9jCx9Y2LMbmBMj39WW/MWbZY6Yek0OIjZebYnzJ5UKSbxhPtLzwP8ZCt2G nFNBkcG7VBL2pGqjXwZwwx20TtP2kkWpsqc96NiLvO+4fjJXc53NT3ko6VX94NjupBm+ 3IAngmzdZYjXZHI17DRA+Akhq1KlA9rToRMgkILE7ZDiJQbyPaWy4WkOVSVD9P5gHx6Y sYow== X-Gm-Message-State: AOAM532F5rSr7UQ/Tde+OvnKOMeNOAQqCAknezc5zHRVqMmSvD9Yrfp2 htJQ1feDD1SFd41dY2ejwsrHiA== X-Received: by 2002:a1c:771a:: with SMTP id t26mr21399277wmi.60.1615195012511; Mon, 08 Mar 2021 01:16:52 -0800 (PST) Received: from localhost.localdomain (lns-bzn-59-82-252-141-80.adsl.proxad.net. [82.252.141.80]) by smtp.gmail.com with ESMTPSA id i17sm6068135wrp.77.2021.03.08.01.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:16:52 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Cc: lukasz.luba@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, steven.price@arm.com, MyungJoo Ham , Kyungmin Park , Chanwoo Choi Subject: [PATCH v5 1/4] PM / devfreq: Register devfreq as a cooling device on demand Date: Mon, 8 Mar 2021 10:16:42 +0100 Message-Id: <20210308091646.28096-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently the default behavior is to manually having the devfreq backend to register themselves as a devfreq cooling device. Instead of adding the code in the drivers for the thermal cooling device registering, let's provide a flag in the devfreq's profile to tell the common devfreq code to register the newly created devfreq as a cooling device. Suggested-by: Chanwoo Choi Signed-off-by: Daniel Lezcano --- V5: - Changed subject prefix by: PM / devfreq V4: - Replaced thermal_cooling_device_unregister() by devfreq_cooling_unregister() V3: - Rebased on linux-pm branch without units.h - Set the cdev to NULL in case of error - Added description for the cdev field in the devfreq structure V2: - Added is_cooling_device boolean in profile structure - Register cooling device when the is_cooling_device boolean is set - Remove devfreq cooling device registration in the backend drivers V1: - Register devfreq as a cooling device unconditionnally --- drivers/devfreq/devfreq.c | 13 +++++++++++++ include/linux/devfreq.h | 8 ++++++++ 2 files changed, 21 insertions(+) -- 2.17.1 Reviewed-by: Steven Price Reviewed-by: Steven Price Reviewed-by: Lukasz Luba diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index bf3047896e41..8a535d4d6083 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include #include "governor.h" #define CREATE_TRACE_POINTS @@ -935,6 +937,15 @@ struct devfreq *devfreq_add_device(struct device *dev, mutex_unlock(&devfreq_list_lock); + if (devfreq->profile->is_cooling_device) { + devfreq->cdev = devfreq_cooling_em_register(devfreq, NULL); + if (IS_ERR(devfreq->cdev)) { + dev_info(dev, "Failed to register devfreq " + "cooling device\n"); + devfreq->cdev = NULL; + } + } + return devfreq; err_init: @@ -960,6 +971,8 @@ int devfreq_remove_device(struct devfreq *devfreq) if (!devfreq) return -EINVAL; + devfreq_cooling_unregister(devfreq->cdev); + if (devfreq->governor) { devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_STOP, NULL); diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 26ea0850be9b..aba7ace11b72 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -98,11 +98,15 @@ struct devfreq_dev_status { * @freq_table: Optional list of frequencies to support statistics * and freq_table must be generated in ascending order. * @max_state: The size of freq_table. + * + * @is_cooling_device: A self-explanatory boolean giving the device a + * cooling effect property. */ struct devfreq_dev_profile { unsigned long initial_freq; unsigned int polling_ms; enum devfreq_timer timer; + bool is_cooling_device; int (*target)(struct device *dev, unsigned long *freq, u32 flags); int (*get_dev_status)(struct device *dev, @@ -156,6 +160,7 @@ struct devfreq_stats { * @suspend_count: suspend requests counter for a device. * @stats: Statistics of devfreq device behavior * @transition_notifier_list: list head of DEVFREQ_TRANSITION_NOTIFIER notifier + * @cdev: Cooling device pointer if the devfreq has cooling property * @nb_min: Notifier block for DEV_PM_QOS_MIN_FREQUENCY * @nb_max: Notifier block for DEV_PM_QOS_MAX_FREQUENCY * @@ -198,6 +203,9 @@ struct devfreq { struct srcu_notifier_head transition_notifier_list; + /* Pointer to the cooling device if used for thermal mitigation */ + struct thermal_cooling_device *cdev; + struct notifier_block nb_min; struct notifier_block nb_max; }; From patchwork Mon Mar 8 09:16:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 994B8C43381 for ; Mon, 8 Mar 2021 09:17:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79E93651EE for ; Mon, 8 Mar 2021 09:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229551AbhCHJQ6 (ORCPT ); Mon, 8 Mar 2021 04:16:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229775AbhCHJQ5 (ORCPT ); Mon, 8 Mar 2021 04:16:57 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7474C06174A for ; Mon, 8 Mar 2021 01:16:56 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id l11so7207242wrp.7 for ; Mon, 08 Mar 2021 01:16:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ahYwzRQmSJrX4v8ks57+n/tweaGVoFJT9QTc8vhlUHg=; b=y5axN+kyadsACGS9H0rIrwW2rocmwOJ8uPJYHgOeRJvnJKYfpYihv+L4gMntc6PGuG gZXlw67BU0r28fxfQFrGXjXQ/2dYuK9fF7Fgij3RACAVLYNEKjaSeaxs0jEpzIfMC42g uLMCCHKTrllVRFW+l2BbDPBet0E3UYCttsJaBHZCZaXLQ8HhN7GtXZZnqlJiOrVmi5NF ZSKjCDAd3Ha4LiVasrST5LhE3eY1fNfuWNjBDUpNrmhaXIdK+y4IxLf4RiKcN06gkbWW ATbU8HW/+gq7o0snmBZjuEBPtHGbUlBCin6C5lbv8SyFfIKAsHQrbASK8FyLfglge2oO CsgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ahYwzRQmSJrX4v8ks57+n/tweaGVoFJT9QTc8vhlUHg=; b=KOiRE05aizYEwk4Ckk3/EsHAWHrsw+id7p4SMLPdA2lMuxlyAxVHHX0+rI22JGhLEA kOc5SA2hamP5sy/YXjICmEwakMwBx2ObIXvnbq20xlc/QetFq37NPdKVfEZHQpU0hHkx B8niCACaMBMyQDDc0MQ80INxz3A7Mi7WoFAwkWd47TrLTvD9kzz6shoM3CjCCURz4HhC xRVnRIdu9qRJNyXaXtl5b6yyX0aEy8CLgBOYl7oN/EmzlFT1ykq90n45mr4o0/ws/ZhR iSh2Bl4EoHU9fdvPsiAE+ivsWXJDMqfK3VFlJ1oTK/GgHcAwZS+cg2hBz0wiHF54SEE/ 9QDw== X-Gm-Message-State: AOAM533pPf7uCEQeRSppj8YdKdNNRD6c6JmMabLxKMRdNUlIpo9sH7u8 Rdj807l2TxFL7hXpEcNN9Ax3rQ== X-Google-Smtp-Source: ABdhPJzOZbG/uZWyiLJK0PKAfddis9oaxt1apnwd/HczTnwAtpejwGlzbiYiw7Wz0N0GGQynqZO2+w== X-Received: by 2002:adf:9bcf:: with SMTP id e15mr21168990wrc.276.1615195015567; Mon, 08 Mar 2021 01:16:55 -0800 (PST) Received: from localhost.localdomain (lns-bzn-59-82-252-141-80.adsl.proxad.net. [82.252.141.80]) by smtp.gmail.com with ESMTPSA id i17sm6068135wrp.77.2021.03.08.01.16.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:16:55 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Cc: lukasz.luba@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, steven.price@arm.com, Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org (open list:ARM MALI PANFROST DRM DRIVER) Subject: [PATCH v5 3/4] PM / devfreq: panfrost: Use devfreq cooling device registration Date: Mon, 8 Mar 2021 10:16:44 +0100 Message-Id: <20210308091646.28096-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308091646.28096-1-daniel.lezcano@linaro.org> References: <20210308091646.28096-1-daniel.lezcano@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The devfreq core code is able to register the devfreq device as a cooling device if the 'is_cooling_device' flag is set in the profile. Use this flag and remove the cooling device registering code. Tested on rock960. Signed-off-by: Daniel Lezcano Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 14 +------------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 --- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index 56b3f5935703..4d96edf1bc54 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -3,7 +3,6 @@ #include #include -#include #include #include @@ -80,6 +79,7 @@ static struct devfreq_dev_profile panfrost_devfreq_profile = { .polling_ms = 50, /* ~3 frames */ .target = panfrost_devfreq_target, .get_dev_status = panfrost_devfreq_get_dev_status, + .is_cooling_device = true, }; int panfrost_devfreq_init(struct panfrost_device *pfdev) @@ -90,7 +90,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) struct device *dev = &pfdev->pdev->dev; struct devfreq *devfreq; struct opp_table *opp_table; - struct thermal_cooling_device *cooling; struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq; opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names, @@ -139,12 +138,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) } pfdevfreq->devfreq = devfreq; - cooling = devfreq_cooling_em_register(devfreq, NULL); - if (IS_ERR(cooling)) - DRM_DEV_INFO(dev, "Failed to register cooling device\n"); - else - pfdevfreq->cooling = cooling; - return 0; err_fini: @@ -156,11 +149,6 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev) { struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq; - if (pfdevfreq->cooling) { - devfreq_cooling_unregister(pfdevfreq->cooling); - pfdevfreq->cooling = NULL; - } - if (pfdevfreq->opp_of_table_added) { dev_pm_opp_of_remove_table(&pfdev->pdev->dev); pfdevfreq->opp_of_table_added = false; diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h index db6ea48e21f9..470f5c974703 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h @@ -9,14 +9,11 @@ struct devfreq; struct opp_table; -struct thermal_cooling_device; - struct panfrost_device; struct panfrost_devfreq { struct devfreq *devfreq; struct opp_table *regulators_opp_table; - struct thermal_cooling_device *cooling; bool opp_of_table_added; ktime_t busy_time; From patchwork Mon Mar 8 09:16:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395775 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73811C433E6 for ; Mon, 8 Mar 2021 09:18:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2312161494 for ; Mon, 8 Mar 2021 09:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbhCHJRa (ORCPT ); Mon, 8 Mar 2021 04:17:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230039AbhCHJQ7 (ORCPT ); Mon, 8 Mar 2021 04:16:59 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E876C06175F for ; Mon, 8 Mar 2021 01:16:58 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id u14so10628094wri.3 for ; Mon, 08 Mar 2021 01:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lZkNk3yYW/8ijhrD082tSx7qBCi8O3cbnVc/FrlwdlU=; b=xJPJiPhL2CvJWDgXMAAvBiTvcIxvXystP9YkIlHtva74Kx3KKrXMzr5ExU/2veL6gL JN0tiwqQkJZE+39MgAeg+OMCaGrK8S9+YOsDQDWd+3dTc2g301WBoII1352/ShtfExle I8X285pwmJ87QjUDuabk+LHDri4SK9gCM4d4FWGSbxLmNabTDCCbOJ7VDDWJcvzONPg+ GTa5resMnc34uJs35KxsGGVOTP1jPcf82BNAgk1ep7qrWnin5hljOJvwHYhTfXPo8NMC kc9OFA5NMopEHc1N0LYFDbP7CVmW4PVVBBE9rTuMk3CceWr7P4Tmd6BHvIh5c+x1JqKL Y8Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lZkNk3yYW/8ijhrD082tSx7qBCi8O3cbnVc/FrlwdlU=; b=ZAdhRetcmYUDRH55bdwOqzS3xYp7RVM8/4ITe+6q+yVehJFsOLQlqx0b5J19IsZvZm nFquEdQXYEOzP0ipgGj83QZKAQH3tzy3mW+CsAYxySdAUYGUVSXeLiYGXLEONaOWge67 VuJahZDOEcxVYe8OBdhIvwEIkXp4KGRbFAge6tWqh5+SfBNMJGXDqDsVBk8c6GN2gm4O +Vv/RxwmXPCiZ2Y7PddN56SJz0CzQbFOMHy0Xg7ePyPS2BI2ode+lR0SYsFkhOL+QeDu N1h8F/2pZzU5eKXH3WwQY07s3TDeLJsXTxyxxKDmfUzb/uk6nQKCVXbAQybIV6NqXojm MLaA== X-Gm-Message-State: AOAM5311P6kTj1ufupTVsXqUIoveZ17BhO4TfRnuw+4zJRu0vAGbH97K jvJW0Q7236HpSxFBfjQLTYPGTPZT3WgptQ== X-Google-Smtp-Source: ABdhPJx3SkKA8CuJm1YO3uuuPCxJ7WvFkCcM1T13tKInBZsMtLPFIiucfYx1JIM0Or2VdzZVpvcZLg== X-Received: by 2002:a05:6000:1107:: with SMTP id z7mr1424030wrw.415.1615195017010; Mon, 08 Mar 2021 01:16:57 -0800 (PST) Received: from localhost.localdomain (lns-bzn-59-82-252-141-80.adsl.proxad.net. [82.252.141.80]) by smtp.gmail.com with ESMTPSA id i17sm6068135wrp.77.2021.03.08.01.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:16:56 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Cc: lukasz.luba@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, steven.price@arm.com, Qiang Yu , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR LIMA), lima@lists.freedesktop.org (moderated list:DRM DRIVERS FOR LIMA) Subject: [PATCH v5 4/4] PM / devfreq: lima: Use devfreq cooling device registration Date: Mon, 8 Mar 2021 10:16:45 +0100 Message-Id: <20210308091646.28096-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308091646.28096-1-daniel.lezcano@linaro.org> References: <20210308091646.28096-1-daniel.lezcano@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The devfreq core code is able to register the devfreq device as a cooling device if the 'is_cooling_device' flag is set in the profile. Use this flag and remove the cooling device registering code. Signed-off-by: Daniel Lezcano --- drivers/gpu/drm/lima/lima_devfreq.c | 14 +------------- drivers/gpu/drm/lima/lima_devfreq.h | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index 5686ad4aaf7c..86aea1bdc4f4 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c @@ -7,7 +7,6 @@ */ #include #include -#include #include #include #include @@ -84,17 +83,13 @@ static struct devfreq_dev_profile lima_devfreq_profile = { .polling_ms = 50, /* ~3 frames */ .target = lima_devfreq_target, .get_dev_status = lima_devfreq_get_dev_status, + .is_cooling_device = true, }; void lima_devfreq_fini(struct lima_device *ldev) { struct lima_devfreq *devfreq = &ldev->devfreq; - if (devfreq->cooling) { - devfreq_cooling_unregister(devfreq->cooling); - devfreq->cooling = NULL; - } - if (devfreq->devfreq) { devm_devfreq_remove_device(ldev->dev, devfreq->devfreq); devfreq->devfreq = NULL; @@ -110,7 +105,6 @@ void lima_devfreq_fini(struct lima_device *ldev) int lima_devfreq_init(struct lima_device *ldev) { - struct thermal_cooling_device *cooling; struct device *dev = ldev->dev; struct opp_table *opp_table; struct devfreq *devfreq; @@ -173,12 +167,6 @@ int lima_devfreq_init(struct lima_device *ldev) ldevfreq->devfreq = devfreq; - cooling = of_devfreq_cooling_register(dev->of_node, devfreq); - if (IS_ERR(cooling)) - dev_info(dev, "Failed to register cooling device\n"); - else - ldevfreq->cooling = cooling; - return 0; err_fini: diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h index 2d9b3008ce77..c43a2069e5d3 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.h +++ b/drivers/gpu/drm/lima/lima_devfreq.h @@ -9,7 +9,6 @@ struct devfreq; struct opp_table; -struct thermal_cooling_device; struct lima_device; @@ -17,7 +16,6 @@ struct lima_devfreq { struct devfreq *devfreq; struct opp_table *clkname_opp_table; struct opp_table *regulators_opp_table; - struct thermal_cooling_device *cooling; ktime_t busy_time; ktime_t idle_time;