From patchwork Fri Mar 5 17:03:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 393528 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp596792jai; Fri, 5 Mar 2021 09:04:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQvX8+0Q0TbG33um/1u4jxoiZNRX2+RV/DJjfqtnvDL1WkyuCTpvR4zQehfUhqj0mM+G/8 X-Received: by 2002:a63:534f:: with SMTP id t15mr10009935pgl.126.1614963843188; Fri, 05 Mar 2021 09:04:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614963843; cv=none; d=google.com; s=arc-20160816; b=nPTn/4GfiZYCefDtnz9dfd+vb6lyDFxBlIQMeJQ+SBNfXLwBeRtHyPA4jZ3AzChXzc 1Vhmcy8qmAWtUJKFeTCfTN6ONIHzYZwVNRuRBbhQrm5L4yP1xhhX+G4Rgk7asJwsncNx v7D5eZoAONlCNiEMqCbX6qx8cw9/1K7BtRQgQ6zx+p4tTwPTaY7fWMZ2FVjbUjJzyB/Y rAcYE0h1rq8kyHcbiC4IbF6EIJxSlDEoQPXn6KYT2f1YFmV7A306DEpexA1aqas+vgyU sQPGbCqxrDZ/3Yc8oQ2QUAZrG2duJ9pUjNkF3He82ycQyRpgV3qP8+qvJ2QdES7smmUV RfLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:delivered-to; bh=7LEJW/C5E7y4xVwd66YXAzGRxCjBZYD4mQkAdnSSYdQ=; b=PS6Gv6PD30d1gFGfBSLWdz+z2JI7iY7RGuhRmwt0QwfHmeSe2AexvsSSucGS4U/CUv MLHFuXDk1h3NKcfFS5nA3SntnitQd3UcKwYT/QyhhZIaqs6CJKvZz+diAOiAz5PIDwfQ G5K4Ii32Kh1VumqLFMQxLiY1KDg9ApEWSrmVsFLKTn/oD6R6gXiJi+gnHAXMvA4+rQ0G RX1gWODZfMHBkisQMc6AhKJADPAA2r/QCADk6rEsCp0KO78r93JtddeBs7VG3C04wh9h fhkqxNbQV6allsAbtS8BgNTC8OWVcJaQDzY/ckkmXj+zVCanJ533vs4KyECa44+vb7Sl Edag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=oNEKdz6x; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id r190si108626pfc.5.2021.03.05.09.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:04:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=oNEKdz6x; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 821AD6EBFE; Fri, 5 Mar 2021 17:03:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6769F6E13C for ; Fri, 5 Mar 2021 17:03:55 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id u16so2863386wrt.1 for ; Fri, 05 Mar 2021 09:03:55 -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=RsjSwA8oB0o8PW0ry99uhxTdXQdH9BOaf5mimdTgeO0=; b=oNEKdz6xPt7rWWlY08YTlqJ+lKrJjFhTuySIUMQ0e+4R72ftmlHWkmFwbJE/yj/0L9 KQMDY7H55bE4DUmCGgWXZyl+eFIMBmfgbneFavsgAAhHFKhJqgZ0E2SRJFr8EYlYdBX3 HLYPLXCO66AqeADhGbMjohltUr1f+KTc3M9FN9QB1IMSKfgOS5XfD/kaKEdd5SRqmln3 ckKfK0l4tR15SPjWq+QWJuU49+H+lNH4Fuxx/IhwJfx6LBmYllz+9uOYVE1kgQg8wMgQ DUzBop11GMlwrMWg2owHd0e46fK8c8XFG/ErkGfIy15tj6hntwGkhRBFjr1eyuGxUJT6 9Pjw== 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=RsjSwA8oB0o8PW0ry99uhxTdXQdH9BOaf5mimdTgeO0=; b=NntntCZXzToJCcmd4VGk8anQ6WJ7SEdl+TNFlLQe6FEXoft0fyBmd1V31WkJzgU0E1 t2qaU3tkZLzK+VMWBBMQHavaWBZb308qQVZo9CaEKS8jqP1iTuXbLd62GrQYx5tRNNOY JP5oo5t29Rw24z2rzZ+8cfx8RMEsEH2lw4ks1xXaZPS1fNEGRuLPtuDLCtLPrVEFu1QD 95nl11fw5IY4d9sz95A7LsBOGOzQsmAbbiWBjmhsUPXa9rBZkklomeoTi60sn+DXXsM4 wCaL4neTeskYW2KsVnJs826+l410LxA9P1eK/JENmqVQdDc7pj/o8i4lcQ9vaa1420Mq ggyQ== X-Gm-Message-State: AOAM530DC6SicGwo/jDSGKhHh2TUUJtXOFUen/sDwhOHPLsElF6upaaR ufcDRvONOCCl5mLLJiAnRDpdQA== X-Received: by 2002:a5d:68cd:: with SMTP id p13mr10821095wrw.247.1614963833977; Fri, 05 Mar 2021 09:03:53 -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 p17sm4760934wmq.47.2021.03.05.09.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:03:53 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Subject: [PATCH v2 3/4] devfreq/drivers/msm: Use devfreq cooling device registration Date: Fri, 5 Mar 2021 18:03:36 +0100 Message-Id: <20210305170338.13647-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210305170338.13647-1-daniel.lezcano@linaro.org> References: <20210305170338.13647-1-daniel.lezcano@linaro.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:DRM DRIVER FOR MSM ADRENO GPU" , linux-pm@vger.kernel.org, David Airlie , "open list:DRM DRIVER FOR MSM ADRENO GPU" , linux-kernel@vger.kernel.org, "open list:DRM DRIVER FOR MSM ADRENO GPU" , steven.price@arm.com, Sean Paul , lukasz.luba@arm.com MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 dragonboard 845c Signed-off-by: Daniel Lezcano --- drivers/gpu/drm/msm/msm_gpu.c | 12 +----------- drivers/gpu/drm/msm/msm_gpu.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index ab7c167b0623..eade94271a60 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -82,6 +81,7 @@ static struct devfreq_dev_profile msm_devfreq_profile = { .target = msm_devfreq_target, .get_dev_status = msm_devfreq_get_dev_status, .get_cur_freq = msm_devfreq_get_cur_freq, + .is_cooling_device = true, }; static void msm_devfreq_init(struct msm_gpu *gpu) @@ -112,14 +112,6 @@ static void msm_devfreq_init(struct msm_gpu *gpu) } devfreq_suspend_device(gpu->devfreq.devfreq); - - gpu->cooling = of_devfreq_cooling_register(gpu->pdev->dev.of_node, - gpu->devfreq.devfreq); - if (IS_ERR(gpu->cooling)) { - DRM_DEV_ERROR(&gpu->pdev->dev, - "Couldn't register GPU cooling device\n"); - gpu->cooling = NULL; - } } static int enable_pwrrail(struct msm_gpu *gpu) @@ -1056,6 +1048,4 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) if (gpu->worker) { kthread_destroy_worker(gpu->worker); } - - devfreq_cooling_unregister(gpu->cooling); } diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index d7cd02cd2109..93419368bac8 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -155,8 +155,6 @@ struct msm_gpu { struct msm_gpu_state *crashstate; /* True if the hardware supports expanded apriv (a650 and newer) */ bool hw_apriv; - - struct thermal_cooling_device *cooling; }; static inline struct msm_gpu *dev_to_gpu(struct device *dev)