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 64B0D401A08 for ; Tue, 26 May 2026 14:54:13 +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=1779807255; cv=none; b=aIeLKYT6XX9/0zNT3XijWu3mutIEF3A6V7RBWsDvuIaJj8fiXwFB663C2W+SNyCQFaVhJCICLMePefyX0q0dDXbj5pwu7ZAyT4rU8tAlg+j/kXzHJ629oL7qMjh2tP7g2lm54NxpMa9V7mK/29R6WM6ax19Jy86RfSNwCnw627M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779807255; c=relaxed/simple; bh=xk7nfthZ3OSrcQx+cboj2SEN2wdIQMknWbj8sDW9T5M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eopkumFdhZ57nJdZ9im0XgcjEdSbFjTgfBYx0Ljj2dxJtoJA1WaUsx3GA6a8elQ7rKwLbf1d2nBQCP/U1ALkwXC14f1NLwNuTPkE4OfpF/8c+uuA4QzxdemvNM2t5aSGDmCVQ/SnxsEnlsZelzvm95T19dDF4QMKDMOAhEKdDZA= 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=lR2QBVFT; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cFETQ7zW; 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="lR2QBVFT"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cFETQ7zW" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64QCsYkI2496659 for ; Tue, 26 May 2026 14:54:12 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=4tfvGKSXQFo neM9FUCAjiWpETYTjQZebXY53uh3TIBc=; b=lR2QBVFTuJDcg1Gk5hK/KIVB2Lv MlXfE60ZwTWK35agwGn1WlXjOryvE93L+Elp73s1hK1aXwpO5cR7r7q1js4T+PKY ApA0iVH57KTFbtPCG6BBMOEG0oCZbXRC+/frjIGmWzuYahgdfQqM9GSAoFhkzLdU 4jqUXmg65ChwxRFZiMD3rWFk1xByJ48pzzxJoAp+CQXPZH4gcxkTqYDMjFRuhzOL DtblkCkCWsfx2dpSMqn7VDB6B+fg/FBtiFui1idB8rCEIB8c87ycGXtGMDezBQ/9 TG4rvNjd0nza+RfqWdzE62VpRqS1KpBiuln5UfkjtrcD+82BTTeoH+G6onw== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ecpyqmybr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 26 May 2026 14:54:12 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c827bda3052so14641660a12.1 for ; Tue, 26 May 2026 07:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779807251; x=1780412051; 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=4tfvGKSXQFoneM9FUCAjiWpETYTjQZebXY53uh3TIBc=; b=cFETQ7zWcv7CcYgXpvqHQeSbAk0c8ZAwIq5KQnbpb+IPa9yD1m65++jWcVxQrSbSmb uMS/O/28DTMHCZ8vZ9un4U6DdbASFKPtYdIQkVMHjGVaO2g4eXaEhFuEsejxOEShd9x6 CKT8dGSuSj2mVrVilvdHfJ85S03KecQu2Jar0eE5/Aa6+pSpC+zel9A8x+3FP20wjxof byWT8826D/UdGVZCplIQ0F973CzraP8G9kK2cQpzCMfD/aw7B5y/W6VBQTjtbv8bBIzn B/0rllv34HiWLZhBWcPZiBlpfN7zzhZHRpYmiAH8shHvzurfC2yZECYt7nJkPeP0liuG /+1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779807251; x=1780412051; 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=4tfvGKSXQFoneM9FUCAjiWpETYTjQZebXY53uh3TIBc=; b=TIL80AhEML92XqAyq2/ZbFWUwCrQ89wfYGDoY/9CiKjrVrtlwZYL0PqVEtXZgG2EZk p6ot7P1FyV4zd959XyCDq3ENfkS+3BteRRCVxSrbW70DsMUeCc+lvctBFKMDpn1KHVB+ AMDr0jPa2lfLCeNqHGxQptkRMDTpmJVPs1u/vvZ8aIvn5v1BXNXLXmBy4ohxW2brIYRp SuQBqjNCrXpUN4RmBAHZ3sniE3mCIfS1wqnGkep8fkgo4Na+QRRCAEBeVaI11XIoSJCj 7pBSXXyn1W8ovNVVMMvLbgKmZf1yi4OJ3m0q0OXkXOtKWbtjznLOHRoqugJE8/xoeZtz jOHQ== X-Forwarded-Encrypted: i=1; AFNElJ/OP5AWuHDkICJgptvcZJ/XQSleEL8SiFv6+FbGJ9TZPsbOKbjsqD4/Mpoa8kbV4NTrJc2sDhQ5+gjNj/Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwKYhjHIU/5dbC7jcoHvH85j4L0aiXp+gcg1PdK6zHtnuVianVT bWNNY3LUp3dFVEFGM06SyxDhCJRt1lQnSmLWqH79mIrCEvmp1+BWIdEWzi6KcWcPD1RgDZZFNx9 o0hzc4r/4xiQeg1TbID1x7FJWkUYEg3ycp6/0rOHkXrleUKMbSyPgnrgCDztl38BZXG4= X-Gm-Gg: Acq92OGKgB2u1il21g797Cj9Abew3g736tfGa+jl3/08fZU0NkhPRlBqTMtuDnW+0dd k5VozRzgNnTdS2RMQCcnODKZbPMgRIDc0kM2ap4MWht2WOOlAjxyYtx0oIU2I8vJ8jCKPd4DrCe Vl3s1jJ1lTImOBAQPsYQnkAeteY41cUG90Yg9TIXu6bqoSaJ2LyMeyIAwbgx90duLApuU9pfj+n bWA5FB56w00D6gs5WkOLzJCbZrkond6KbKqHklKA9icAAeATrb4z/n45olctLheF+yC5tyPBT/c dJ3RNtowYFAd5a9Dh2DGRFzG6A+ZzkS5q8ZXFg/obHBhZhqqV3Y8UaCfifaBXCK0bIEwEeVp3Pg R8SpvcJzCKc6M6+NeSrIT8kVpcBhJ/6mE X-Received: by 2002:a05:6a20:ae24:b0:3a2:f05a:793f with SMTP id adf61e73a8af0-3b328fdf6e3mr20955836637.51.1779807251436; Tue, 26 May 2026 07:54:11 -0700 (PDT) X-Received: by 2002:a05:6a20:ae24:b0:3a2:f05a:793f with SMTP id adf61e73a8af0-3b328fdf6e3mr20955796637.51.1779807250963; Tue, 26 May 2026 07:54:10 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85202b91c6sm10470880a12.14.2026.05.26.07.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:54:10 -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 , Anna Maniscalco , 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 v10 07/16] drm/msm: Add sysprof accessors Date: Tue, 26 May 2026 07:50:41 -0700 Message-ID: <20260526145137.160554-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526145137.160554-1-robin.clark@oss.qualcomm.com> References: <20260526145137.160554-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-Authority-Analysis: v=2.4 cv=dtfrzVg4 c=1 sm=1 tr=0 ts=6a15b414 cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=v4b4B-quZFKF0PxyZCUA:9 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-GUID: ugIcVZgcsd7w9U7dmOoOwgNIIPdzitvE X-Proofpoint-ORIG-GUID: ugIcVZgcsd7w9U7dmOoOwgNIIPdzitvE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI2MDEyNyBTYWx0ZWRfX7p9KqVYqq3rM hcUlqmwe8AANIFdrLKKWz/KPVcSFtV6HuthNvWS4dgSuNP5s3cuf00ZWFGX1xsuYktfg6PV0fBA JxGxowCgLVz1Gjes/8NJB9PDP/uzovda0K3AZWNrJpiduWyrrfbhOldgKJkgMkxsN0Of/djWmr1 KZNayUWus+VZapOBQZHu45KMwD5bR0WKWGmlk3fWtzm7+wU0CuZDVCAhCvbVkMrdN5NETP98ejw IRibUSMbBfTfdzpP7uhVnXoeGOtO+qzCnAMB7wKejQsWb3MNJa1t7GRk4v79TkvoBRdJ6mp5/6S lsKuewKRP0BFtBP93zJIk5zKCeHykI7W+sp49HdcLLRoVuQMJosHmvjVqr7ckSlqHg243sitr/U lMImkXvJwqWxfnJIIiUFKl8RndhHogPS6c+FxdHeuJqFw9zmyW441imEcFfsgpQCz4eAMlr160s DNZO2VVDDpkqGoXqXsQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-26_03,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 suspectscore=0 bulkscore=0 phishscore=0 adultscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605260127 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 Reviewed-by: Anna Maniscalco Reviewed-by: Akhil P Oommen --- 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