From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o11.zoho.com (sender4-op-o11.zoho.com [136.143.188.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2576C4C9561 for ; Thu, 4 Jun 2026 17:36:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.11 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780594596; cv=pass; b=KlJqNt5SzV6Ld2n+8Dvp2dfwi1NIFNMWO/qhAS5u56eJWK1bH0Rkqwdnw9fsQy9dfZ5LRehm3OUxxQ7rzrZx+TKmiwmCxjiZWKR+fQ5TSvRGeCDicmd5T8VvOrbdF6gTrrr6rSbI88+AVaszo4nCznD/h+G56cjRIaBFNSAo7pQ= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780594596; c=relaxed/simple; bh=jDTN3KPXW5GgyiXtSuso4KxYEzTJHTIqTdytBXUJh3s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O20N3WBgu5IoRnIN8Y4Fthq/c8PWXC3m46We0u0jdDmz7At+yvVxYoVYKY8vN6Zq1R/RqWYg2ZBZNs+QUudk5dPdudoUV3f9knVwcK16KZyGdoc3QJyyFvt2n9yOXZ8DrxF4lsIFzbzOEmbekKrdnznluIP+LJhqC66dYx7NwuU= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=R6yTnxE8; arc=pass smtp.client-ip=136.143.188.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="R6yTnxE8" ARC-Seal: i=1; a=rsa-sha256; t=1780594578; cv=none; d=zohomail.com; s=zohoarc; b=WGmmvKISPfzhj81F5E5sGRS7BmM+pRzy00R4A6NQ+5BtxWuIeV+ByUNeXP5hLvO3hHujLwKS+cxDM2mU7c0UwtmPNpwDNYA9pVtbKZxC9HTiFLOD9u2QHSbpwC75woD4prJSS1XCkYtEH4cSHmutK/G0+MnlFNN1w13f4FbeU3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780594578; 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=4u+t/C8H9x/aY+ZDOhqE29VEMGRhkLvLihuswVI+BME=; b=HFiA2l3VE8M8Wya3ki+VIGYGMWILqllMAhPz+udGwNMX9DytFUq09f1SOIrSduXu0VPG87cJ71gmJA0TbhNKPYZmbv7Vsr/fdAJmEklUe5U7rI30TF2kt6qfRj4F1qESQCCEJotwvTX+zZvks0KRIzdjiviXSb+xyv9D3Yjcdn8= 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=1780594578; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=4u+t/C8H9x/aY+ZDOhqE29VEMGRhkLvLihuswVI+BME=; b=R6yTnxE8Y7L8U/D9YiYuMEZNFCTcVV2k1HCp+NqceE/JWz2haXYuU10UjimEs9pn 4Vgj+UJ/RA4YkyGAQi33f9z8aR/lF7m6ocmXs2UxMUVrLJUMkWkjly/F/AUiDccdT9G A7FSx3Z3EYDbiz0S4Adj+4WuPBp2lMweBKAIKksc= Received: by mx.zohomail.com with SMTPS id 1780594577655702.1261648486782; Thu, 4 Jun 2026 10:36:17 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= Date: Thu, 04 Jun 2026 18:35:23 +0100 Subject: [PATCH v2 4/7] drm/panfrost: Move perfcnt GPU disable sequence into a helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260604-claude-fixes-v2-4-57c6bd4c1655@collabora.com> References: <20260604-claude-fixes-v2-0-57c6bd4c1655@collabora.com> In-Reply-To: <20260604-claude-fixes-v2-0-57c6bd4c1655@collabora.com> To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Faith Ekstrand , "Marty E. Plummer" , Tomeu Vizoso , Eric Anholt , Alyssa Rosenzweig , Robin Murphy Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Collabora Kernel Team , =?utf-8?q?Adri=C3=A1n_Larumbe?= , Neil Armstrong X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2667; i=adrian.larumbe@collabora.com; h=from:subject:message-id; bh=jDTN3KPXW5GgyiXtSuso4KxYEzTJHTIqTdytBXUJh3s=; b=owEB7QES/pANAwAKAQ4mfkzuU0M9AcsmYgBqIbd8wDXgYJGEsn0JD+YxBWGWWzOze1DVPwGjD ctxIwj10qSJAbMEAAEKAB0WIQQyQDDowAUXXfk3B6QOJn5M7lNDPQUCaiG3fAAKCRAOJn5M7lND PTSDC/9sL6DxcKKPZnVI7pgw7rhShwg0i2M3gc4N7vY3iq+ZyJHC7sViGiCyNXYRSHTBNU+VmSF 9iTRHNxXkELTlE/hLo4icEPUSCSGjOO0kAjSRLjwLb03U98+qXVkLtKoKLcUA3+9JWZctCBy6h4 iLPq1DJ2bLNOGFWBJ9W9PEqOC2kyYxwR0+1FEs6BMrIM7INYd/S26K9l3MjGOZCRz7dMGEj4kqT tDL40MTEJ+tDBzfkzFjYLyFUqJ3yWnjWJGngeCPlMIuelGM7OW1AxDT+m3VQiS3eO8weLYUWVcn OWTxgk3AIiihvjELX1KTVME+s0uGZ1XoYpo19jAGMkILDKvCSgtxcwHLlp+m1OvyGzIq7LGrXNI SiZ7xbYC73iZjOWxgVoMHy2Z78Xkfgm+eMlBhwaU4nEOd/VuEnhvUwlOuvnOR21g3ThapuwG/DV eclFRe+J38f1bX6LMAiN6bUZbnToKt0YCJrbzT6uZpi416OLYHM4k7FG3/oAWWy/D1dWI= X-Developer-Key: i=adrian.larumbe@collabora.com; a=openpgp; fpr=324030E8C005175DF93707A40E267E4CEE53433D Just for the sake of avoiding repetition. Signed-off-by: Adrián Larumbe --- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 31 ++++++++++++----------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c index 7020c0192e18..ad1156678e91 100644 --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c @@ -35,6 +35,16 @@ struct panfrost_perfcnt { struct completion dump_comp; }; +static void panfrost_perfcnt_gpu_disable(struct panfrost_device *pfdev) +{ + gpu_write(pfdev, GPU_PERFCNT_CFG, + GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); + gpu_write(pfdev, GPU_PRFCNT_JM_EN, 0x0); + gpu_write(pfdev, GPU_PRFCNT_SHADER_EN, 0x0); + gpu_write(pfdev, GPU_PRFCNT_MMU_L2_EN, 0x0); + gpu_write(pfdev, GPU_PRFCNT_TILER_EN, 0); +} + void panfrost_perfcnt_clean_cache_done(struct panfrost_device *pfdev) { complete(&pfdev->perfcnt->dump_comp); @@ -193,12 +203,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev, if (user != perfcnt->user) return -EINVAL; - gpu_write(pfdev, GPU_PRFCNT_JM_EN, 0x0); - gpu_write(pfdev, GPU_PRFCNT_SHADER_EN, 0x0); - gpu_write(pfdev, GPU_PRFCNT_MMU_L2_EN, 0x0); - gpu_write(pfdev, GPU_PRFCNT_TILER_EN, 0); - gpu_write(pfdev, GPU_PERFCNT_CFG, - GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); + panfrost_perfcnt_gpu_disable(pfdev); perfcnt->user = NULL; drm_gem_vunmap(&perfcnt->mapping->obj->base.base, &map); @@ -327,12 +332,7 @@ int panfrost_perfcnt_init(struct panfrost_device *pfdev) perfcnt->bosize = size; /* Start with everything disabled. */ - gpu_write(pfdev, GPU_PERFCNT_CFG, - GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); - gpu_write(pfdev, GPU_PRFCNT_JM_EN, 0); - gpu_write(pfdev, GPU_PRFCNT_SHADER_EN, 0); - gpu_write(pfdev, GPU_PRFCNT_MMU_L2_EN, 0); - gpu_write(pfdev, GPU_PRFCNT_TILER_EN, 0); + panfrost_perfcnt_gpu_disable(pfdev); init_completion(&perfcnt->dump_comp); mutex_init(&perfcnt->lock); @@ -344,10 +344,5 @@ int panfrost_perfcnt_init(struct panfrost_device *pfdev) void panfrost_perfcnt_fini(struct panfrost_device *pfdev) { /* Disable everything before leaving. */ - gpu_write(pfdev, GPU_PERFCNT_CFG, - GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); - gpu_write(pfdev, GPU_PRFCNT_JM_EN, 0); - gpu_write(pfdev, GPU_PRFCNT_SHADER_EN, 0); - gpu_write(pfdev, GPU_PRFCNT_MMU_L2_EN, 0); - gpu_write(pfdev, GPU_PRFCNT_TILER_EN, 0); + panfrost_perfcnt_gpu_disable(pfdev); } -- 2.53.0