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)