From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 9C7732EACEF for ; Wed, 6 May 2026 17:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778087529; cv=none; b=nqbRunDSXGFmNQ+0NErLXC79E9P3bWZsZ9KXWU1rV94xFSQV8UeTUr45X4IPTaFFKH/QZxMgK8QvF7shKafg+NNcn2fmAHRPFHGhIBC/mgEXHm+CA9PWhvhaY5CTHEoXJ7+LNSrk1qvyeMYsofrwCZJ5OqIYIbOsAtDEpICS9/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778087529; c=relaxed/simple; bh=KUeO+uGXifPyNRMjTlRkpbk+v6P6X9ZXisv7FWZ67XQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HO7HxCbm6jerLJF0Bl4mKJLIzAEH9sl/OZU1rEyNFhJdg9bwUC/JEcZVAIbzxF4aUZclQMHZOHG8zNfji2J90EeC6sNPZCg3wU3QmaeU5aKnaDk1zETBy7BGMWRQJ8DCTHZ3uOmraWEdt+6WfXkoqlzuIyN4SsNoyr532I39Uuc= 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=In1xrwij; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=kS2mC9pY; arc=none smtp.client-ip=205.220.168.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="In1xrwij"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="kS2mC9pY" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 646C5ahC1514835 for ; Wed, 6 May 2026 17:12:01 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=In1xrwij0vcHLFzpYoA3OMmh7Jp aawq0ks/4Sh0iPx8b6z1nPNua5KTtAm9J2Pm95lVYOqhnBJ0ryF3oE86v9XO/i6o 9PLVbXr19XBbD66PPTsR+S4gLefXzi/WvDxWYic4ahbryrAazbuXM5IC7gMUvd3/ Fzw3RJEL+Vb5n3B3KDmxY5/q16pc5Pz0sQebqb0E2cKZdg3mcp3ttPE4aEOrmHd/ kZpCnA4SYmpj9CxC0gi4sV23hbA07nN+w8wVmx/yGPRyzzCPIerssKV3DXjemAAR lmrUg5wBhi3dbYhK3MZxcyyNoft8pijHB1rvTXgNPp7aDezIcZOtB9peQqg== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e00v1tfmv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 06 May 2026 17:12:01 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-82f85179263so7385250b3a.3 for ; Wed, 06 May 2026 10:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778087520; x=1778692320; 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=kS2mC9pY3x0RGIj3Hwi4AcE2hGVRAyfvnChCEtW7Q4q8TerD7oe1U8H4aP/Dh0w0f7 Gok++9sC+/0aPijBy9SFgNE618dCSVeHxbX8PaVNCLk0uyWzeNmwE1rpkKLNc+wqJ2bM Loi99qmpdSE5HkAdtWcqC+4g1dr7Yzi1pagmtYHF5sGpV0x0QrGuSPCMmKBHJ4cU6VMX LKP8vMpNcv+ChR4ObmliyTQezkDdywln7NpTij4D0XXxYksiNAJwg6hA8Y4JXyrhBcaA ADOZzTlbSXoV8FfdSo2lOJ7pUTrxAwFQk43p6i9sZeEu21BXOj5hvXOdK4nBgUfGNlAd 2hEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778087520; x=1778692320; 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=C5nywH5vqJcalTuFG/HUCt7bISQjVfiFQWeP6edScnNrT0/sABLxCOCvDZotKi6ZT5 W8mQYquDdKJxn/VT9X9L6AdfptHikIxWlErL45dxGeF06744AHbwpJzGwCjmvOGVmCgg sE9tFzKDYfRDZF9IPM8NBtFJ94zFIEsv3RuNxxcJ96/gHjBvWLdZTLZyGgXq95xhzY/c ZBDgW5u5+AVhnXV+I3niRr0CMGastB6sAAiNVx4HPdXhV7MhHYImBLn7Djg6ThQR3/Ne pCv7pQJo9V/jWsaZlUPirihnQQiLczPs9GeHpytb2VpLLWShfT+p1P3PdKLL3hxHbJPK wWfA== X-Forwarded-Encrypted: i=1; AFNElJ+nwZHw+CXfQTaZouM/job5QdS1eVuNmyEGn9tGzGL4XFjstVuW+q3J2DTBo00Yjj80kQzmWUn2aCwMDRw=@vger.kernel.org X-Gm-Message-State: AOJu0YyPxyDzMqqriIqRE/9FkEHRuurmevB9J2u6XUfdXJnh4L409upc TNHNjVSQ+fFTLk4ttcxEdmi2avrftl5qFQPgclZulWcdex67idtwDIhh0TGLfy2PiNXzejAEJAR 4NakQ+xMwLYy7Wu+7VEPIHMaWZKkulhfQ9EheH2W4Goi+/YHUnQZuPUdMvMPwftVAoHM= X-Gm-Gg: AeBDiev8XeK9qa2X3Xc5d5EUizbw7cvm8ALYEZnVfFQO3pu6NWrwb33PblZ9XUtuuZY xx+pURbpjxm9IFHj6vvl8PphKwMAyQJboCyEmQRVqpEyCF0z0ThdXAiZhtVvrD0mTA4dF0IEzWj GdlB5sgMO+D+WF1eliY4UxSDqY0myQOmrsBQ/szh2tuBVZasEgSYoh1cscSRofyGtD4+9AolaeS YuRTeAHO4DemUwUQxu1i6++WPw2STtA0oPTTSsjSGOTe1P5XPjIMJgdyY5n1K7Vlfvm9sBApAaA xbnXi/SLjoLBMwEg8Yz7Kiq+A47xVSzifAoAUq6jXdyqiCRRFpnr/gpNXrrrRdWLxMC3LurYhnU yG/BxQfbfam8Lg0WLqVHZnydtLi2zAzh2EThEv152B8vkRnbuHz9c9g== X-Received: by 2002:a05:6a00:a84:b0:838:ff63:2fe2 with SMTP id d2e1a72fcca58-83a5bada1c2mr4355264b3a.5.1778087519981; Wed, 06 May 2026 10:11:59 -0700 (PDT) X-Received: by 2002:a05:6a00:a84:b0:838:ff63:2fe2 with SMTP id d2e1a72fcca58-83a5bada1c2mr4355221b3a.5.1778087519343; Wed, 06 May 2026 10:11:59 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839679c8c00sm5604070b3a.32.2026.05.06.10.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 10:11:58 -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 v4 07/16] drm/msm: Add sysprof accessors Date: Wed, 6 May 2026 10:10:31 -0700 Message-ID: <20260506171127.133572-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260506171127.133572-1-robin.clark@oss.qualcomm.com> References: <20260506171127.133572-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: opVYSfDpGru-CcYfvTGuFHTZ0T3c2T6q X-Proofpoint-GUID: opVYSfDpGru-CcYfvTGuFHTZ0T3c2T6q X-Authority-Analysis: v=2.4 cv=cKXQdFeN c=1 sm=1 tr=0 ts=69fb7661 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=v4b4B-quZFKF0PxyZCUA:9 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA2MDE2OCBTYWx0ZWRfX9pB1kJvUr2Lh CDkeYLGN8tlkxiEcG5P6xy0TwnhTA8/lRp1ZkOLn8qxwtqlWSsXo/7gcXfvONZ29Pgikb3x0MfW NbeRNiv4FOVN50+yc5mUKEoQRPEvia4UpADsvnsjofJP3Lz2KHlkH2Cgt9gkCdfLZNt5DP388b8 DZGQ/6xAcAHVDwfI6imLzxQy/udhIeB+ZUg+TNQ3KMkPx13C3fm9HNnED6XiNgj0ipoRbToTsNS qFS/fRydj4JniadD45G7VCKqeGuVxMSwpCDS2sJeXBrnh7Ud8z13g8JIUDYkz5FOFzOUSFAxstz u/obulMppPWMUnyL7V8sBVkToyArMMIpY+QKNN8sTjv0aDQXRvOaNkhr4UUEwUVDfZNs6+X4e24 auEgp9+QaRVlN960TyLkvVXZq2IwUBT9sn4hTulF0SabQv2Ifd63vQUqMMgBuCv7niatFF0bftQ LLMwGFx59Kh065A5YZg== 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-06_01,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 malwarescore=0 clxscore=1015 spamscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605060168 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