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 AAC9B3E866D for ; Mon, 4 May 2026 19:08:35 +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=1777921717; cv=none; b=NnP31OouZ0syozD+oQHvl1p/dNG0tTuo6gUqIYEl8mgehnQ4aP+dReDEOQktkYEnOWJsNG/6v1qMJfzETKROaT9VOZnYObyrjWBn4yzUL2NOxCEQmPYHoVcnekysCK0dMqN/UsbIYLHuwRcHhV97aiYpC8ercZeOMngrmebaXIo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777921717; c=relaxed/simple; bh=KUeO+uGXifPyNRMjTlRkpbk+v6P6X9ZXisv7FWZ67XQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GmjDQTugCHdYrnMc4cBnu+Mv9dxD2Z6RD151SIXGCd2+iOtVYc81nm38HkLWAf7OqK7GPcUkFiOhbKo1WmXeK5g+Bx/GsNG8IBCoQFQIE43SsnLrxiaj1Wb9WhKLEDIaY/6vp6hREcsHiyYgeHNZ/EGQNbbozGx3a8G+tsNB8M4= 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=GTevab1G; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KHmPpyEn; 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="GTevab1G"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KHmPpyEn" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 644J21Hf636790 for ; Mon, 4 May 2026 19:08:34 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=GTevab1GvPoxNbPKUhnV3ic9vdc psPEynRV57ThMaWzYGy1fzi8YaFDBBa4/S2UwPA0vJiUoH3qaVRb2KGsGAHXZCp/ T7WwqJr02EJoAUN2ply3fYKbfNtRb/PMhvSX1UjhIQ4QgNcwtg4KZ2o6QJYGhGd0 +gQQtqo7q++LO2AdPU03RkPU4SGiUiXvS7tKZaR2mIa6ON/jW+s+x3oNjXnXqodY +Ichw9Q90SmRFVG7gOa1e+cx2j5MBLqHfwe3unLoPiB7hu6cB7SdB2hGYIUEgsHe /LXH49kgRNtmdHKcQM+bOIvL13yI98vXMQA8j9FT3L+Dh3zfV7WKcSmLgkw== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dxsx49t52-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 04 May 2026 19:08:34 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-35fbb57764aso5813905a91.1 for ; Mon, 04 May 2026 12:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777921714; x=1778526514; 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=KHmPpyEnPT6mOwYgLbn/mK/1jfpR+JCJsrIAJzXHIYXVwnqG4GgekBm09K5rNAxsIm ahtxVnEfiJ9AVN2oucPSN+RaMsQoKHAa5XLG9iyD8Q6fXQVgVgQlX8+h9dcMJwpCaJkm dbMQmaRt9ot4PWbuoiQW6WHrgDaJOZeKTOQrcBQbZr82bLh2js/iPsDpn89SOZgcJjrS DqOeeQfHLcTZ1CG+V9HRZLS7E3XM7f+YJP9haHdILH1SyMRwt8O6YDbJ7jKBkOm6kIY8 TD0SByTTMr5XjifVel2gUwgdP8JeqSdpSr5bNSRZn31zUFe7MJB6VEROs8T11Axdk1yb RK7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777921714; x=1778526514; 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=gYcr5Y6WNC7Wr5FrSSDsv6Bp3rzpJavu762BCTEQ3vqmLjjawn+bIqEBMsISljuOUg LvUr0238eFnGB7phBdEFYH95ePf21mJ4ZS1JQ4mscY6ZFmo8007fTJPGqIjrR4uQRpNJ i6FvJPJ/hOjTx0qDgPb7AIf1l5ItJ6/mgtMlvj5gjonCuxsdH6iW7ZmldhWR1f+Ve3kT CpHY4SfmuU4Pa5qxbkbIvnNo4Orw7wn7RIK3cGz02RVnIprl95IJmn5lcztr3dbDxTA/ dRn88yiLIGYBbU25eHXUNWJwKA3UrsfLlxfZ5xPOU37dkW3l5WoU106/UR9qOkyzyZMc zvJg== X-Forwarded-Encrypted: i=1; AFNElJ+7fQlUdgvxZ69vTsKIFjB1qhuuF27sZBkeL+XOCAHzxDkLLG6HmhglTO0kUhyvXg2i3yfWJvI+zwofPso=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/kfuMcNIvSZFwfXyrMgeAW63UbRvS9nw784idqsdoSXPirjDf yudLP0hqu1zv1rHTwXYy4LN4NTaKCFgIy9piA1lHCjMxcZqGca+B3OnmWBw07ZIuGJyBKx8dOjj ktewSZ+MrT1JCILNGSiZAq8QZlXXAA6vt6vyQ65xK6Lj5siEqVSVtRVAladOKL/493ZE= X-Gm-Gg: AeBDietkBx5fCz/I7WPji4hb+tEqwLtBZi5hKl/w6KaTkPrDJ4zEK2BdjF0eOVJ41Me sGWR9B3Sei6E7pLlq6265m5eyv7WaV/ck6KaE0eYUmq7/mABRe4l4thlI1NXsqreXN23AW8EgTs k0Hc1oRVtljAjVEeFMsQhV2iGBljQt2soHuKhp6lyNrk06V241+jyJDtym4E6+DrfhsSsHJY85/ QhioENaUGPfGBFSrgGy4yWxgqRZNftB+clNjQFL0EL/MXgKjroqloQZA9eW5wGVWSE0xl9pSTq5 b+0x8sHW8TG6JdgNvmZkTQk4eOVuNPfSxmgKo8q7wpcHnTeUu0CcCqKwTKkWXgFWtT+z0JHO9+D lS0KH7TJjNJf80FQxc1GcmeUP7Tv2yD+2D+jsBa/0e1U= X-Received: by 2002:a17:90b:3d4d:b0:35b:939c:e859 with SMTP id 98e67ed59e1d1-365727327fbmr583950a91.12.1777921713464; Mon, 04 May 2026 12:08:33 -0700 (PDT) X-Received: by 2002:a17:90b:3d4d:b0:35b:939c:e859 with SMTP id 98e67ed59e1d1-365727327fbmr583925a91.12.1777921712916; Mon, 04 May 2026 12:08:32 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364be044f23sm15279848a91.17.2026.05.04.12.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 12:08:32 -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 v3 07/16] drm/msm: Add sysprof accessors Date: Mon, 4 May 2026 12:06:50 -0700 Message-ID: <20260504190751.61052-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504190751.61052-1-robin.clark@oss.qualcomm.com> References: <20260504190751.61052-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-Spam-Details-Enc: AW1haW4tMjYwNTA0MDE3NSBTYWx0ZWRfXz1jtG3UoBh8w JY7Tz4ISy3aZpZS0SkWok0rpbZwv18LNA2ZQDppYq+uy5UxgNUZYX4VPydRKsAuGbLk0afKxWCT byv8d/TQPXHMbuFx5WWkvC0R2nuEtktTruCQi39F8sbgI0q7K7aVuJf8sRGEFm2GSr3WPYTV/Te G154Ovcl87e1H8FOCy4lbnhiJCARBqRq939t9gPof+NIJ9qMRTJTDLVMkhBrO/OPytvAvi6EIkM N9ntiC7ppjicE4fy27dwXPJDVsW4HqP00GyKpL4cb9Qtv9JRdKcuhP9ACO9XyROti5PtVupUGsv 9eZj1u85ibko9F0sddUp2IhI3H4HKs2CajLAQrUf7F3zkAqmSgeWqUD1gDw9fLP6B4YwjOttV3S rAsjoLqKEKzyhH+IkXJ6cyyUL/lGhSG9coAOLkY8Ns1RChlhJc415+9InPS65wvFGHg0MV8CTcZ gAS1kf2PDleSUmtxfow== X-Proofpoint-ORIG-GUID: XDJ_tJNFQm1-HvBgqew1S2eBXXgTbwNX X-Proofpoint-GUID: XDJ_tJNFQm1-HvBgqew1S2eBXXgTbwNX X-Authority-Analysis: v=2.4 cv=LdIMLDfi c=1 sm=1 tr=0 ts=69f8eeb2 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=v4b4B-quZFKF0PxyZCUA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 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-04_05,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 suspectscore=0 impostorscore=0 malwarescore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605040175 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