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 41D2B2BEC27 for ; Fri, 24 Apr 2026 15:12: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=1777043542; cv=none; b=HDJ+sZWIWFpMbCggE78bhfulqzZPx6umguzQX+NJdbfElnwjwLjPbgL5+seZoGmFmQv97X1GwNpy7jRyUN9aXw3iK0i8w41+WYXSJHjKHvVzwO+z/BM/E+KrgkCQqiRcnhmyzaUenvVkoDgRhAGFiy/URsGRmm1/6x1zUN3j74U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777043542; c=relaxed/simple; bh=UhGTl+fUgRdmXb/zs6mAnMmKieTngsW7QFo91Q5/D4I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b0Qd9nGBgV+rDX+nJDX9MimVB/v38JlSeLf7/f5ZO5v+9MfBmpKWhlvqQ215UXwsP9Zjx2l2JCymclxOm+NZUR99qL3VnBEAqnm/kMoXFJrd1308NIYfZsLHdQ+YwgWiDyhAU1tf6tOoyTsgYXX+5MC7P2/n6CjDbigVs0btRSk= 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=L8hwhr6L; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WCbu6jnC; 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="L8hwhr6L"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WCbu6jnC" 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 63O8ue0X2710093 for ; Fri, 24 Apr 2026 15:12: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=6gpiGKD6NOz XykXwNxb4bW/bNZG0eBfs5NrEf4+DquQ=; b=L8hwhr6LpCNIVlaWJwEeB/PkxcX zA6SD+xpM4BoQUanP5kBS2YwljfJ1l+/LcwUUI+cDhhfzNobEq2kLCA9t6sU0PkK u2MsbYhHZ25pZ47LrThPOY6ACfUdZIvPtJzJ47qpcQV2yJirFLZCNEdY4ajxxqH+ H73RoH8MvLJYy3TctjpMMObA4cF3Wt0GZVl21F03qKBWkZjA81Qm1TaN76T1JDas /53SXYS9sLzQqU1qRsnGTDyD7k0yyvpuR1czw7YBRsMDyrXi+N7UtNuvUdWxvo9b pnCiM0xt94mhg1hjEWCCaTNqDCxQZySv0erHI3Q1VpH+d1+q0cnslk30mxw== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dqqu9vra8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Apr 2026 15:12:19 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b630753cc38so10427525a12.1 for ; Fri, 24 Apr 2026 08:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777043538; x=1777648338; 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=6gpiGKD6NOzXykXwNxb4bW/bNZG0eBfs5NrEf4+DquQ=; b=WCbu6jnC/ponedzeTNNMj6QdTh6frarRKhgHCAp6D/D1GzvzvXtYwb60Dd+6Uvhv7H OGrXoKgr2iDXBznfxZtfx++alm0ZUXJa1lSNWjDkJ/PChsxjRJOovInkQaR02sQaZRim 0WKTRLJR7cuPx0Nf0HGJb4oIHu4qrs2pvIbTA7zasdF073egsNZcp/2ddlv3qAqD5qET xavt7ereUF+2htkh1nnSnJc1zkG9UTy5XBnfBqLLLYUkfYOsoSbHcq+g4Sprl4zMVZao spWc378qqRlrmiVyRUMM0OQVEbj6GH8XF0ZMji29MZSGZz20hQRtfkRHV8tfr65EoQec Ff6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777043538; x=1777648338; 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=6gpiGKD6NOzXykXwNxb4bW/bNZG0eBfs5NrEf4+DquQ=; b=U/m3S1fcpo9Lhb7Oz9TGN5zcfkWKN1p8AZWIm9MejvVuTXlZsTSdw5rvF89/hrKFOL d/2mF/67UTbojRYOesJFb7oM+YacFyT8MI4sesgFPtDHoIhVSz+PHTwZZfwPlGDldCZX np4wHQm3N0dFVwbkHeajDiX8Ug9h0L0YatxYteOiEDj1sJcvdJ4mEh0fsUyJLaZDPbwP x/fyIAzV50bI7McrbZcF6ZjsMyXg+yXUSX7d3GC6IssFpOSfomC1SleJYcqQr/s+gKRa e2LlcNl1OvkKzswGgdd8pYqPexM1EYbAy15cn/QnO6rzwuTh2nYBsYRBBsiC7dpOo3ds wpfQ== X-Forwarded-Encrypted: i=1; AFNElJ/GtQ1KKiGgWBPMZW9pu/WbqcLqZF+IGg7uQFhmSqgVA8O9kCwybyqC3UYc7a+qq2ARnBcOWkMiy/cit7s=@vger.kernel.org X-Gm-Message-State: AOJu0YzXhK9yB/ESV/OhYPe2afIfyzuQ0UpEbe3A0S2y6kNHqpDqKkMx /WBxq9EcvQFtDXvgKFzlz16R8Ifg5vd52jtucAV7JMM48KJO3iUCph4ogIMB29e+12Fz18HFYdu uJmujK4ggpjeoQP3pOFY92xI+p3xnnl/ZUFhyxtevbHnvrI68m1Zw+j+QKlFTqU8JX7Y= X-Gm-Gg: AeBDievY+Qgrqukrao54F0fmIFt4GMsSTRhvK23n0THb+tvKCE+qB3but2YSUVonsfX Ku2DQoQB7tgVMpX4DA5ff9ubg3y1Qz0oC6or0L5rc8nsBGcpGCP4HajNkUJSl7xjPGWc2jqEfdI syFzuGTaN9rvuej46sCe2azcIaqiBkRstX6hr6NUq1TxtjrcTpcMNQ4l7WJV92Y1hJ+WLgSabxo RE+d+0zZmmnZihh5bPqlXJGj7BkLm6vpTAEg155SBe/8IaXohNl+u7EtKJwin6CPWXrFbOJHkNP nI4HirsYQSMdHvg8q4Xp9y5giM0nhaHmgmJB+0c+vI8j2NfTs7Te4N1f5eg/m77fF8QKqlkX54v wxpW0AQLvawyOh2imSdG22FwLu7oViCwz4vp2wlqBWFw= X-Received: by 2002:a05:6a20:e211:b0:3a0:cc67:39e with SMTP id adf61e73a8af0-3a0cc672136mr28254926637.41.1777043537922; Fri, 24 Apr 2026 08:12:17 -0700 (PDT) X-Received: by 2002:a05:6a20:e211:b0:3a0:cc67:39e with SMTP id adf61e73a8af0-3a0cc672136mr28254868637.41.1777043537326; Fri, 24 Apr 2026 08:12:17 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7976f9db0esm17494595a12.10.2026.04.24.08.12.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 08:12: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 , 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 v2 11/16] drm/msm/a6xx+: Add support to configure perfcntrs Date: Fri, 24 Apr 2026 08:10:46 -0700 Message-ID: <20260424151140.104093-12-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424151140.104093-1-robin.clark@oss.qualcomm.com> References: <20260424151140.104093-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-GUID: TubVfRMjf4krP_pOkamtUBldkGAtegGl X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI0MDE0NyBTYWx0ZWRfX2vDHZkSuC9l2 n6NXK2ppUYxEWLCTsMmBltMpKd2IY3nO6mXfCNgi956tqwsy8VsXJVkcr8Q1eWVsEm/2HEuEEXO UsyB2+E+rUcpLFDgz6L/RdzlYgw+yKv1WXCrpb6z6ZdhY8X3M09462o/y9MfflWjyjd1pvO3SxH 5nmhrd03g/9Gc6wxyR224xnp0LFxZzTg+vtUb6UGYHjMhPDvrh2e0qGMbnhX7B6onXSHDSBN97S rRE4cJNBwhciDTLc1lrWp/l1ON6cWrURihuIlalr6RlMWYM+ifvKsfS8jjo1NVGhEntvPFOJE8m +lKqORKH+u3TiPwElyoakpoYhqT5msdtm5+DTxrtNU772It8nO1ePft2EqGhbywZfppzcFSAWv+ Gk2pmiQ374FZcDgwYFLU5d+6jUbE4/k562bceZSxrt8pmtqdnG84EK83ujhAgkeCdDVrFSOsCsg eEK3aiRI8801IyqUpQQ== X-Proofpoint-ORIG-GUID: TubVfRMjf4krP_pOkamtUBldkGAtegGl X-Authority-Analysis: v=2.4 cv=QJNYgALL c=1 sm=1 tr=0 ts=69eb8853 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=xqWC_Br6kY4A:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=oWecmCczN8450n14xlQA:9 a=_Vgx9l1VpLgwpw_dHYaR: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-04-24_01,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 impostorscore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240147 Add support to configure counter SELect regs. In some cases the reg writes need to happen while the GPU is idle. And for a7xx+, in some cases SEL regs need to be configured from BV or BR aperture. The easiest way to deal with this is to configure from the RB. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 69 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_perfcntr.h | 3 ++ drivers/gpu/drm/msm/msm_ringbuffer.h | 2 + 3 files changed, 74 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 415902f6e5d7..8b9dcca8e051 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2535,6 +2535,71 @@ static bool a6xx_progress(struct msm_gpu *gpu, struct msm_ringbuffer *ring) return progress; } +static void +a6xx_perfcntr_configure(struct msm_gpu *gpu, struct msm_ringbuffer *ring, + const struct msm_perfcntr_stream *stream) +{ + enum adreno_pipe pipe = PIPE_NONE; + + for (unsigned i = 0; i < stream->nr_groups; i++) { + unsigned group_idx = msm_perfcntr_group_idx(stream, i); + unsigned base = msm_perfcntr_counter_base(stream, group_idx); + + const struct msm_perfcntr_group *group = + &gpu->perfcntr_groups[group_idx]; + + struct msm_perfcntr_group_state *group_state = + gpu->perfcntrs->groups[group_idx]; + + if (group->pipe != pipe) { + pipe = group->pipe; + + OUT_PKT7(ring, CP_THREAD_CONTROL, 1); + + if (pipe == PIPE_BR) { + OUT_RING(ring, CP_SET_THREAD_BR); + } else if (pipe == PIPE_BV) { + OUT_RING(ring, CP_SET_THREAD_BV); + } else { + OUT_RING(ring, CP_SET_THREAD_BOTH); + } + } + + const struct msm_perfcntr_counter *counter = &group->counters[base]; + unsigned nr = group_state->allocated_counters; + OUT_PKT4(ring, counter->select_reg, nr); + for (unsigned c = 0; c < nr; c++) + OUT_RING(ring, group_state->countables[c]); + + for (unsigned s = 0; i < ARRAY_SIZE(counter->slice_select_regs); s++) { + if (!counter->slice_select_regs[s]) + break; + + OUT_PKT4(ring, counter->slice_select_regs[s], nr); + for (unsigned c = 0; c < nr; c++) + OUT_RING(ring, group_state->countables[c]); + } + } + + if (pipe != PIPE_NONE) { + OUT_PKT7(ring, CP_THREAD_CONTROL, 1); + OUT_RING(ring, CP_SET_THREAD_BOTH); + } + + OUT_PKT7(ring, CP_MEM_WRITE, 3); + OUT_RING(ring, lower_32_bits(rbmemptr(ring, perfcntr_fence))); + OUT_RING(ring, upper_32_bits(rbmemptr(ring, perfcntr_fence))); + OUT_RING(ring, stream->sel_fence); + + a6xx_flush_yield(gpu, ring); + + /* Check to see if we need to start preemption */ + if (adreno_is_a8xx(to_adreno_gpu(gpu))) + a8xx_preempt_trigger(gpu); + else + a6xx_preempt_trigger(gpu); +} + static u32 fuse_to_supp_hw(const struct adreno_info *info, u32 fuse) { if (!info->speedbins) @@ -2753,6 +2818,7 @@ const struct adreno_gpu_funcs a6xx_gpu_funcs = { .get_rptr = a6xx_get_rptr, .progress = a6xx_progress, .sysprof_setup = a6xx_gmu_sysprof_setup, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a6xx_gmu_get_timestamp, @@ -2786,6 +2852,7 @@ const struct adreno_gpu_funcs a6xx_gmuwrapper_funcs = { .create_private_vm = a6xx_create_private_vm, .get_rptr = a6xx_get_rptr, .progress = a6xx_progress, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a6xx_get_timestamp, @@ -2822,6 +2889,7 @@ const struct adreno_gpu_funcs a7xx_gpu_funcs = { .get_rptr = a6xx_get_rptr, .progress = a6xx_progress, .sysprof_setup = a6xx_gmu_sysprof_setup, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a6xx_gmu_get_timestamp, @@ -2852,6 +2920,7 @@ const struct adreno_gpu_funcs a8xx_gpu_funcs = { .get_rptr = a6xx_get_rptr, .progress = a8xx_progress, .sysprof_setup = a6xx_gmu_sysprof_setup, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a8xx_gmu_get_timestamp, diff --git a/drivers/gpu/drm/msm/msm_perfcntr.h b/drivers/gpu/drm/msm/msm_perfcntr.h index bfda19e01535..14506bc37d05 100644 --- a/drivers/gpu/drm/msm/msm_perfcntr.h +++ b/drivers/gpu/drm/msm/msm_perfcntr.h @@ -45,6 +45,9 @@ struct msm_perfcntr_stream { /** @nr_groups: # of counter groups with enabled counters */ uint32_t nr_groups; + /** @sel_fence: Fence for SEL reg programming */ + uint32_t sel_fence; + /** * @group_idx: array of nr_groups * diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.h b/drivers/gpu/drm/msm/msm_ringbuffer.h index d1e49f701c81..28ca8c9f7463 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.h +++ b/drivers/gpu/drm/msm/msm_ringbuffer.h @@ -37,6 +37,8 @@ struct msm_rbmemptrs { volatile struct msm_gpu_submit_stats stats[MSM_GPU_SUBMIT_STATS_COUNT]; volatile u64 ttbr0; volatile u32 context_idr; + + volatile u32 perfcntr_fence; }; struct msm_cp_state { -- 2.53.0