From patchwork Mon Mar 8 13:30:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395407 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1713589jai; Mon, 8 Mar 2021 05:33:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJybcwk8rL4GOnLNxj9ndyiiM4oSZq+d1LIN1fvVRZpdThvkoYKu7TWFPe2zE1mhS2QQfBxm X-Received: by 2002:a63:fd0a:: with SMTP id d10mr19910689pgh.405.1615210392464; Mon, 08 Mar 2021 05:33:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615210392; cv=none; d=google.com; s=arc-20160816; b=SC3zj8iJx3LtwC+lsLIPI7x34agNIwqYelHwV14wjpru2Q2YsO0GRA1e8xPq5EPV+p nHz8ZZOFJThF2RFpp9aCZIEme4AjmSUz0lV2clo6noBii2D098VuNXrQ/lU7v6zTTtje nQ9UGCKO1b5uv6soE3TViJF8QjENdJQH9BLbIipj1fcj40/v8/bHTKRw0bPkV/h+uRe1 cp/ig8EFc99PoIzwuJZtbFBopE5Z1/uWrev0k4p95FR+ej9MANhuYOqs5RDlY+KHT8Ej ICXmiz+8n1Q7c6+/SBmGzdHEeuFZVOxYeydUsIyRwd3MensQkWluwbX316twLEfrDA6t t5VA== 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=YrnmSBoDUSmn4qwef5MzFDEXPuZ1Pgr174+SRG7xyUFmY8zEGlyv6IBvGqD8rg4ifZ HoGXp1D8T6trku85sFaNejSgKjo/EOk6hIumoVpAY5Ft/C1IjT8MhGK4KPHovv/mjX45 8KE2MvhU9O8kyDv7e0U//iU8hfo8zMw6EQPSzWlvoGxA0KuF+1sQcGnzHk1/ku1Q3CrU 0p3pJQ/YAidqr7YHLFwAQDmNGRV97oeMWCPsh7t0vaZjOtEbRxRKAHYFKrgYAweXT4ap VV75cF+P9kfybBGiyIG8GTb16FgA4eqSv+a3G18H4sPlrJ5VnzOMQ3OB4fHWv0sYBpcS n6Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=lWgaqsU8; 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 j6si12086131plx.359.2021.03.08.05.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 05:33:12 -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=lWgaqsU8; 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 7536E6E3C6; Mon, 8 Mar 2021 13:33:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by gabe.freedesktop.org (Postfix) with ESMTPS id C44D189B11 for ; Mon, 8 Mar 2021 13:33:07 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id j2so11460058wrx.9 for ; Mon, 08 Mar 2021 05:33:07 -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=lWgaqsU8BQOwg9ws+DhQ/BWpAGGUh8wAnGaIk1lwDEofYiLOAhnUDvwTgdcltFd/Uf YsZHPTY6e6kNXalk/rmRj1JzpwNfZBxiP6yn6cwPmGg0Dph1wbF4d3Ul5NSoB4s8GwYD nlH4qfp6V1l53JUThiQx/V0USq4Gt1khL5dGlV8juzFC9xCtxFPTHoTRadWc7zznJ8qw s+gy9jH9Xoq/gFjjgsSjZvcFBW1f1akBVwlFUVL2FLsro5Kb7d78Np120TBRReONbPnQ fZlJimyI9CR1S0CynZOBmLY9R54Zyoa3bAPsezbfw/RyxXar3+qr6KMWSKS7m523eMAW OgUg== 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=NYkLw85cqj9Eeetcxdq3jStdP4SzmpIIGMMpg8b1eO7o21QSN6pgjVNA6axIFmsIek quS7K1hEVOsTiOFGevbyEPhcALxzABFz5X6XCzovMBsWJiCf/bfGZsDaJ50CcnkGv3Fm g3OUrjDzujo3h9d4SoC0HSW30OADS3Uoo0x98lioszvkc757zq88t/dVAueaKiYvWj2N w9j0VbR41j3HHnAZEBnn65wXJG10vOMv+XyaHdbuwG6/92ArN8ajiq7Hn4xCLIs2ZgdX UT4yT+VozTrYA3QE7/ixqKnBPYBXj3Bem3N0zUsjPw+kAowp6aqPhlXvOXr4gndsowdX Rujw== X-Gm-Message-State: AOAM530LCKjPzSXLDu1tHVCR6te63ZYqjT/7sQdi8IbLczUrt2b32rmT 3eWxifRpVehY+GNiy4UkZlU90Q== X-Received: by 2002:adf:b609:: with SMTP id f9mr22017714wre.223.1615210386308; Mon, 08 Mar 2021 05:33:06 -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 m11sm18942665wrz.40.2021.03.08.05.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 05:33:05 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Subject: [PATCH v6 2/4] PM / devfreq: msm: Use devfreq cooling device registration Date: Mon, 8 Mar 2021 14:30:38 +0100 Message-Id: <20210308133041.10516-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308133041.10516-1-daniel.lezcano@linaro.org> References: <20210308133041.10516-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 13:30:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395408 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1713639jai; Mon, 8 Mar 2021 05:33:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBALePex8xquFqDqKoW78alN5Hqi2rrofEPQ0oI1KD4Gdv9eL1ohMOCCYD2DYONMc8fPcP X-Received: by 2002:a63:b12:: with SMTP id 18mr8182996pgl.45.1615210395890; Mon, 08 Mar 2021 05:33:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615210395; cv=none; d=google.com; s=arc-20160816; b=y6Mv1Pt5e6SEeD6clHxQ8Mnf/vDxu0+thI3d37DM1fBkreCAX8zMD6jd/BPBzvCRy6 yyZTGdwFRtVaQzjtmmeJ1NEqEyCNw2WxV5jdqiQn52LMCVWtS41XXX5ok7fwpcaM3N+8 IC9wcHXrcCAHQX/hIzcLxZYpSWLpKdvVlwkjwECq4KZQl4DlG+wOthjFzsiN4qhWsKWR yMkrfwaCCQdW3Urf0Zw/UAYFISQmpyIMsf2Z9f23OLWVGZp/39CG7W15YHchcXVFNYhX Ahgm7ZI5AAXp7LxBzEK/u4x/Wk6aTofDs9JYCer5joDIMesJiiCiE6wdGvX/sLpQjGK/ ymrA== 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=UGTjv+e1lm4AraI9Iau0jvr4WT0cyKh3+jXyNoo6MGk=; b=ZltHLkiAV5zOs7n/2s17YQCDx0pUpFsDmk3JeuN+Na1YLoFyQGoRTbOu84esOJ58bH IGIm6fUuaVixIHxW3qYpmEWB868YnprU8RI6OdrMBLwKrPgpEFE3ICqX1QjMEjvB9Zcx TlrJCCm2801e2RJXAGSZkt/51udCReqFrEceRusjxD3CcySU3Gqi9ikTsiZFJkcCOhT6 jssTSJXLNYa9an2YqP8JF1KPsTikhG4Lr3xB0HyNecDGDTbIm7yn5BXrQwBSeJJ16hYT DYSIoRnkLaPkRnXIKSfUoOy+Uxhjl9+koLoiHnIKbj65nbCNsq3QCz2z/DApKQrGH5pt D4Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=AsXKRlBz; 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 f16si11474083pfd.245.2021.03.08.05.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 05:33:15 -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=AsXKRlBz; 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 70C916E3D6; Mon, 8 Mar 2021 13:33:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by gabe.freedesktop.org (Postfix) with ESMTPS id 490406E3C6 for ; Mon, 8 Mar 2021 13:33:09 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id n22so6059653wmc.2 for ; Mon, 08 Mar 2021 05:33:09 -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=qhmm7MrKdTwC31wHH2vNUCLubMqn0qUwkRrssLNEi9A=; b=AsXKRlBzMj0XqlLBUSGMnj9q7R25iT3ReJ1aBIzxK5qMrDGI4AodKxv7xhQnLIYMSr IgtD9xTbcZinvX1DTIKbwQMqaMZ5LlwXz/YnLpe0UYWDRf9GCGWwPw8JqwWGqy5AdFVM 5uBNLkIvIW9+61z4LDbG3yTjPIiUt2rs1ITGRfBbD6+ubiwdjdAfDhZnaIsvqApCxpmi +xbIUcpcqbpNycytOe41v80mt4YW8OLqVu5TqwEVyv4SuFShvHiIcbRDMDrjUt5vWpAR BKO//asvN27/7ZE+Br7z8wHIn2MRvJQiiq6ApHDgeEWhD1qAYPy5zKTgwA6GIteoOT86 MQoA== 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=qhmm7MrKdTwC31wHH2vNUCLubMqn0qUwkRrssLNEi9A=; b=QjUJ/ufC1mdNizYccH2YLcNceJN9uLrhGkElJX5TdQ+p1jF8Np1gh/pw+/DkMg08TI pYmuWCsN9U4vbkOzxajTjGLUgvamCH96AEviowlxlJ1hSsw5ZJwGi85WxEvHddx4ukvx pKBtB+z70ZaBRENEDg4IqIGzp/ZxJ0dKRN24Q/qG8WTDwzjUolFXX79nsYh0RqjqWo9G GmLBPGvqdBESYIAoyZMPSVRuq6qxaKu97STpu36u4D1SqpEBArkJypllAg6lOezGeZyx AlvlWlFJN30ld+oE4lM/RHC3orHnbrROAAUiD8NFooMN7sG1Idp/Ivr2IKOJuuzQ0aYT s15Q== X-Gm-Message-State: AOAM530rz5Hxdy2anRRhmRX4BwMsyKn4uf19i9XhTI8lcL6VM8RxZpgy cpVTIQLqqxjlqqEAu8X4hOIuTQ== X-Received: by 2002:a7b:c4c9:: with SMTP id g9mr22581123wmk.82.1615210387861; Mon, 08 Mar 2021 05:33:07 -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 m11sm18942665wrz.40.2021.03.08.05.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 05:33:07 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Subject: [PATCH v6 3/4] PM / devfreq: panfrost: Use devfreq cooling device registration Date: Mon, 8 Mar 2021 14:30:39 +0100 Message-Id: <20210308133041.10516-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308133041.10516-1-daniel.lezcano@linaro.org> References: <20210308133041.10516-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 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(-) -- 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/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 13:30:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 395410 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1713666jai; Mon, 8 Mar 2021 05:33:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJw72lgaimjz4zxp4gQpnZURUqpep7GVl973GUYVwv380t+hNExDniSK3aExc8zcLGI/rO6w X-Received: by 2002:a17:90a:9312:: with SMTP id p18mr5106996pjo.171.1615210398264; Mon, 08 Mar 2021 05:33:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615210398; cv=none; d=google.com; s=arc-20160816; b=WNyyeFKrvYKQFMRcCpAHRwR/AV6mqsT4TJTn0J8TZ8lcy1fEJibM57K474gb66Sknd InC25N4r3IwBg2kCrWJY8lHQZxC6zFnzMSnRiRCI35zp8rhj+I6extk9VMW6/OJ2KJA1 aEq2+3DHpVZShz+FsHqm/J21h8MX+vFwKeyBYtwVrvJcFdCTQU+uOFkioUaK00wv+toU tjkrxkNdYgPps/ot5vHU4450dnTANLcwhOW3PliNdp7BGJDPpZgVm+8Rl8rMah31aE3Y GCmSb5weoF+APmKQrtBBqJwKdGGXP2L19x4Pa16O3jP4UjtaVX3NrjmzNrkR/hB5R4Ac ebdQ== 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=iXNvJfwoFXjoedd+rIU82AzsOF5uSt1XX7b7Rm6b1QI+XhF1nQgjaflovvsULRZG+3 ishB1QTfcAMtoeFt3qbDUoLPx9l18aCHR8Wf1PH2tie5JlBEh5jGg+CDjGrF0wK8n9mx 8i2MNU5kVcdNqoKl8XG8Ww1DzYeWLhIFtFlhiZva6BM2ovcdbPDRqtIyHMOElXizwy+o xdohC6Ngo5lTccx0Y7xdnODrQAlYUEC//Y++nXceoX6aHxjhStEhrT8Y45YSPQtZGMu3 R1Ul772LhD/e8BQuFTbUpi9GEjLDeknWpGuXEgwMuMsp+ZCrnCXk0/DEwrmQ71f20udl fr5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="M/AD+I7v"; 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 u4si11697356plc.106.2021.03.08.05.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 05:33:18 -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="M/AD+I7v"; 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 4D9E56E3D3; Mon, 8 Mar 2021 13:33:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by gabe.freedesktop.org (Postfix) with ESMTPS id C27526E3D3 for ; Mon, 8 Mar 2021 13:33:10 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id e23so6058335wmh.3 for ; Mon, 08 Mar 2021 05:33:10 -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=M/AD+I7vDYIzgXiPb3lGfvD8fpS3TPgKXz/BSkCm+skoOnnl/gAtfI1w4j+QJsWeFl ePthrlbIuh1GdQT/WEhUZODbL3oaBbUcItYBvmMNxcx2U/xnwJ0ssS9zDlLI6XCdK2iS Xtu2+cSnY83dPBhyU02NiIxl7LffDP3pqfxmBmBf0tPEWRca4ZXonoE/eC+gVZ21axiP TpxTmVLhB9rbiHstnBOxXTi1J+7o9JtBNnpIyGJINsD14apy1O7HWiBb4ZlzMvCHS9kw 6Ex1kW75fTtzaOND2JUJYKL84jVK1THIDMTkWHfXgkrmA3swY24Ldfp3hkVO/dOPyYiU U7Yw== 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=aeS7zrTCxJTKTl75CzXwoWv8wfFaaj6Ao7GC5S26F5Hs10NUozxR7B1pQek6AeMF6u FjTNVX0KU3iih7jcLXt4KuS1cS0b9Lm4zRSBNw0howsw5nN1JfBqA3lf2zgA/fNtHnJN avviCAMDvRypRbseebcQjZMRN8xsU/hx+L4t8/qYpacMvfUfezuvlFyw9qzve+ruFMws P6S9a8bH8SXiQfXDkXbYi4p6QcQIcyJzWK6Rd3cndjj5h0Cfh4d7WeE1+Toz3WRQFZwR hnChMJIFir/fSRI+fS2elMWHMUG+g5+KYe57uC9zUAGZvaqEYGuvxyby6sSIQ5klQIzB 3KQA== X-Gm-Message-State: AOAM533s6K9nYNNott8DFAFIf7yPdc+ssTlbqhJvPtZNhx3Eaht+UURZ mTV9r+5V8NhYHqmda9TWdq0kNw== X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr14186060wml.147.1615210389361; Mon, 08 Mar 2021 05:33:09 -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 m11sm18942665wrz.40.2021.03.08.05.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 05:33:09 -0800 (PST) From: Daniel Lezcano To: cwchoi00@gmail.com Subject: [PATCH v6 4/4] PM / devfreq: lima: Use devfreq cooling device registration Date: Mon, 8 Mar 2021 14:30:40 +0100 Message-Id: <20210308133041.10516-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308133041.10516-1-daniel.lezcano@linaro.org> References: <20210308133041.10516-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;