From patchwork Mon Mar 8 09:16:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395370 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1546206jai; Mon, 8 Mar 2021 01:17:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqSowyIarZBCkNxeaWRMgTD3AwUNC659tNHeyVCwc3zkrr0uRluwerHL8wMk9C3Jj3GwH9 X-Received: by 2002:a17:90b:3890:: with SMTP id mu16mr23847812pjb.9.1615195020112; Mon, 08 Mar 2021 01:17:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615195020; cv=none; d=google.com; s=arc-20160816; b=TZDNbPC36BnQb8wll5RxrjZYbDEgchtCq2aeOPi7QCxUy4C0Vb4j3j4MfNO4vFNXt7 OQ+K7jRp7x5setfu6bKWxnuXFUwH3izC/9vwgxRbwWV1kdcKvnFTWHpcKdGgn+A1YwfE P9SuEg8trIL7FBOKXNu0u38XfmvUjcdgL8Y4WUiuepqGDA6QHtxaArbDjdFYRp3q4BdP XAOMnd/JQw01MTYWCXUhYTojrsgSHu09HadULO0nCnBQyFQsrjbY7JhjTK+wdz6Pw7rd +cOMcO6GuU/hMlQ01npHZFDPKbkKHn01jim/M5mGGswKpnAvcv1EdclfBNV0KY27+FRw NYtA== 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=ibeW5Ki9xOGVUVvgbGTM4now5Yma4ROM1484LwWKga4+ePfcRWNwrztezXfP3q5Sr/ LZKafIK63O8NgM7FP9T13w6/wBswCw8vKNRh3NQb4dj2YM/t2zm4FH7CdctkUWg7nQ8z LKSh/QenyAXEOeFFJIn0vVpED7+t/35ETEc8rX9IgPnSxiKsQW4nMIq46c8V+1nLoOHz PPdVXwGavi93QBLgTz/Yy7Ydd1QmlzHP+W/LXM37C0gX1T+lHPWV1inhBPBJvixkP1l2 utmhLX2hNmySE3/RLYKbmJjiDC8Y8SWypPMB10xqzTVzswNdSxkbn/g+4z1X9E9Kctki 0AuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bmwiWxXQ; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id y18si11198510pfe.136.2021.03.08.01.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:17:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bmwiWxXQ; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 75FAD6E839; Mon, 8 Mar 2021 09:16:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71F376E83A for ; Mon, 8 Mar 2021 09:16:55 +0000 (UTC) Received: by mail-wm1-x32b.google.com with SMTP id 124-20020a1c00820000b029010b871409cfso3322595wma.4 for ; Mon, 08 Mar 2021 01:16: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=bmwiWxXQpx0aH8Y1JRfU8sVz6lNXkdW+JYsyQlgEy0bY+Nx1Y22jgkg4FuOS24lhxP Yv1qvhP0veJ0owMDf0OKjWw/tpAAd6Tnll4Gq6wd4f8ClVzRx7AD3x2ugGbYrLDaqXUH h6+0vDlChooXIjty/kPzBjmRgCj1+rEgoA+rBL8b4sCoF2E8CBdt0efAT1EYcBeRQ0jP jMxwwZOSiMIEpkoiK983ccXCgTWdR5nts2w6ebWOKSlmM+XvgGfILljcDBU8L7iOuxTq D+ZQlnIjJJ3GZh1roccD5vjQ8U9/zZx73/HUYMtPSiqB2fsLM0NbtekxiDOT1JlQlxP3 pzlg== 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=RVH9At1Wg0W4lP+wvwPq+qrGvvr96zMBYILhplsIAAwh3oLIlBguZRZ5oiTD1h1EmG NfU/hImV7O0x/8nDMQgGBVZptRwrnpiyT2dJr/YMQAUjd8w6nd4PYwJtazSbMRobbXvV dLUf/kljeTZw6dcnMPIcbYrHIqLfOPn6YJkdd7WCv9nuzxd6jENn1zCCTGlV/wrMelGs VQqyp/J5A0JRLptOhUB6PPEmHzdiflGlY3vCLUefX59kKN6/tgrm85vok0xc7UgfdbcG zvp+e6nmkUueGlqCcj30pSUmHlayZD2kfKIir+zXrx9GwCKShpZu/Ynq58h0OpyTQXCV o0dQ== X-Gm-Message-State: AOAM530nQgJn0IZsU4yXAoPRy0Hp3ii7WuV9f7rDI+1XCWOtcKc3bhDr brIWp+G9SkO9eGy5F3uBSt1EAQ== X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr21400665wmq.143.1615195014041; Mon, 08 Mar 2021 01:16:54 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:16:53 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Subject: [PATCH v5 2/4] PM / devfreq: msm: Use devfreq cooling device registration Date: Mon, 8 Mar 2021 10:16:43 +0100 Message-Id: <20210308091646.28096-2-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> 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) 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: 395371 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1546245jai; Mon, 8 Mar 2021 01:17:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgWVYIbwnSzCw9IIOgCS1HYtSjZLutOcoyHjfiRLGDeNrXcy1EL3ZLHWxwJFBsvsAmmCKP X-Received: by 2002:a62:5e02:0:b029:1ed:8bee:6132 with SMTP id s2-20020a625e020000b02901ed8bee6132mr21019987pfb.48.1615195023569; Mon, 08 Mar 2021 01:17:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615195023; cv=none; d=google.com; s=arc-20160816; b=Uh/+jfTUT/OiRalYrPfUSZ9bV24wuRVRY2jUUv9IRO1eLKo1wr8kEUtTiB7Ms7hm/S OZhcNlu65//T3iqaRJq/YB2ucLBg4JFuOKZkSbna/AkobTFYX7tMUDJZ1OR71i9FfmtS +Fl/baHd/K7FLny0YrkW9HanN9yxl0NTXuA9RZTkOJe6z5FqXCp+I3QIOFIlMfWu1jGF 5Ad558YVmTgkaIwSskfGQk+hP8aFBG05C6QaUALuY9ZBn9kv5YwJMZpp/8beHZSwEuCS 5RBf7clWXo7Qb8Sm+M78P7tkGZjJ9vF2h4v5xiIkmitpAU87RU1F0HKWVuxjoPc1+6k0 LSIw== 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=N+kS6nGilrRZWlxzLwj9S5TsHpH3UhA/Fid0a8fqpWM=; b=gfVxWGAlNnNExA7icnqSDLMmG0LA+pZb7ypEFCOxfQtob8D9Ft7U33M5xvjLk6qkge 6GMa4Gyh8nj6dM7jRQv59WQ3ogm7WirsN/STmJZB0/lt6tqBa7st1tYd/L3DlcWif/Vs dztPtoPwUhQqBOSLJrsJedK30YmaGGn7z1rkUTg4xaT0mDTtxekIxAGqdvO4ZUe8dRtW Hw6tpCd85auV4gFr8N7DDSX4Mj0o9QJg/ovvBJbDRHyHD2EsmJRr3n/EOTfU3Zsu0/GU AVUAMk2LIugmCbOpNN3n8jSfiEvPbyaejQfh/CMZ9T4C6bErbXuJXj86a7keYv3r2DVB Xzig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=y5axN+ky; 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 b6si5169111pgk.228.2021.03.08.01.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:17: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=y5axN+ky; 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 AA84F6E83B; Mon, 8 Mar 2021 09:16:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED2546E83B for ; Mon, 8 Mar 2021 09:16:56 +0000 (UTC) Received: by mail-wr1-x42f.google.com with SMTP id b18so10613473wrn.6 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=PlWhFZ++qid597CJAlsBBV0fJw6ttxWpjKKkc/MtN7tIHWwkG+6xo7cTePe7uPh4+8 7Vd1/35HTGRtJRNS+F5AzE9+omlMrEUSrKrJUNRqUQITmGk30F5NB1JDPvX6GfOvyRRi vjQ6wGJITEYpOz6DJA3xc8uZ7/bVTmjyYTk4weTWnXb8j24Aza9qumzJLWb2H6GcSByI zWURH90ZflT7s/yBmBDKOyzuvmMaLGu0yt/ac2WJjJhb7f2hbxR19+P+JYHOW+IEzu4R tji5rsvBiEuyLlSoYnTVPFEYxRLibPxyVIEzxq05VpwqXKUfkQmomXfdzgWE/9vAFkWK baUw== X-Gm-Message-State: AOAM5304xQl7tBZq3YiGkSc9UetFtBJH5P8WkFL7g2fbkk+taSeWJcJi TOMrwla1OIPdk85DoeTVehuEIA== 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 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> 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: Tomeu Vizoso , linux-pm@vger.kernel.org, David Airlie , linux-kernel@vger.kernel.org, "open list:ARM MALI PANFROST DRM DRIVER" , steven.price@arm.com, Alyssa Rosenzweig , 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 rock960. Signed-off-by: Daniel Lezcano --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 14 +------------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 --- 2 files changed, 1 insertion(+), 16 deletions(-) -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Reviewed-by: Steven Price 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: 395372 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1546270jai; Mon, 8 Mar 2021 01:17:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaL7lwSw14EWELCojmH7+1Y7N/qN6eT8Bq3pJjGY87Iqd15b1aXM0j7CTpBFb6yOfdcE0w X-Received: by 2002:a17:902:d481:b029:e4:8afa:8524 with SMTP id c1-20020a170902d481b02900e48afa8524mr20148417plg.52.1615195025993; Mon, 08 Mar 2021 01:17:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615195025; cv=none; d=google.com; s=arc-20160816; b=JqX9EiuT2fiEXwG1PEXVtJDCqNsJYX6zUhg7w2HWgdqjISiZdyxxojkYxixHXQGAtD 3ezAt+X3q76Wb9enQd8GFrwmvcXel6RArP4MbJVdtEwYNVUFk4fSSCssGfI+9894uubD 56EM2Zq+W3rOx0wyrSlhTpVPqSEhYgtsAFdMf6Ix0HeunhNVNwLoR+jpyU0DyfhDrHY5 1lMApByxY8CjDzixATM3O8PN05V13WCC9X8hEaIOqgMfpfo8zlrdYAWfu8JXDx13EA69 rjQLdA5LFX5TZ9XVzzTT86brpiDcOQaLEaKff+cwtZAtblaRoBNrKU6zRDiC0d4ajtXH 1kZg== 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=OSH1tdk71siA+L8I4oWGHr7gNJCPHLxAbaOhafupgHc=; b=we5okHqnanYeWPyRVLEI8PlqD3AddAKIVFQWGiICAePIj38YAXrqs3ImU++3hMM0aq FOrQd8eEE3VWBE4NjmM1Ng00PRC0zoV6DM3vRXzpOaSTpo2dIi9LWqxhOC4wiWDmN4Zu 3A/v6yyFgCZy9lsl/n5cuuLpTqTa6cdxc5JauF3vTxo+Qbp5vNJRFNek+3GhfuGcOCbL hV0J5uYmHAECIq7r9qVgQUs2hru3KaxGrr9a/T/KWSsjkM0228XxfXrFwwC0aweP+oxa PZv9Dkl52DqFK41JFsrVuAblroDECGHp4QcuaTULcJixtcC1O8D2xIRiiFOM8OHpH/38 VjNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=xJPJiPhL; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id mu11si3480353pjb.68.2021.03.08.01.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:17:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=xJPJiPhL; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 6C7796E83F; Mon, 8 Mar 2021 09:16:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by gabe.freedesktop.org (Postfix) with ESMTPS id 643756E83B for ; Mon, 8 Mar 2021 09:16:58 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id l12so10609405wry.2 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=WJW9yoYkM48MKCqDWt6/hh4O2ic9Q1HZ7nKOMK9qATN2Tc9FrvHnqeO9o60FV7r/6D IzMmFWFCx3At542yvna1s6uNTcJaVLDtVXDFXjAQ+jP7hasVQqCz7R9IyS7bOqw78lxX ggxt6B8KM1x7V6qrlLq36LbbahNEQWkOa5Xo601Ynm6bXHazOHJ8xeYZ0SDmDfT6+aDk TFQtRjSQxd3ZcfQiGDyRtT2Vbu9GeVze76v94xgd6uc4dPz5uxTnsrAEZts6310hEkyu Mjj4FI2+OiCLiPm462gTNd2YbCd6cKjcUxiHj/ab3mqQFmVF6KEEQJO3F3tGGoR1Vl/V F4kg== X-Gm-Message-State: AOAM532b/wlXYQG0ic7IA7thYZ1gHT8QC3kBLj9ldTzZLB7RYDU6cQkV j3hV2kM/eGFvIAOXZJ+seflLyg== 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 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> 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: "moderated list:DRM DRIVERS FOR LIMA" , linux-pm@vger.kernel.org, David Airlie , linux-kernel@vger.kernel.org, "open list:DRM DRIVERS FOR LIMA" , steven.price@arm.com, Qiang Yu , 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. 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(-) -- 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/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;