From patchwork Thu Oct 3 13:30:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 13821040 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A389ECF34A9 for ; Thu, 3 Oct 2024 13:31:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05F6110E0BA; Thu, 3 Oct 2024 13:31:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="HjbGyVF8"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id A379610E0BA for ; Thu, 3 Oct 2024 13:31:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1727962252; cv=none; d=zohomail.com; s=zohoarc; b=U2PwFjUvF1MrjQeDpe5NtTQrzvJaB+roYvoJnJK9vqI0Y0vBNIqxpaxuC/+dCMemBBVtXrQB5cq/s2kLpL+DO0sm7vQXPxF8l1yk9FCafF4jg7bf2OTk5RneE5o62qej3wpfd+wta4GSHX232/vvPO00CZwNzqbIV/sN7iaGXuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727962252; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=d6UuXdqkeRkP/vowaYIwAQPyT6dc3CyA0URjr+Pa01I=; b=b9zU+zLWLPl6dg12y+D5F/8X2ok8uplSPfoKyS+i5waHzo36cTU/Jq8uT/inGw52BbyZB7uFqEIiPUxfzYF6LXYhzfpOWGuKXQERqZiKF2EFUtAlyfk2rPEYcYRxnwuiWpXu3hecM571JQFEpqvBssmnbTA+l5i3TI++MEc614I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1727962252; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=d6UuXdqkeRkP/vowaYIwAQPyT6dc3CyA0URjr+Pa01I=; b=HjbGyVF8jO/YWIsqj5jldq+KRiPyzFtwDbf6rWUZahLEmzOTBASaHMKa47mrMO8o GvuExp4YcQlGFhIuwl6dF6nr+9FUXVgavjjJ6u+zxNYfHpUSqscI2QPZKwmA0NUaYBe +huZzclPNQQw71EbBGH/VhhDdPXKInFozVBRISJE= Received: by mx.zohomail.com with SMTPS id 1727962249782554.8900083809897; Thu, 3 Oct 2024 06:30:49 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , =?utf-8?q?Adri=C3=A1n_Larumbe?= , AngeloGioacchino Del Regno Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] drm/panfrost: Add missing OPP table refcnt decremental Date: Thu, 3 Oct 2024 14:30:28 +0100 Message-ID: <20241003133037.3398144-1-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Commit f11b0417eec2 ("drm/panfrost: Add fdinfo support GPU load metrics") retrieves the OPP for the maximum device clock frequency, but forgets to keep the reference count balanced by putting the returned OPP object. This eventually leads to an OPP core warning when removing the device. Fix it by putting OPP objects as many times as they're retrieved. That includes putting the OPP object in case setting it fails. Also remove an unnecessary whitespace. Signed-off-by: Adrián Larumbe Fixes: f11b0417eec2 ("drm/panfrost: Add fdinfo support GPU load metrics") Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index 2d30da38c2c3..4b8840a41779 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -38,7 +38,7 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, return PTR_ERR(opp); dev_pm_opp_put(opp); - err = dev_pm_opp_set_rate(dev, *freq); + err = dev_pm_opp_set_rate(dev, *freq); if (!err) ptdev->pfdevfreq.current_frequency = *freq; @@ -184,9 +184,12 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) ret = dev_pm_opp_set_opp(dev, opp); if (ret) { DRM_DEV_ERROR(dev, "Couldn't set recommended OPP\n"); + dev_pm_opp_put(opp); return ret; } + dev_pm_opp_put(opp); + /* Find the fastest defined rate */ opp = dev_pm_opp_find_freq_floor(dev, &freq); if (IS_ERR(opp)) From patchwork Thu Oct 3 13:30:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 13821041 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A7AFDCF34AD for ; Thu, 3 Oct 2024 13:31:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 148B410E242; Thu, 3 Oct 2024 13:31:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="fKX8rtSx"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id F085A10E242 for ; Thu, 3 Oct 2024 13:31:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1727962254; cv=none; d=zohomail.com; s=zohoarc; b=RtCuQjkb4ImmOrs9F5OU9PpeLiqS0rm9TzjibjiQRWR0ZkSLSXQbgqr4DihjV4A9+6Ca/bDniTKkW/C7bbabNTVmP0kp90CYzYrdM/RT3nyxOON62FQpEx4Oe93LPX39Omqk9IAakCLTwGOjZLQtpRo1CG95HItq6Z4XhWV/1Ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727962254; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=u3hkyLMMRDkXtwRu8SNsIhsLIlGy1TJE8XWYuhk2/yA=; b=MFUGGHRxojnhQcdB93EfDl4j1/8X1IibIlgkfdsT7s4UM/T8eC+HgOCydlNQsxTCI++tgBumbQYpB4IzgfVA2Prfa94Pl6adsmfiJZobOTthRauVP52AnL58NGMW4Y6wrYWkbr3iaytMM7FYKiXwOO3nuqGhetPflMi8n1pwFfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1727962254; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=u3hkyLMMRDkXtwRu8SNsIhsLIlGy1TJE8XWYuhk2/yA=; b=fKX8rtSxSyVJ1u69UoRXm/uTNy9DM9czkjbHjwQS3cP38vY1dar28o+3vsxyjPIT /YuCBUpZiMAWEWB8C7UXmQDRfXiphxt6kWJjuSfC5TAtNC4l+r2kYLDgeVUJFwiNPzk dM83FBK4TGPUvoSsr3hvTVebn0ycTF1CbGMLSqOc= Received: by mx.zohomail.com with SMTPS id 1727962253296545.6382302905259; Thu, 3 Oct 2024 06:30:53 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , =?utf-8?q?Adri=C3=A1n_Larumbe?= , AngeloGioacchino Del Regno , Liviu Dudau , =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= , Heiko Stuebner , Grant Likely Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] drm/panthor: Fix OPP refcnt leaks in devfreq initialisation Date: Thu, 3 Oct 2024 14:30:29 +0100 Message-ID: <20241003133037.3398144-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241003133037.3398144-1-adrian.larumbe@collabora.com> References: <20241003133037.3398144-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Make sure in case of errors between the first fetch of an OPP in panthor_devfreq_init and its successive put, the error path decrements its reference count to avoid OPP object leaks when removing the device. Signed-off-by: Adrián Larumbe Fixes: fac9b22df4b1 ("drm/panthor: Add the devfreq logical block") Reviewed-by: Steven Price --- drivers/gpu/drm/panthor/panthor_devfreq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_devfreq.c b/drivers/gpu/drm/panthor/panthor_devfreq.c index 9d0f891b9b53..ce0ac4563f65 100644 --- a/drivers/gpu/drm/panthor/panthor_devfreq.c +++ b/drivers/gpu/drm/panthor/panthor_devfreq.c @@ -197,7 +197,7 @@ int panthor_devfreq_init(struct panthor_device *ptdev) if (ret && ret != -ENODEV) { if (ret != -EPROBE_DEFER) DRM_DEV_ERROR(dev, "Couldn't retrieve/enable sram supply\n"); - return ret; + goto opp_err; } /* @@ -207,7 +207,7 @@ int panthor_devfreq_init(struct panthor_device *ptdev) ret = dev_pm_opp_set_opp(dev, opp); if (ret) { DRM_DEV_ERROR(dev, "Couldn't set recommended OPP\n"); - return ret; + goto opp_err; } dev_pm_opp_put(opp); @@ -242,6 +242,10 @@ int panthor_devfreq_init(struct panthor_device *ptdev) DRM_DEV_INFO(dev, "Failed to register cooling device\n"); return 0; + +opp_err: + dev_pm_opp_put(opp); + return ret; } int panthor_devfreq_resume(struct panthor_device *ptdev)