From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 80D313D9028 for ; Mon, 11 May 2026 13:01:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778504483; cv=none; b=lwpuYGXfNpzfxH6uiPEbccsEPeXzIpgKjxxmEIjAK5pczRCSxFv9kPM1XWRxSODE9FwYUssR9WOUhkpqa+RwQZR/1o/R2pE7O2/dfU1X4AXeuyeZEjiFcp3VQoOjnVsIYHRH2tjPeqHgV1e+tDekfjwhoHHlSlU9wh+hSmslHoA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778504483; c=relaxed/simple; bh=KUeO+uGXifPyNRMjTlRkpbk+v6P6X9ZXisv7FWZ67XQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rDhq2o2EA32KFs8pycXxwA/dDaBnaHoJ7Ym63L2X0kwcPJQkYcvwjvCtWctYonw0u/UWZVweisJqyU9SS6q+6iFg1PaewBfMe4W+PLTD3SlT53+EoVGEQbibmkCfLO1fKbybmnejSKuDerZM8Pg7XxuXAcMvn2z/VPF0Th8BKI4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Q5KoTjLh; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BRgFBn51; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Q5KoTjLh"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BRgFBn51" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64B7FJhP3332677 for ; Mon, 11 May 2026 13:01:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Tj+4RQOx8Hh IQqlvFHx13oj7kr9BKUs7jNTjZUXWM+M=; b=Q5KoTjLhhRgbeGMrCor9mM7UPYi RbwFgbjS7UUZbv3un9v6zN/dszO8FD0/zXG/u8JdM1i35aDsAoYzXaTCBUlWDsY9 OQ0Q0pgdGyfBDEUjG1xhz/z2rGy//LzKeUkEnNPtbBYYH2K2lYMMZeVeIKiGK/vL eVE2CYJjryU0ywjz/S48/1n/QYT9ASKH8OcgqXr9TbW1LCw75Jz0par2w14fNkkx qa3bgzJmHdYRm7k9N7M9G9JOkLnqoEAxFoAiwgX5ZMv9L+FJAmRkDz5n8YxjC7Iw oiOQjDX+ABFxbtZf1Z0A9i0wDeKiy7gVIMTDynACj8muvKwfSiKzcTvCVIg== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e3ajgs7ed-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 11 May 2026 13:01:19 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c797d8c9c2dso5158197a12.2 for ; Mon, 11 May 2026 06:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778504478; x=1779109278; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tj+4RQOx8HhIQqlvFHx13oj7kr9BKUs7jNTjZUXWM+M=; b=BRgFBn51ckqilGskc3tOJokstvUK8h9LSyD8a/jN2R3msH49//Yq/IzXm5YwORadX4 DoYWEBrmINmOlCizI6DqYG/qQwI8Kka0kpUe+ct7gci6XR0LqNMN/iES6ANtZBHZu/hy IUD126oCtqtgjXJnedoggpPhhsSL1DXF0v+33wcrzfW6PknbYMQ9mVCbHUaL5v6RK4zu HY6HkUrJsnjJ4ZwSx/sHBGeQ3JN8qLIdJxX1s68jsh4BnxLaFdCdJf4eVu5JfNNnKhjF pr14gSCt84EVZk8KIH2wuAsIj38nnstKrF8TCpnPsW93DpvQ3odZ9+v8ABy/uv5rbKzD m42g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778504478; x=1779109278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Tj+4RQOx8HhIQqlvFHx13oj7kr9BKUs7jNTjZUXWM+M=; b=lk7UiKalZlCxo7SJC7UeQfC9xu7KUKIGxuEZk+HlN0q1BU6jqBrMnm61sY783UZ8Ze QzRtUe3hXRPR1VjWlvtpIwDNeIuC0nP6ZTfd3zEztDDAlbykismRtsTlXg4lVyiGMV7N TDtMydSORJEkduF/o9OXsq+2rhpMVmOJ1FM5zx58Kh5x/mFp+foYgueAOla9slanv33K GkmqoiXO0LzKd8b+pCwJg2qdzD2Jr6Jvd3TtJS6ygvxQSLMLGQjqxddu+//NtklaY/ca Hn9mlCziOm+jzJcou+bZDM+PwYg8NEA8DDHCj64t+xsQGo0pbMEliufwqOdFSSzY6Ezt yJow== X-Gm-Message-State: AOJu0Yxrd1HOg2+0w3xNipVYBltA9n+9nN2r/bDUJIJOwfpLu47+g5DO rowBA+7KsFYh1dltKotbdTK1AajcmA4ZGX9p+e8qXAyt7VYJlk4BmJL/k3MTM49uzPbY8FD5Gx/ q6M8a6ZCRxddH4UY2cAOZtGwRj2IHZqwui1GDd4kfHRRbBTiEIEgvjGQLRKMGYuypRsXd X-Gm-Gg: Acq92OE4Tu9GxNVOh5NwUwTeDhGvOMUVswangyhOMfCq/lZO0OQB2R+1SGM/6P5nPvJ FkmpHJn8g+C1Ct8zrwCxpslKCKz2hz5MMs3s0+TVu6m3q8RCF2H/x2ncRnoLqsA6w0zZRKUZ64r Bj2JGcb+fAurhtLtkGDSEO7RDls+QPfxkBWjIvG0un0ajWHfT02UiF3ssLpWSbkHPKC0fFEH3j5 Ba0gqJof5FFagGB7242sPTzERLglJyEwTHc9nOboG5I3wRQcnqd5WERJLAfpOPOKPjqA4WSSmhA VszZSb8J4hx8oWMHzQNBgOaAQWTnOXA4Zwb3Me6jf/vAB75+j+7KJdhkcozouNZ9VWWZx1Alsj6 EnbhhBhXBiWwyyD42JAImXYLgy+bA8Y/9 X-Received: by 2002:a05:6a00:419b:b0:82c:21a9:872c with SMTP id d2e1a72fcca58-83a5b6d0b1dmr22868391b3a.7.1778504477717; Mon, 11 May 2026 06:01:17 -0700 (PDT) X-Received: by 2002:a05:6a00:419b:b0:82c:21a9:872c with SMTP id d2e1a72fcca58-83a5b6d0b1dmr22868332b3a.7.1778504477007; Mon, 11 May 2026 06:01:17 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83965945101sm19842593b3a.13.2026.05.11.06.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 06:01:15 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Akhil P Oommen , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 07/16] drm/msm: Add sysprof accessors Date: Mon, 11 May 2026 05:59:20 -0700 Message-ID: <20260511130017.96867-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260511130017.96867-1-robin.clark@oss.qualcomm.com> References: <20260511130017.96867-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=GfgnWwXL c=1 sm=1 tr=0 ts=6a01d31f cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=v4b4B-quZFKF0PxyZCUA:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-GUID: d4uClU_p9IAU-cskzXsyeg-V0hHcIRq- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE0NCBTYWx0ZWRfXyt2DfuUADJkv 2FTznfwUAyTGshJXm9mcdfXhhNfup1fqT46I49fjH9ynyiesO3ZLBKakH9DAjnDDthChWfmNM7N jyIrzEeBkXw54RwAChNpp03Dn64xIQ8wFPVcSZW2tcRwcc+Nq283G6NvlhDcPjLoTIOLfejoVAB i4Ly8JAMNECcz8VJ86+p7r9xC6TvECxrQBwj7KsZXylZJCtTbr32FNaaX0Nf0qe3jGRwhceW2M+ Q36D15tlfTXdq5/pKi8VcbBP8/CSgIPdXXZyzj+zaFFgfC6HUlWT9qEDz6eAYmDvT/EVdgaDnPt AtKGzE5RDGrXGmDXwgeyLIUJ06vqDpB9vBkM88SPJxHGh1+l2dqV95MM8lhmYMP82tDWoEtDw0T FueCYHD2gYFfpAnGQzcNM42YePe5XBf4ijkoMVXXR3Wmvg2WGxJiSqLvyWhmcmeARjMKeiSL3wA bNBAeIpzhEwEtNWwZ+w== X-Proofpoint-ORIG-GUID: d4uClU_p9IAU-cskzXsyeg-V0hHcIRq- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_03,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 impostorscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110144 Currently the sysprof param serves two functions, (a) disabling perfcntr clearing on context switch/preemption, and (b) disabling IFPC. In the future, with kernel side global perfcntr collection/stream, the decision about disabling IFPC will change. To prepare for this, split out two helpers/accessors for the two different cases. For now, they are the same thing, but this will change. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 +++----- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 +++-- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_preempt.c | 2 +- drivers/gpu/drm/msm/msm_gpu.h | 18 ++++++++++++++++++ 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 1b44b9e21ad8..aba08fb76249 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -2036,10 +2036,10 @@ static int a6xx_gmu_get_irq(struct a6xx_gmu *gmu, struct platform_device *pdev, void a6xx_gmu_sysprof_setup(struct msm_gpu *gpu) { + bool sysprof = msm_gpu_sysprof_no_ifpc(gpu); struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu); struct a6xx_gmu *gmu = &a6xx_gpu->gmu; - unsigned int sysprof_active; /* Nothing to do if GPU is suspended. We will handle this during GMU resume */ if (!pm_runtime_get_if_active(&gpu->pdev->dev)) @@ -2047,15 +2047,13 @@ void a6xx_gmu_sysprof_setup(struct msm_gpu *gpu) mutex_lock(&gmu->lock); - sysprof_active = refcount_read(&gpu->sysprof_active); - /* * 'Perfcounter select' register values are lost during IFPC collapse. To avoid that, * use the currently unused perfcounter oob vote to block IFPC when sysprof is active */ - if ((sysprof_active > 1) && !test_and_set_bit(GMU_STATUS_OOB_PERF_SET, &gmu->status)) + if (sysprof && !test_and_set_bit(GMU_STATUS_OOB_PERF_SET, &gmu->status)) a6xx_gmu_set_oob(gmu, GMU_OOB_PERFCOUNTER_SET); - else if ((sysprof_active == 1) && test_and_clear_bit(GMU_STATUS_OOB_PERF_SET, &gmu->status)) + else if (!sysprof && test_and_clear_bit(GMU_STATUS_OOB_PERF_SET, &gmu->status)) a6xx_gmu_clear_oob(gmu, GMU_OOB_PERFCOUNTER_SET); mutex_unlock(&gmu->lock); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 727281fbef36..71f54ab5425d 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -203,7 +203,7 @@ static void get_stats_counter(struct msm_ringbuffer *ring, u32 counter, static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu, struct msm_ringbuffer *ring, struct msm_gem_submit *submit) { - bool sysprof = refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1; + bool sysprof = msm_gpu_sysprof_no_perfcntr_zap(&a6xx_gpu->base.base); struct msm_context *ctx = submit->queue->ctx; struct drm_gpuvm *vm = msm_context_vm(submit->dev, ctx); struct adreno_gpu *adreno_gpu = &a6xx_gpu->base; @@ -1608,7 +1608,7 @@ static int hw_init(struct msm_gpu *gpu) a6xx_gmu_clear_oob(&a6xx_gpu->gmu, GMU_OOB_BOOT_SLUMBER); } - if (!ret && (refcount_read(&gpu->sysprof_active) > 1)) { + if (!ret && msm_gpu_sysprof_no_ifpc(gpu)) { ret = a6xx_gmu_set_oob(gmu, GMU_OOB_PERFCOUNTER_SET); if (!ret) set_bit(GMU_STATUS_OOB_PERF_SET, &gmu->status); @@ -2854,6 +2854,7 @@ const struct adreno_gpu_funcs a8xx_gpu_funcs = { .create_private_vm = a6xx_create_private_vm, .get_rptr = a6xx_get_rptr, .progress = a8xx_progress, + .sysprof_setup = a6xx_gmu_sysprof_setup, }, .init = a6xx_gpu_init, .get_timestamp = a8xx_gmu_get_timestamp, diff --git a/drivers/gpu/drm/msm/adreno/a6xx_preempt.c b/drivers/gpu/drm/msm/adreno/a6xx_preempt.c index df4cbf42e9a4..1e599d4ddea1 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_preempt.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_preempt.c @@ -261,7 +261,7 @@ void a6xx_preempt_trigger(struct msm_gpu *gpu) mod_timer(&a6xx_gpu->preempt_timer, jiffies + msecs_to_jiffies(10000)); /* Enable or disable postamble as needed */ - sysprof = refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1; + sysprof = msm_gpu_sysprof_no_perfcntr_zap(gpu); if (!sysprof && !a6xx_gpu->postamble_enabled) preempt_prepare_postamble(a6xx_gpu); diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c index ccfccc45133f..e022c9a162a4 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -849,7 +849,7 @@ static int hw_init(struct msm_gpu *gpu) */ a6xx_gmu_clear_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); - if (!ret && (refcount_read(&gpu->sysprof_active) > 1)) { + if (!ret && msm_gpu_sysprof_no_perfcntr_zap(gpu)) { ret = a6xx_gmu_set_oob(gmu, GMU_OOB_PERFCOUNTER_SET); if (!ret) set_bit(GMU_STATUS_OOB_PERF_SET, &gmu->status); diff --git a/drivers/gpu/drm/msm/adreno/a8xx_preempt.c b/drivers/gpu/drm/msm/adreno/a8xx_preempt.c index 3d8c33ba722e..6cb53a071801 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_preempt.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_preempt.c @@ -242,7 +242,7 @@ void a8xx_preempt_trigger(struct msm_gpu *gpu) mod_timer(&a6xx_gpu->preempt_timer, jiffies + msecs_to_jiffies(10000)); /* Enable or disable postamble as needed */ - sysprof = refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1; + sysprof = msm_gpu_sysprof_no_perfcntr_zap(gpu); if (!sysprof && !a6xx_gpu->postamble_enabled) preempt_prepare_postamble(a6xx_gpu); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 8c08dc065372..9e5c753437c2 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -311,6 +311,24 @@ static inline bool msm_gpu_active(struct msm_gpu *gpu) return false; } +static inline bool +msm_gpu_sysprof_no_perfcntr_zap(struct msm_gpu *gpu) +{ + return refcount_read(&gpu->sysprof_active) > 1; +} + +static inline bool +msm_gpu_sysprof_no_ifpc(struct msm_gpu *gpu) +{ + /* + * For now, this is the same condition as disabling perfcntr clears + * on context switch. But once kernel perfcntr IFPC support is in + * place, we will only need to disable IFPC for legacy userspace + * setting SYSPROF param. + */ + return msm_gpu_sysprof_no_perfcntr_zap(gpu); +} + /* * The number of priority levels provided by drm gpu scheduler. The * DRM_SCHED_PRIORITY_KERNEL priority level is treated specially in some -- 2.54.0