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 E3ED03F0763 for ; Mon, 4 May 2026 19:08:43 +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=1777921726; cv=none; b=HalhQ8pWEwFjaASpKYxuAfcA0auvIBQcbHYW7A9d8LcrlzmskxqLj1f7Xu/soaP74z8YI8jOYfrOjs0JCMdra3ebxI+IEH6QPUyKdhTv/v095hJ96wPC5H6Q/Z1JP1KRetWduzvo6vbkWq+A4ofE7bGjWYweCBlukAIBPUcsPUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777921726; c=relaxed/simple; bh=54SiiwIiDu5jCiPVBfargkA8Cq4AMd5thtK2yJft994=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q1ZwSW7zbNJX8Rmt3w0ehVA67qRzRAQdN4Qq8l06XTOSquI14vdV6Ue2Em9vLsKzJOjxaXsGBbWNtEBcNL8T1QnpYpLb2xhksh2Elsk6cwX2KMV1G7S/QRyfrEYu44CRmi+O4pLWVVLapylOY8qXJJBqcW2tGFjHPWdl8C/bSq8= 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=Wn3GBvrJ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=J2B5GD8q; 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="Wn3GBvrJ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="J2B5GD8q" 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 644IEIDZ636667 for ; Mon, 4 May 2026 19:08:42 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=OJPIWHLYmtY h2vRJzlQwHbA8ExzYkFh40ePWlyvRs1s=; b=Wn3GBvrJzKSU9RwPkJUnX9CvYv4 LBGfMEj28DgRQPt+MQRkcO+OOqdA3DPaDEjXUzI8yo5qKovmxudQVpJQRMUaDZvB Bizim9nhsSpEPWg64aad8u4Rwd5veR7kkBsQroiTO3qn803U3Y8A2GIZ3w1UGMdD rMgDbipMc5XoOVlE0H3oe70SpFt3F5aFghXpL+yhoNOEs53949ByDth7wG3LM3Gr Oh3EWai9ZxDLKRN1oUkZZzhM8OA+v/Q8uQjAcTG1u+HmBCbz7YjzYXy8x711REnk b5n556S0nOLVzavKLLKL+HNoTP15w8ZwoAApLP5Lw3tD9O/fQeBz1twf77Q== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dxsx49t5q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 04 May 2026 19:08:42 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2b7aba0af02so43403175ad.2 for ; Mon, 04 May 2026 12:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777921722; x=1778526522; 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=OJPIWHLYmtYh2vRJzlQwHbA8ExzYkFh40ePWlyvRs1s=; b=J2B5GD8qiUKX6vnEcUzPEDBEzjQvMLHFlo82/BM04H1hDhT6Ha2uJDAi2MjjiqxVGQ qPdU51sl0YftBpdkO+W/Y7EFPKS8c4xBE0g8MAo4EqIM3nZflOSstfS687zQVW3h/zKL HRKcyl/Jd9QdgoKeVy/5Qzz4C9ZBhQxmXnU9h8HBjFIOn8TGI6YG4Irm+ECz+/XjNLrM o/kThbslip4JgxSMEvOqM5kaAcOWUGT0NiOSMcL6E4wKdgLb6V8WNYfVbtSZbmxCqC0Q 9yzvkjOJa9vN05OzJzu6lNr+DSfNOrNavHD6HPsWFqZ05zFg/DXQVyTpJu9sO5d8tskO GRjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777921722; x=1778526522; 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=OJPIWHLYmtYh2vRJzlQwHbA8ExzYkFh40ePWlyvRs1s=; b=giQFrmXtgqlINb3mPJhuc1FKd9Ftr6TiK5OeLQNpR1hEfDqFliIcvDnDX9Q0zHJjU2 uaEDfA1XzZAi9gbp7Jhm4loBNby2ckysJUX1gltxxfr9ceSpxBRWXd9etEmpHbXCtLPS 0U9fCCR3bGgezdDcW6Ue37KVbQFkg6sg1n7I/xkuoJNPA4SnEcofbBwdGXFSawfmKhgd iFkN0R9QMnPUBFWSWtrZdvZJYBeDagF4PNvgCFX60NTb2vs/E2jCsLzfuRQ3XE2UcFWk BlQ8Ha6YTJi+Rcqr5KPEHtaiB3YNFdsIZomGwMzCgyBzaBL4YjqxRi7PAL8woklR+Py5 hU0A== X-Forwarded-Encrypted: i=1; AFNElJ8zmUhHs866g3/aBmUGe+Fayq/X7qSMK2JZrXMXvUhmdeYZoHYO79ODpWkW1ENqzC8JuflEXWpud8dlDlM=@vger.kernel.org X-Gm-Message-State: AOJu0YxCSuDyASf3kpwTVC6AbjYnVCXGEPyADTzrd8ImLW+TemICA2P0 nuclc6UpAYpV8ueh9DwcgPgCOv23N9XOJU/nzhjbxAvXkNty4qygbxQvhR1ttjzZmu6S8LNpWIW RA6C+ogpRS8T7Y0ZBhlQXPJBcp26/D1aGR74GeutrPe0UF0PsRPKqPFIv/XxuE4BafKU= X-Gm-Gg: AeBDievkOXdtsm6buYdm282vmSmmgiREB5ZPektEpsAlloTO/pYDjPyPEbKeD/sCOPN gh6hgXsV0Q33Jb/hpP8kd0BxEBzBP5PMp05rUHg7uX1hwTU06RAKOtBGAzLBp+C/I4jB7jCxXn8 kwqcDuangefABzrXGpE4NZtI4wrlSEUv3HbHvgTcAqfnGpjuZ84Ks0Dz/bsvcFba+nI98Xki+bj ew4246p6TzjSYkF6bS6CIeizSPizOL4ImjWDO2thX3aGMy4IAhWy0gqEmbeBV1zHzZ6lNL6jyu7 p6a++KRZuP0Ameaz0JnKvPXlc3M//h6YXJZMbP04vvq0PckxwLc7hnXfZ8fhZYveRh98Qf6VoVq 7CI/zeP6S2ji/WixOtOKBYxoilWhwqODIBq3vZdrwztU= X-Received: by 2002:a05:6a20:2589:b0:3a3:90d8:fd7f with SMTP id adf61e73a8af0-3a7f1ad4c45mr11338467637.8.1777921721582; Mon, 04 May 2026 12:08:41 -0700 (PDT) X-Received: by 2002:a05:6a20:2589:b0:3a3:90d8:fd7f with SMTP id adf61e73a8af0-3a7f1ad4c45mr11338418637.8.1777921720906; Mon, 04 May 2026 12:08:40 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7ffbcaa477sm10418922a12.31.2026.05.04.12.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 12:08:40 -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 11/16] drm/msm/a6xx+: Add support to configure perfcntrs Date: Mon, 4 May 2026 12:06:54 -0700 Message-ID: <20260504190751.61052-12-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: AW1haW4tMjYwNTA0MDE3NSBTYWx0ZWRfX16/6AH30yQJi QEhouSK5XWZdq71uWcL4rrWR0lIZ7BPJSwPhaG35L344xp0xlP5AfyETCCqEQomNpaUJGQn/s9K xJ6dg5HgOuboqlEHnMcAszTik5UzRD+awRjN/3Ofuejfmce4dstQ4JdoGE/8/9axxIX15A0kePd GmejM+1SUBmic2seWLsksZDxB9arOOq1S/LSV5m1VREv/wh7Ewn7a9Ie7jvcK0IJsRg+H83aFie xdb60wD3UA7Nlzxaje0NBNWxUGrvl9Jmg3tLitRlDijoiPJTU2n3Wo1c/WGdAFOSJjFkbsx/nNE A2o69Ye0+iO//hN6R3QPisEoThsOKHCMjG3+d/GyvDDM1sX8HHDrzI+g1Lug0tAHxo+GOziYAU2 tooVb4G1Q2oriAv6TE2teMrKzZs+aXkLUUQ9I1/XIkRNgIzIQJmadh+w7f5nbDw2WZKVof6OEsk r8ewDCQ07qPML+0SJgQ== X-Proofpoint-ORIG-GUID: v_6QK2g2PGJjQiTqwFyA9Yaa-sGl03eF X-Proofpoint-GUID: v_6QK2g2PGJjQiTqwFyA9Yaa-sGl03eF X-Authority-Analysis: v=2.4 cv=LdIMLDfi c=1 sm=1 tr=0 ts=69f8eeba cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==: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=oWecmCczN8450n14xlQA:9 a=uG9DUKGECoFWVXl0Dc02: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 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..30df9bfa9ef8 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; s < 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.54.0