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 9D5643DBD54 for ; Mon, 11 May 2026 13:01: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=1778504483; cv=none; b=k0wqFKi9zcnG1FvZ43o6QupAiuX7JV5iE+qoZo31PnH3miBAbinKWYOPwtUaIZYeW7GLv5sROqWE7gL4e/gl3BtorteD7QllWDI/8mxz5nAac/UEvWBiaxuiWkddvXcbrdFesTwZxaluTwMaurU9yIn3RcFqaj0MT3vQb9/Ixug= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778504483; c=relaxed/simple; bh=EM7ENbxlrlWP9nDeXhbulykziWmwjg0MWHFUydnf3Gg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tdp+h0SPgccsUMLxCUN626Rpiz+iw3NxC4Nu5JbjaKM7XTFPQSv1QvN8OffYArXb0KIobIFQq00UJ9H8ycysYR6dHv+nF4jrgJUzH6KYqa5SCNIb+r+YmX1X4Imxlu3hGDu2tdDFBTPL6lB7+xRWBnGtKZTr7VqpIIkkCtVhnOo= 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=onziXyfJ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=S8K3EwLq; 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="onziXyfJ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="S8K3EwLq" 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 64B9INEg652808 for ; Mon, 11 May 2026 13:01: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=nY8Zf16hfaV mHNExd3/Edt40koDFD/E4yWO1TVKH8HE=; b=onziXyfJAeQ0gE0fEb2+dLroqHe KgTRLUHSAKybG+MaWZLxrAxISf9bPlYYP6NugrZII8vKvB++LGWSZGj2XVFFur0E CTmNDv0qm09T3zwqqqprJAoAI4XgRcnDiMsi6d+c6Q5gngnTrx4Q3Y73cJkl9Q5B wAbevurssyaYHS38TZjHUVukgegJuAitLP/BzGLSZUJWzIuWh1q3wVl+Dr1NUkrS oIbSovLL5tHWhAh1bcGS3QT4j8cmRHjHvYdo54HVIQvnD3SGCt/CFUQnk+y+nq1q tQGQQjey3huLpJXAm5SXhqrXIzrRt8UQRHXk9ddhcOzzlggutle7T+ZZVCA== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e37xu9sn4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 11 May 2026 13:01:18 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-365fc4636bbso8295839a91.2 for ; Mon, 11 May 2026 06:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778504478; x=1779109278; 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=nY8Zf16hfaVmHNExd3/Edt40koDFD/E4yWO1TVKH8HE=; b=S8K3EwLqXwlQ8+9TzGs5/LN07CYEpiDMOifIniWVAE0bjSCqI3d7QavcN+cTe9suqk pnoiz/hUyKfcDt2XmBCq6/bZZpS42G3rc5+5+Z4R28bjT7ifn79bWsEogLOClkkjsxnG NDGfPoysEqN2sw88pILIeMoZatD+Zm/HLbJgd6hFRWUHJdRuLtbLAxo+P8e1AqoXOYTd MWOPegiIFVeRylVnhj9YjrQ0HWonCGDioraiM5Xa0oh41lMYVHWvqxOZTGzkX9xldOND uT/KO4HqEf/UBX3i1PeT4LrH1K+GgoVIieBefY1oCENiyqtdgC+QAoGPjMQaxOU6Fs9v waSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778504478; x=1779109278; 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=nY8Zf16hfaVmHNExd3/Edt40koDFD/E4yWO1TVKH8HE=; b=tWKOmlrq2gswKOhPCEkT9XX7Sc902cF5RPpwbL7bt2aB8i838qLnAnqY5PTBe9SqWa cn88KnQbF6eVlcIQsN8XDrkDsBw3o0TKHtDK4emttNR0RH2yjIcEdY8S3VejJsmziGuC jur8Fe2+zHYO79FkieuX3Y+txkSwTO1+0FvqPzsPSRMhImeI6OAXHN19UQx7pCu1d4gW kFmVBFvGz+zJmIP6xeJNEho4vhf6kKCENzJBMf3vk34eWw7M86mr4XRhXhmqW6sZDQt/ NxSIW3boLTdEDMz7zcYC40cG/n74htIKfiYTy/5V2DyGscT2pbYDw2qHa26i/oR/wYGW j/cA== X-Forwarded-Encrypted: i=1; AFNElJ8E7pCkvrVQQDb0BRxFrvV91Br2nkBTRXGJrFbfcEl1dKTdYDmRaPgqQNYoHEuhLP7dZ4vrNVqrA8LQYAM=@vger.kernel.org X-Gm-Message-State: AOJu0YzxngrAioVNlMeyKN/dvJb+vSv0Vx3cQ6jB2lUx3JkE7rICu0Kg Q0aafSCdluKc7hMuLB8Ru2S54XxxFqoFPkSkM3LVHQxkVeXcwC5fNdKtXQjzL+HGXck8qsJWtO1 hSOzifN9pR386EfWwTq2s7/b5ir1ePg7w513liXXulTSXPldEDdJI1lJ36gQUaQLdlqU= X-Gm-Gg: Acq92OEBCyM/ZSmmsBOgGuvWrSD5jsJruRkiJsyFfJmHw3AU1MNNYnAgoUsbpRhRiSY IRjkRLwfUNzUJ4ogJRhx30yPMLmHa+JSBbvLqUSS+t1Y8T1X1o//KYCFJvMn0mcwT8IP/3hmBGH 6nrJQbCMaSy7jGVTeAj4ditFposhH67Nv9/q1R0kq4ZN6ORrwCpkRZ2GQE+hSZbQ4DQBAqJo61Z FKonr/cht6MOINDKxCleBhC1K7U7A5TaOVOtGgyCWt2d+5/Y9I29uSP3W2hNi4PW3JkvvFP4ijv o4lyGoTVrInAxBv6cSDieS8sRga0fmPcVpuqPdDSJJkk46bH2t4Bhn1CozZBJedbyS+dfHvu7N9 rx9fCNezd+WcIxNMjxXVtGmJnHVtLuqmZ X-Received: by 2002:a17:90b:5746:b0:367:bf59:6f99 with SMTP id 98e67ed59e1d1-367bf597967mr11496356a91.26.1778504477879; Mon, 11 May 2026 06:01:17 -0700 (PDT) X-Received: by 2002:a17:90b:5746:b0:367:bf59:6f99 with SMTP id 98e67ed59e1d1-367bf597967mr11496005a91.26.1778504474449; Mon, 11 May 2026 06:01:14 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367d623fd6csm10370504a91.1.2026.05.11.06.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 06:01:13 -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 v5 06/16] drm/msm: Add a6xx+ perfcntr tables Date: Mon, 11 May 2026 05:59:19 -0700 Message-ID: <20260511130017.96867-7-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260511130017.96867-1-robin.clark@oss.qualcomm.com> References: <20260511130017.96867-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=EcL4hvmC c=1 sm=1 tr=0 ts=6a01d31e cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==: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=UuwE4gOO9k-hs8zF27AA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE0NCBTYWx0ZWRfX0sonFdX9TO02 yReTOq3OmAuvF8/wJw/BIBgtiTSo5hmDS+WWqEfdiaze7D32s9OWAE2NpfK+jwELR4UTdS1yJwf vUCj0Qe18aEj8D1m7czIOYsLBnfxPPU9cCNlOpE5o7AaJvzh335KFWl0uol+13lmD2Q2G6n2ikn snKVwsOUU4C0BYJv35qFrQEyZy3Y+uEdN/75iwossl1gWZuxRT49Vm1WKTreuqI18cE2cke6Xc0 YmlU/moy+Ng0B3Ggzep1RzRXRoI48LBuEGzDLDHCqONoYnyAYZhu+1tleBnla1+kZ/xifdfZ0ZI mA2OVXMawbQ98z7t0HRHyYTBjO5nxHbHRhKw/it+h0coajTY1e8uXukDFSnjVERt7D4WAvMqLag WSGQYk8hdIaYt/iRSju/but/lG2MwhXGW41sce6aTvHeDxZtEXO//I/JCfQIGBE/FzuZnMRLSzQ ds4mv65T8zktSLn+N/Q== X-Proofpoint-ORIG-GUID: bSRjW3-Iy9Cmhlr6jaNX2nKcVzFBFsaG X-Proofpoint-GUID: bSRjW3-Iy9Cmhlr6jaNX2nKcVzFBFsaG 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-11_03,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 spamscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110144 Wire up the generated perfcntr tables for a6xx+. The PERFCNTR_CONFIG ioctl will use this information to assign counters. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 15 +++++++++++++++ drivers/gpu/drm/msm/msm_gpu.h | 4 ++++ drivers/gpu/drm/msm/msm_perfcntr.h | 9 +++++++++ 3 files changed, 28 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index e578417a4949..727281fbef36 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -5,6 +5,7 @@ #include "msm_gem.h" #include "msm_mmu.h" #include "msm_gpu_trace.h" +#include "msm_perfcntr.h" #include "a6xx_gpu.h" #include "a6xx_gmu.xml.h" @@ -2637,6 +2638,20 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) adreno_gpu = &a6xx_gpu->base; gpu = &adreno_gpu->base; + if ((ADRENO_6XX_GEN1 <= config->info->family) && + (config->info->family <= ADRENO_6XX_GEN4)) { + gpu->perfcntr_groups = a6xx_perfcntr_groups; + gpu->num_perfcntr_groups = a6xx_num_perfcntr_groups; + } else if ((ADRENO_7XX_GEN1 <= config->info->family) && + (config->info->family <= ADRENO_7XX_GEN3)) { + gpu->perfcntr_groups = a7xx_perfcntr_groups; + gpu->num_perfcntr_groups = a7xx_num_perfcntr_groups; + } else if ((ADRENO_8XX_GEN1 <= config->info->family) && + (config->info->family <= ADRENO_8XX_GEN2)) { + gpu->perfcntr_groups = a8xx_perfcntr_groups; + gpu->num_perfcntr_groups = a8xx_num_perfcntr_groups; + } + mutex_init(&a6xx_gpu->gmu.lock); spin_lock_init(&a6xx_gpu->aperture_lock); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 78e1478669be..8c08dc065372 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -24,6 +24,7 @@ struct msm_gem_submit; struct msm_gem_vm_log_entry; struct msm_gpu_state; struct msm_context; +struct msm_perfcntr_group; struct msm_gpu_config { const char *ioname; @@ -262,6 +263,9 @@ struct msm_gpu { bool allow_relocs; struct thermal_cooling_device *cooling; + + const struct msm_perfcntr_group *perfcntr_groups; + unsigned num_perfcntr_groups; }; static inline struct msm_gpu *dev_to_gpu(struct device *dev) diff --git a/drivers/gpu/drm/msm/msm_perfcntr.h b/drivers/gpu/drm/msm/msm_perfcntr.h index 305dcde15c5e..64a5d29feba1 100644 --- a/drivers/gpu/drm/msm/msm_perfcntr.h +++ b/drivers/gpu/drm/msm/msm_perfcntr.h @@ -35,6 +35,15 @@ struct msm_perfcntr_group { const struct msm_perfcntr_counter *counters; }; +extern const struct msm_perfcntr_group a6xx_perfcntr_groups[]; +extern const unsigned a6xx_num_perfcntr_groups; + +extern const struct msm_perfcntr_group a7xx_perfcntr_groups[]; +extern const unsigned a7xx_num_perfcntr_groups; + +extern const struct msm_perfcntr_group a8xx_perfcntr_groups[]; +extern const unsigned a8xx_num_perfcntr_groups; + #define GROUP(_name, _pipe, _counters, _countables) { \ .name = _name, \ .pipe = _pipe, \ -- 2.54.0