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 BC47038F623 for ; Mon, 18 May 2026 19:08:18 +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=1779131300; cv=none; b=E2+XOH17gdnnMDhLSBnDeVyqk39QTBib2CjqpVSwb+DVFB1b8OMfw9v0Se9sGKdlN8AePc7MTokJ22HT7qZH0LLLKRTAyzMPduGnQnwUDC1qRflVsL3UfxhVxD+RiMeJ3Qov+AYWBoScjcm3f+nhzqTytBFf4MrnSq4blDMFIK4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779131300; c=relaxed/simple; bh=mwv5H2OOJDSZvW2SF1lbkPIcHxfB6ty1LqTAVICmuFM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ryzOL5wd9bqJti6J2XPzmK57jz8+4inIncDcIFtOTSEVB1LXNYE1AhJtI60kntJpfC8Wm8k8scsFDUDDngyeO3V5cUwK6eo+4nqi5PgX0ESWksS3sfWBVJB/nucQzNQ1lAudylQdcBL3nyrjfoBFDRt0A4BhhPThoRrZBAZSTZM= 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=IKEv5w3+; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=RJjdlXk2; 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="IKEv5w3+"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="RJjdlXk2" 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 64ICLGUM1890501 for ; Mon, 18 May 2026 19:08:18 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=eZl9dR5CO3E sJ00bvvdzTmB9yHRqOUcactLKgwAqf+4=; b=IKEv5w3+T/i9zYuUbXota53kbr9 F0XRgiFa1HnYh2iJF6GiK2jAyCml13Z7ToSzOyTwswEwmYvIdrmhcx+JhDeLBMIG Tfva5qM1zZUf9kdTCejaUfkalMDLZBa6NVUWkRq7cmYbFg5/ZmwqZgOLOoqhrM88 j934Cxk7fyw+pB+sF7n0Fga/k2k6K/KylvSRCT85lG7itrgEbknjecn8NwalkVEl pLyxpKTNcyPyTQ87+m5YPWLCbvDmg88SwkTRgDeUKG2A7+8Q7Br9BSt2ikwArUdL KvxKT64eix4o0kQR4J+ZVANwKRJORkbkm/c4m+ai3ZdRECGvKHOId+NV+kw== 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 4e82pw1k3w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 18 May 2026 19:08:17 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c8271fb43d0so1440740a12.1 for ; Mon, 18 May 2026 12:08:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779131297; x=1779736097; 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=eZl9dR5CO3EsJ00bvvdzTmB9yHRqOUcactLKgwAqf+4=; b=RJjdlXk2pcEQgxuUEYEQu6qwSYiUyf4hyp1MRJ6Q3cEHUXZvDnN7jcvys7+6umvLte 93cOJEELo1HITfpng4dbmd4YRnRm18wnJ3wTUNS21CikX2TidEHj9bPpoSxmeVzFYCjO aFp/uAD1uy/1tFSbPni8raaZwQ6sh6TqBpXL7fyx1bQpnReBQJN4wosgfKeum0GkVKho +87AsGAKET9fXTwARgrCt0KJErtX3GOx3Msv1qpyIY8I468Egz26yK5UCQTZEvY2iIwJ yQFcZELSoH5n57xtSc6F30ZMlluaO6EKSqh/YExIBrEonm8c2EYpaitao8l6tt3KsO0R PHTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779131297; x=1779736097; 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=eZl9dR5CO3EsJ00bvvdzTmB9yHRqOUcactLKgwAqf+4=; b=gLbfxMtJT0SBTNOVUQ2dMsYnHHgPlXvQlPEvzP7zxFNwtInqaPsAAS7LEK1GgBSOzP Janrr8DOjnXGzw35GxxuxcclSggh6gNGFI4QRO8tbHkQmH4wcRlee5yG3OcqU/hWUmfE CY88vCwP/thLyNzImlWCdNJ5pSpSwEnDvMum3zjqY7xI9vW/0juvSH7z40VniKSNnSdK 84Vzu3lQchjqgmdDdkfiFCuiOpFMIkE8ALpd1z3U/2sPfq+XyLnOeqNgI9DRPzW3HtvJ oMsXllvKu26m5clKx8ZAT+SCGi7dO9rN6KcQiJkUQRWfq4VVfo5JD7tF8HiiGqWxf7JC d30g== X-Forwarded-Encrypted: i=1; AFNElJ/Xq8Tkak4TCfWyEpDuWZdTzDTuCCBmW7pYZw0zArUnZqthMxNlwrB3UhUpf6FxgQv0hFHNXBmZfh1Njys=@vger.kernel.org X-Gm-Message-State: AOJu0YxN1BBXZqEgGKGBn5YcHA57XTeNYkwlMOKweVJr7vJnhipKKc6j sNYgL/Z+4Lqv6T9wOWzV5+7y100IYSCRDGpLpgOUgx/DfilUq74lLO1O7/VIexm7yKzRwdKAIP8 MEmMo+7keYFiYQVvkBAbn+1mzGQhHAi3+5S9iAXO3Wbg/eJA8GsHb9WvKy+8cTHBp+ow= X-Gm-Gg: Acq92OHqseFerI2JueJDmdDiSP5MwBHJVW9Q6z1xb1pR2YDXD/1WXwtS4tiG5CZDrHw ww7wuMQQQpXdRGo/936F2ONskkxBvCYe6YIlKOmFHLuRVTarVB2yE7BoWHL6en9N6OweDfOkGyP HDq5JDWdIB91yh9MaQbMFOBbN8wKQEj7rw4oUfrCZ9AqPQlLSg34McJPlcSsECWczNUK8EfVUp6 cO5oHB2dxfXsyLys0C+EZEGXHOAKP0qv9phUAiGlokmXgyeGpuqRhFHvEEH7TToqx209G3d/uTP dHkXcR3n0xhbgJIoW5SmawyffKJWtTSM/apmH0fF2L4aooi+IhxdnOXvhhEsYvKC7qqp8oeu3S2 76aHn0icxN/TK52RRsQOrf2UWh0F6Kqx/ X-Received: by 2002:a05:6a20:430b:b0:398:7357:bb91 with SMTP id adf61e73a8af0-3b22ecac139mr16137980637.33.1779131296971; Mon, 18 May 2026 12:08:16 -0700 (PDT) X-Received: by 2002:a05:6a20:430b:b0:398:7357:bb91 with SMTP id adf61e73a8af0-3b22ecac139mr16137942637.33.1779131296456; Mon, 18 May 2026 12:08:16 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19c7c008sm14598690b3a.46.2026.05.18.12.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 12:08:16 -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 v7 07/16] drm/msm: Add sysprof accessors Date: Mon, 18 May 2026 12:06:34 -0700 Message-ID: <20260518190735.16236-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260518190735.16236-1-robin.clark@oss.qualcomm.com> References: <20260518190735.16236-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=a6AAM0SF c=1 sm=1 tr=0 ts=6a0b63a1 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=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=v4b4B-quZFKF0PxyZCUA:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE4MDE4OCBTYWx0ZWRfX8BfAbUw+LYFZ g/pD2ohSoZJkcUp10HanBktWp9pwPGhG8lwcMgxKhe2iaIti9/K4pfwwgp+bHGE7Ncl4KlznPDQ yvtMSoJiLt8qYQcZ76Q6RIcei8irzIRAgWOy6oY/nd18kDbBPNQsSVwhRp67MItjDwnob9RVbYp aKxJcFSwokeR6tcXARLGFM3gQ5jANGURKoOpmvETpNCp8iDLcVOsKMSRLAO5VfkSw/mvXWH3AEo vJWKBSEHJBaqgxLau1D1N8bbyfMLUQw7YYD7FOwh0494PKod/q4B4bUQ6QKFgzRP/Cs1LN7FJlk S3bZ02pBP0QbXApqJ/XLtuIA8j2Ogw3LE046sfyWXtEh6EEyDI9RYKbboLgB7j9qIz++tyt176x rvG796FLaWn9Jqe7K1rppaIFvfTjfAGVgCnobWsUnSX5qYBEFGcjg1WQ4SJJngaiQzzW5gtg+LA 5LWbtOyICRdqighNWaw== X-Proofpoint-GUID: T4gOrPI33NRhZysTl_91UocSdRDQQ6Fh X-Proofpoint-ORIG-GUID: T4gOrPI33NRhZysTl_91UocSdRDQQ6Fh 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-18_03,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 bulkscore=0 impostorscore=0 adultscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605180188 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 --- 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