From nobody Sun Oct 5 23:52:23 2025 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 466CD2222C0 for ; Mon, 28 Jul 2025 20:34:21 +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=1753734862; cv=none; b=dXK0Mm3Ntxo81uqEZ9hVmgOpIwSuX2iMhXnSZSzGui+zAO4JE8UCwsYVZKRk7/R8xm54PH7Cod2Kr1OILxrbzA8tRUT5Lp6LxyqyZKEOR/Xn8U+d8y0Cd1QHwaW9FaQPg9WKxRi6pasglkThXd/+iMLmdmTBYWkYxPBQvbOjt4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734862; c=relaxed/simple; bh=U+ZmNomacuLxHtKNQVm5cEtjh2nkXR65mIV/H+xO5dU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f21C/FW9QVCamAJxigoGUcgwKczXdT5d2Ex5zNVzsngxI1B5hPhDnuy6bXSmGIHo/AWc5qwdPHUZJhOyrmlKEWufaM6enEdy829hmEmvjxEFJWBtUFlTP+Dp20yy7fmIDnCdiDteuTgsK5I+6bQfVe/CQQmHNkBJWjKhssCkibg= 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=eVH+Tlln; 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="eVH+Tlln" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlNfi023471 for ; Mon, 28 Jul 2025 20:34:20 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=A0+lIarkug5 bI2XIrG4czP8gMx8w85UfEvs/RUlisrI=; b=eVH+TllnKQmh+pn8Li5q7mtiA5r teO23vGhVz372m5F06S0sneA01PZmQMLBtOr8PfuCtm91UC36diTq/BDvYfp+XLA 5N1ZEnGSAQXZM+4m9q/aDRNCo3RmdCv1oPm8T3FBVEMgYMjgecjbMpMg5co0uatf EPTF2cqwM1bX6qYjJWKl3gpxV0mgc0ojGUp367vC+bLp3eNrozTEBMXhw7N6ETN8 JHCWo+poPGUf5ci6hKgPHHefemzZGxSAGn3tG4rsN0tJyj3JCziNmAnoOoGcAmnx PaXB5VyvIAGDQa3U9HEjMke9RWeAOTn6pbU2oVELhvtI1yBy5yFL5sbOpxw== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484r6qnqxd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:20 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-74b185fba41so4595300b3a.1 for ; Mon, 28 Jul 2025 13:34:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734860; x=1754339660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A0+lIarkug5bI2XIrG4czP8gMx8w85UfEvs/RUlisrI=; b=qTVegyE9sO9qJHnEwSIkoCVFF//w9XCkpc+6IarCDGWrzgw7TxZKTPLNJzP6PWwIoR ffRCSvQA7rqEob/hydYKb6jFdu2Qt5s/66/e2v18GdROFKb1XADhD8KT7v51M2HMSYFU suXrStSY6qUxFniKvMjszBjD25ITN97BBDfd3TTZV4KhOrpsV5aOX/TtPPo1ZoK4b74L IAu4WMe62o7pyGAQ0OzZPdyCEJH/XA1b6kjZhJDbRUJRqb3DXt/8nT+luUon30bPiVsL fuAUlBKpXhZrk5NO1MByOcjss9iUo7zoAWtY1b5Od1onabTw3YfgX+thI8Expwc+8g+v Lf6w== X-Forwarded-Encrypted: i=1; AJvYcCXOh+NYdWncM4kTFbYx5eq0B4UhfQXWt0/VAMEolC4KxzF17U5VUaLERv/71vTznl+rCcON2e5wY9RI+o4=@vger.kernel.org X-Gm-Message-State: AOJu0YwOa+dtgAkv85tTNfsk5kakhLgcwMxrTnYNnnFINgoaAx8SzTrw VrX9Hi/YhP/n/muBGirwp3WA0moCTfyty5fTeifHhA0IqSZ4K2BigCQNWRClfOWpnFSU6RXNTj5 ra5CdLEbJ59KG4u/YjsBwy0exOLGXNznOGihDIIAB691wWBQ9171S/nUYFSUDUnWdrqw= X-Gm-Gg: ASbGncuY5yYRGtfx/cBgA82VNlO9h7Iz1RtKrDJyjsSPiYLuv5ISTFbL+ExhkCLEb7J JMoPdjWtnADXXZ6eyDqC8Gz3NOy8CiGMV7Ij1vFwkPy0obwdlcVAZD/Xpj8uULQqWyOP+2SyILc Se2jN56J+34YnYdPJ0sGeP1CuHpYuOiEA5msrSqBzS7tidRwUxaQR9fUx7WVSGW52izjiA6k9al 5cGx00EWYKBT6v1l0qSjIaD28ES5C3K6B9Gus5WDKgmbsApjGObSnLwww77nQC/CKiXZjB+yLAt HqjyOB6rW4MMTC8/vmJ1lYGQHcrd4JMnWLXKAJUhHpNluKdu1GY= X-Received: by 2002:a05:6a00:1384:b0:748:ef04:99d with SMTP id d2e1a72fcca58-763386bee18mr19109552b3a.14.1753734859646; Mon, 28 Jul 2025 13:34:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2U4D3i5dSnzRYsZjd3vL3u5W2DMJmemVWB+nFUZJ81pGCKxZrWX1gOYjxX0lk0X30atUWdg== X-Received: by 2002:a05:6a00:1384:b0:748:ef04:99d with SMTP id d2e1a72fcca58-763386bee18mr19109519b3a.14.1753734859229; Mon, 28 Jul 2025 13:34:19 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76408c02706sm6282388b3a.39.2025.07.28.13.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:18 -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 1/7] drm/msm: Add missing "location"s to devcoredump Date: Mon, 28 Jul 2025 13:34:01 -0700 Message-ID: <20250728203412.22573-2-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE1MSBTYWx0ZWRfX//8hBMJuroNf wsAvj6Raoh1gwqBI1bHq3YCsrapOUyFAqcwHCzAB0Rbn27ZiWfLJTvh8KMXHvl4xZ7KsAPu2yfo CYn/puuTszy8lHR1P+tk3gKPoR5CHkxvcjaxmgJ5Y0wp1/wHklGL/uY7eEoJcy1tXhaTnv97Eps Ktz5V/Jm8cLfawtSwhIlzqNr2Qt8HQ2IO/acvgT5K5yWDgLXjYt0LtsF5Dct4a0TPBOvP7gZEa2 bav7ugSdFydhJiJKxRVvYxVF4tDJBrqcuc9KQixvs7FfcqiKJ9mSZwfCY4+PVhSM0WVXGDbmlUM pZC1icDOc28Lmg8gm2VJxQuIlNGRzu0p1tdn/Nmn6N0nnDLKiOCuKNiLdTic+xmc3ih1K3MgEkC mrF/cXHU5g8QjpTPLTVjIF+HUjIvpRX6fLTh7132MIGD71FOW1Lq6QO8c3m3U40/S/dN5GBW X-Proofpoint-ORIG-GUID: fxKfUFzlVEMB3gBork6ZqHws3AzUhOgb X-Authority-Analysis: v=2.4 cv=ea89f6EH c=1 sm=1 tr=0 ts=6887decc cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=YFM8xwheDJGXjHaRWHsA:9 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-GUID: fxKfUFzlVEMB3gBork6ZqHws3AzUhOgb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 adultscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280151 Content-Type: text/plain; charset="utf-8" This is needed to properly interpret some of the sections. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index faca2a0243ab..e586577e90de 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -1796,6 +1796,7 @@ static void a7xx_show_shader(struct a6xx_gpu_state_ob= j *obj, =20 print_name(p, " - type: ", a7xx_statetype_names[block->statetype]); print_name(p, " - pipe: ", a7xx_pipe_names[block->pipeid]); + drm_printf(p, " - location: %d", block->location); =20 for (i =3D 0; i < block->num_sps; i++) { drm_printf(p, " - sp: %d\n", i); @@ -1873,6 +1874,7 @@ static void a7xx_show_dbgahb_cluster(struct a6xx_gpu_= state_obj *obj, print_name(p, " - pipe: ", a7xx_pipe_names[dbgahb->pipe_id]); print_name(p, " - cluster-name: ", a7xx_cluster_names[dbgahb->cluster= _id]); drm_printf(p, " - context: %d\n", dbgahb->context_id); + drm_printf(p, " - location: %d\n", dbgahb->location_id); a7xx_show_registers_indented(dbgahb->regs, obj->data, p, 4); } } --=20 2.50.1 From nobody Sun Oct 5 23:52:23 2025 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 C750922B8CB for ; Mon, 28 Jul 2025 20:34:22 +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=1753734864; cv=none; b=jxzM5ROdrg2ioarH+ZJ2X/IJpo4lXTSJbwBBcFwCEmGsPb3Ga8OWpLLgtLP1xYwCkvxhjOsrB/8femI1KlqujNfVul97RkTeJC032AuSWFJAEhTvP7H9kZXoLb+ddRBjZw4jqIGUz2twXSXj1N+sh85Q+cVOjEV6dHtYs/HCVxQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734864; c=relaxed/simple; bh=XjzBbwfbdEpy4W7vo1Z59g8aiB5UZLToq3ha1Cf9kVY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sZaw3Y/H/ep3Cy4sjjRybJ+w/t60ao26NxtkqlLuyeQ6fPmZjPzKvoImmMyF4jOBbIKZfK1l6zQIwOR6Mu3UM09KGkW0lUQTZXRWBEVoIu6RoshkYZg/k1vouQWiNIQl0Fc82tnDXSg6aDqmYjQb4/yrOfgD/ujKcxjaT+Thy9s= 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=jiT+1fOi; 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="jiT+1fOi" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlNsF023507 for ; Mon, 28 Jul 2025 20:34:22 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=V64f0Tb0OQD ZfJWk6fOVfLfxBrme2uWqEWKLnRNchS8=; b=jiT+1fOi7qMSWQineZfxMnSUJP5 ZM12idTth0Sysc5CpoKal88rAKbyegcqFNu0H36UAXrgZIFkPSFAbeDolJWOkrDp bbc7cwg3Oou7t+XYG0jWNGZ2Z+jDEmSuhL+zu1NAsQffTFmUab0wX5JGwLGwgXuF n1sDd4tCKqP1PzxqNiDAnkOaNKXYq2N5aHV6RrzaRLU+XEI0aPeNhEm3OAzSAs+M vxwEtnXvJotzFkXJAkQ6eGdxC/Y9eohw+Z2cAJO6/Cnq3jzyjliwEbgBuCKWzp4t 4ZxjksQm/pOoikZFVyTYdzQEncofAa2yriCjepEV8V9isZ+YnA4fqLVagqg== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484r6qnqxh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:22 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-313fb0ec33bso5896810a91.2 for ; Mon, 28 Jul 2025 13:34:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734861; x=1754339661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V64f0Tb0OQDZfJWk6fOVfLfxBrme2uWqEWKLnRNchS8=; b=R0/ELSYWdWGsfwNxZ0z9mzyswuXhuWenPebfv9OicCagbZi7HFTa8X8UMfrUGlwoeJ YQU5ZkSXxfm3AtkTly9eJYOLi85g9gIYVXko/1AalavFmxFFL9508PVmFcthU5Di4+wf ZWMgKkOybcUaIApLm2Ro/8RRnjTCuf+Nwj37frDV6/VKmonPtPf9PA/4jIHZ9PGytmpM yrewi9yb3JXsJWUMWL4+tHPrgOgqqv4XnJyADi/eKSi+6hQiAtHkwNuI/cRri7pTk34i IOQFyXnl56z8Jdy06OymJfjLoFzzs0mdmPS8jraH8nJi+RzRGfi+VvO309nz0VF0GLdV j3Iw== X-Forwarded-Encrypted: i=1; AJvYcCVWPb8ZhYvxokm/Xib2AwIL9w8y53WX5cQEMYkcj7surwkPlFCfLQIsd1OwgfH4D8WO8+nyr7GCt/o86jE=@vger.kernel.org X-Gm-Message-State: AOJu0YytZRGeDnJWhJnQMFIEKEQv8VCLEocs0+F1l4R8dDLjl2XqmWnb HWe0l9iV4DhWo3Z8AkC2nhA5SG+iUcaPVSU8q5ac0UBlGmN+8ECSUlnXFnoSaHwCiCLWaazJGav OBGsmXOh/9IGzto9PHULfe49DPcLIKyL8TtDrjHCrjooWZ54KjtL91CvOlDwjCqh4cNg= X-Gm-Gg: ASbGncvS5SbtIvH2XO1Badzzh9OrbHL7gN7/wV0Cxbj9xqDncD08bMbxMYxN0WLy4ik P0pyv9Cj0Qx/pY6+7CGZbfp4irydTaySf6xMlf/CHCfCqBQtxKxChOxCAocvOa9rXg0HlT6Bwar n+s7AyPPUWLd7M8MMnjSpDr17ZGAfZGd85irXUACkqTub9sXn1uOc8xpIFg8v6w3tRngA2wDsPf byoQI6r+iIiiueKo5c1LodC+T5oZm+D4DSuK87xL63Gvz8zoi06mDsyHO5KzqZPJB/Q/Pwp9R/S cAJFUMWJJhfTv/C0cz6VhypCGqtx6CUZtkXckhRwPek1LFZGlN4= X-Received: by 2002:a17:90a:e187:b0:315:6f2b:ce53 with SMTP id 98e67ed59e1d1-31e77a02a27mr17887860a91.25.1753734861168; Mon, 28 Jul 2025 13:34:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHR1UArWMnuT3Lfnq40WABT+az9jBP7E1GXqzV/gWXAwAyfbyAPGCkeu5AZxQwL8MukowkpPA== X-Received: by 2002:a17:90a:e187:b0:315:6f2b:ce53 with SMTP id 98e67ed59e1d1-31e77a02a27mr17887830a91.25.1753734860615; Mon, 28 Jul 2025 13:34:20 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31eb413d7basm4771303a91.16.2025.07.28.13.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:20 -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 2/7] drm/msm: Fix section names and sizes Date: Mon, 28 Jul 2025 13:34:02 -0700 Message-ID: <20250728203412.22573-3-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE1MSBTYWx0ZWRfX98Tx8BhGmxjt /X3aw/qGd86Fcm84pVyRuo6yD6sxYrsaCxZ3RTspEXAtLSwESy1yvlcvC/q8TMokYhE/vVpdVUV t7jVxRQ5riHmWaqSb5NM0yx/jgEtpwfJYESWEdjHeh3MQfZDgwD8lLDTHQUFqi9PVxhnwrT1Gef GLouEdoUzwOmRJX6Wvs5/qgWW6xDc+8g272JeSaywEVZL5ZcWmoGLTjunPWSacRYEQvcLwEOby7 n8XUO0FNxgpwW+S6xRI4Tcfr3eb4BRuWP/rKZl7RsJY4mVsgO6ly4jXU6o9w2iIEfw8jf4WevOR m62P+lGtEfVwFi3XVQdJEfVGKbXQt1ZHE7AGJAN/N5Jzi2PLqwspvJMdrEFrdinSMgehdS1w83x JgH6dL0fOzWguVSoTFs0XovaTOA1xgFKoft4RRsj7ZvwX7bzdppdOjo1Y/q70pujyBbJF6mz X-Proofpoint-ORIG-GUID: sgthKlpyPE7JbrpZDYGh-1keFmFueO4c X-Authority-Analysis: v=2.4 cv=ea89f6EH c=1 sm=1 tr=0 ts=6887dece cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=BuD92i612R-MOt5tPB4A:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-GUID: sgthKlpyPE7JbrpZDYGh-1keFmFueO4c X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 adultscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280151 Content-Type: text/plain; charset="utf-8" The section names randomly appended _DATA or _ADDR in many cases, and/or didn't match the reg names. Fix them so crashdec can properly resolve the section names back to reg names. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 38 +++++++++---------- .../drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 24 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.h index 95d93ac6812a..1c18499b60bb 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h @@ -419,47 +419,47 @@ static const struct a6xx_indexed_registers a6xx_index= ed_reglist[] =3D { REG_A6XX_CP_SQE_STAT_DATA, 0x33, NULL }, { "CP_DRAW_STATE", REG_A6XX_CP_DRAW_STATE_ADDR, REG_A6XX_CP_DRAW_STATE_DATA, 0x100, NULL }, - { "CP_UCODE_DBG_DATA", REG_A6XX_CP_SQE_UCODE_DBG_ADDR, + { "CP_SQE_UCODE_DBG", REG_A6XX_CP_SQE_UCODE_DBG_ADDR, REG_A6XX_CP_SQE_UCODE_DBG_DATA, 0x8000, NULL }, - { "CP_ROQ", REG_A6XX_CP_ROQ_DBG_ADDR, + { "CP_ROQ_DBG", REG_A6XX_CP_ROQ_DBG_ADDR, REG_A6XX_CP_ROQ_DBG_DATA, 0, a6xx_get_cp_roq_size}, }; =20 static const struct a6xx_indexed_registers a7xx_indexed_reglist[] =3D { { "CP_SQE_STAT", REG_A6XX_CP_SQE_STAT_ADDR, - REG_A6XX_CP_SQE_STAT_DATA, 0x33, NULL }, + REG_A6XX_CP_SQE_STAT_DATA, 0x40, NULL }, { "CP_DRAW_STATE", REG_A6XX_CP_DRAW_STATE_ADDR, REG_A6XX_CP_DRAW_STATE_DATA, 0x100, NULL }, - { "CP_UCODE_DBG_DATA", REG_A6XX_CP_SQE_UCODE_DBG_ADDR, + { "CP_SQE_UCODE_DBG", REG_A6XX_CP_SQE_UCODE_DBG_ADDR, REG_A6XX_CP_SQE_UCODE_DBG_DATA, 0x8000, NULL }, - { "CP_BV_SQE_STAT_ADDR", REG_A7XX_CP_BV_SQE_STAT_ADDR, - REG_A7XX_CP_BV_SQE_STAT_DATA, 0x33, NULL }, - { "CP_BV_DRAW_STATE_ADDR", REG_A7XX_CP_BV_DRAW_STATE_ADDR, + { "CP_BV_SQE_STAT", REG_A7XX_CP_BV_SQE_STAT_ADDR, + REG_A7XX_CP_BV_SQE_STAT_DATA, 0x40, NULL }, + { "CP_BV_DRAW_STATE", REG_A7XX_CP_BV_DRAW_STATE_ADDR, REG_A7XX_CP_BV_DRAW_STATE_DATA, 0x100, NULL }, - { "CP_BV_SQE_UCODE_DBG_ADDR", REG_A7XX_CP_BV_SQE_UCODE_DBG_ADDR, + { "CP_BV_SQE_UCODE_DBG", REG_A7XX_CP_BV_SQE_UCODE_DBG_ADDR, REG_A7XX_CP_BV_SQE_UCODE_DBG_DATA, 0x8000, NULL }, - { "CP_SQE_AC_STAT_ADDR", REG_A7XX_CP_SQE_AC_STAT_ADDR, - REG_A7XX_CP_SQE_AC_STAT_DATA, 0x33, NULL }, - { "CP_LPAC_DRAW_STATE_ADDR", REG_A7XX_CP_LPAC_DRAW_STATE_ADDR, + { "CP_SQE_AC_STAT", REG_A7XX_CP_SQE_AC_STAT_ADDR, + REG_A7XX_CP_SQE_AC_STAT_DATA, 0x40, NULL }, + { "CP_LPAC_DRAW_STATE", REG_A7XX_CP_LPAC_DRAW_STATE_ADDR, REG_A7XX_CP_LPAC_DRAW_STATE_DATA, 0x100, NULL }, - { "CP_SQE_AC_UCODE_DBG_ADDR", REG_A7XX_CP_SQE_AC_UCODE_DBG_ADDR, + { "CP_SQE_AC_UCODE_DBG", REG_A7XX_CP_SQE_AC_UCODE_DBG_ADDR, REG_A7XX_CP_SQE_AC_UCODE_DBG_DATA, 0x8000, NULL }, - { "CP_LPAC_FIFO_DBG_ADDR", REG_A7XX_CP_LPAC_FIFO_DBG_ADDR, + { "CP_LPAC_FIFO_DBG", REG_A7XX_CP_LPAC_FIFO_DBG_ADDR, REG_A7XX_CP_LPAC_FIFO_DBG_DATA, 0x40, NULL }, - { "CP_ROQ", REG_A6XX_CP_ROQ_DBG_ADDR, + { "CP_ROQ_DBG", REG_A6XX_CP_ROQ_DBG_ADDR, REG_A6XX_CP_ROQ_DBG_DATA, 0, a7xx_get_cp_roq_size }, }; =20 static const struct a6xx_indexed_registers a6xx_cp_mempool_indexed =3D { - "CP_MEMPOOL", REG_A6XX_CP_MEM_POOL_DBG_ADDR, + "CP_MEM_POOL_DBG", REG_A6XX_CP_MEM_POOL_DBG_ADDR, REG_A6XX_CP_MEM_POOL_DBG_DATA, 0x2060, NULL, }; =20 static const struct a6xx_indexed_registers a7xx_cp_bv_mempool_indexed[] = =3D { - { "CP_MEMPOOL", REG_A6XX_CP_MEM_POOL_DBG_ADDR, - REG_A6XX_CP_MEM_POOL_DBG_DATA, 0x2100, NULL }, - { "CP_BV_MEMPOOL", REG_A7XX_CP_BV_MEM_POOL_DBG_ADDR, - REG_A7XX_CP_BV_MEM_POOL_DBG_DATA, 0x2100, NULL }, + { "CP_MEM_POOL_DBG", REG_A6XX_CP_MEM_POOL_DBG_ADDR, + REG_A6XX_CP_MEM_POOL_DBG_DATA, 0x2200, NULL }, + { "CP_BV_MEM_POOL_DBG", REG_A7XX_CP_BV_MEM_POOL_DBG_ADDR, + REG_A7XX_CP_BV_MEM_POOL_DBG_DATA, 0x2200, NULL }, }; =20 #define DEBUGBUS(_id, _count) { .id =3D _id, .name =3D #_id, .count =3D _c= ount } diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h index e02cabb39f19..fc62820c0a9d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h @@ -1299,29 +1299,29 @@ static struct a6xx_indexed_registers gen7_9_0_cp_in= dexed_reg_list[] =3D { REG_A6XX_CP_SQE_STAT_DATA, 0x00040}, { "CP_DRAW_STATE", REG_A6XX_CP_DRAW_STATE_ADDR, REG_A6XX_CP_DRAW_STATE_DATA, 0x00200}, - { "CP_ROQ", REG_A6XX_CP_ROQ_DBG_ADDR, + { "CP_ROQ_DBG", REG_A6XX_CP_ROQ_DBG_ADDR, REG_A6XX_CP_ROQ_DBG_DATA, 0x00800}, - { "CP_UCODE_DBG_DATA", REG_A6XX_CP_SQE_UCODE_DBG_ADDR, + { "CP_UCODE_DBG", REG_A6XX_CP_SQE_UCODE_DBG_ADDR, REG_A6XX_CP_SQE_UCODE_DBG_DATA, 0x08000}, - { "CP_BV_DRAW_STATE_ADDR", REG_A7XX_CP_BV_DRAW_STATE_ADDR, + { "CP_BV_DRAW_STATE", REG_A7XX_CP_BV_DRAW_STATE_ADDR, REG_A7XX_CP_BV_DRAW_STATE_DATA, 0x00200}, - { "CP_BV_ROQ_DBG_ADDR", REG_A7XX_CP_BV_ROQ_DBG_ADDR, + { "CP_BV_ROQ_DBG", REG_A7XX_CP_BV_ROQ_DBG_ADDR, REG_A7XX_CP_BV_ROQ_DBG_DATA, 0x00800}, - { "CP_BV_SQE_UCODE_DBG_ADDR", REG_A7XX_CP_BV_SQE_UCODE_DBG_ADDR, + { "CP_BV_SQE_UCODE_DBG", REG_A7XX_CP_BV_SQE_UCODE_DBG_ADDR, REG_A7XX_CP_BV_SQE_UCODE_DBG_DATA, 0x08000}, - { "CP_BV_SQE_STAT_ADDR", REG_A7XX_CP_BV_SQE_STAT_ADDR, + { "CP_BV_SQE_STAT", REG_A7XX_CP_BV_SQE_STAT_ADDR, REG_A7XX_CP_BV_SQE_STAT_DATA, 0x00040}, - { "CP_RESOURCE_TBL", REG_A7XX_CP_RESOURCE_TABLE_DBG_ADDR, + { "CP_RESOURCE_TABLE_DBG", REG_A7XX_CP_RESOURCE_TABLE_DBG_ADDR, REG_A7XX_CP_RESOURCE_TABLE_DBG_DATA, 0x04100}, - { "CP_LPAC_DRAW_STATE_ADDR", REG_A7XX_CP_LPAC_DRAW_STATE_ADDR, + { "CP_LPAC_DRAW_STATE", REG_A7XX_CP_LPAC_DRAW_STATE_ADDR, REG_A7XX_CP_LPAC_DRAW_STATE_DATA, 0x00200}, - { "CP_LPAC_ROQ", REG_A7XX_CP_LPAC_ROQ_DBG_ADDR, + { "CP_LPAC_ROQ_DBG", REG_A7XX_CP_LPAC_ROQ_DBG_ADDR, REG_A7XX_CP_LPAC_ROQ_DBG_DATA, 0x00200}, - { "CP_SQE_AC_UCODE_DBG_ADDR", REG_A7XX_CP_SQE_AC_UCODE_DBG_ADDR, + { "CP_SQE_AC_UCODE_DBG", REG_A7XX_CP_SQE_AC_UCODE_DBG_ADDR, REG_A7XX_CP_SQE_AC_UCODE_DBG_DATA, 0x08000}, - { "CP_SQE_AC_STAT_ADDR", REG_A7XX_CP_SQE_AC_STAT_ADDR, + { "CP_SQE_AC_STAT", REG_A7XX_CP_SQE_AC_STAT_ADDR, REG_A7XX_CP_SQE_AC_STAT_DATA, 0x00040}, - { "CP_LPAC_FIFO_DBG_ADDR", REG_A7XX_CP_LPAC_FIFO_DBG_ADDR, + { "CP_LPAC_FIFO_DBG", REG_A7XX_CP_LPAC_FIFO_DBG_ADDR, REG_A7XX_CP_LPAC_FIFO_DBG_DATA, 0x00040}, { "CP_AQE_ROQ_0", REG_A7XX_CP_AQE_ROQ_DBG_ADDR_0, REG_A7XX_CP_AQE_ROQ_DBG_DATA_0, 0x00100}, --=20 2.50.1 From nobody Sun Oct 5 23:52:23 2025 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 28CE7225A32 for ; Mon, 28 Jul 2025 20:34:23 +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=1753734866; cv=none; b=gnaBSiHTfLK3JEHwcnDCm5CKEXv6j1lRwc3SPFEJID6a1REYcqFsJdvFEdrRvwx8bCz9t/3QRkUpRUKKyINDr3VmOy2jyrQUAEHFh+Pfyoz0b51JvHndlA/sGqtNwqr7bv+9L567VnSdvKMpMLCGxHXES+xL015e6E3ry7Be4GI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734866; c=relaxed/simple; bh=7b70Q5zVK0DyCnXcj0bZzDoejA++eiLTDbI0ImTj2nM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DXoP0HYaNzVasdmeqgf8G9VU5gLAK0r3t/FKmN3oiqlktFHwmulC80IK0hntBjcfe6BqZmcfgxqgzewemPmpRg4s/X6m4XMR3X0g1o/R24b6wjhxQIuzAmv8jB7FsttN1lRAdDyGsPUoLUu/vVX5TCV4SNNZbzYv/tCAD2ldZb8= 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=dyGqrtlg; 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="dyGqrtlg" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlLkp005055 for ; Mon, 28 Jul 2025 20:34:23 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=DJLMxQSPLul XmS86Qmm/+/LPCMloXGev8Y4y4Psl0K4=; b=dyGqrtlgUB93eDbcmXDouyadnwJ sNmpiwmsgyDI3+qLxbqFJVPzLsU1SWMAl5OOT55TRM0Eukkyn5WFy567grwzxSio yEWruDcHGv/Flv2AGfNskRvylbeg8Ulg+Ayrg0Lo7LErC1DcY0B1NoPD5LuGT0Fo XRXg/4km8fceVlfaNvyOSIbDzmTJOmLc30F6OxPXktAFheXPggZ5Mhne78PYTQ+3 TabloM8V0mIuEY21ENDdtGySXV7kTdXRdq2Agwycugt1LlODTTknVh28v4UvvNmu jRsCwFsJALaboxqmGHD1HJzmjlZnhbyDFtRMm6vnLJ3Dek7nVlk6tnXAHAw== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484nytx06x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:23 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-b2c36d3f884so3533491a12.2 for ; Mon, 28 Jul 2025 13:34:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734862; x=1754339662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DJLMxQSPLulXmS86Qmm/+/LPCMloXGev8Y4y4Psl0K4=; b=Zc2H/1bDGxDLB+HZDCvYV2O5+sfqoOqYiOjdi+6YKhQBY6aL8z+upMQpi7T+anzDTk G1d4lhXfrd+qaeAD2FN7tujSjl2tQhPFle6c6SxlDJ7Pq19yAV0EXrFT8ch4g6aEvQS1 joK7RlWdVwFI/sbka0bn28gSHMVCHDsSJbAUgK7Y4h5oEPJ12brtETsluajBvAXtSBXv DrcIlUE3zhxI8hq+f0EumqeLDbdR0e+hVHWt08VbYsPQU+37/0Fu9xDEas5u780LQ4I8 GxAJkxdyJx8RHrRgAoOoGJSaSdktEtVEbW+Vyk0bZf3h/FqRx93baS+Or3nBJsSG8kqy BttA== X-Forwarded-Encrypted: i=1; AJvYcCU2fOTlYLxfiwW9QwnsVD/6uUCLVQw3KiAXYyRoEP6T6HA0YHiupYT6ATFDbANRKUIgrQzXNF7mVTPuH7Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyBfo/6vBl0oef+1iaHHU2Z239g2Qcuh/aa0MaywaJda13zQZhA kJo+Nm78paZlk/IvRkhRzkqC5kdXPsoHG2UoRTUB6gB4onW6+az6yjJxQbngIj08CUyTbS427k1 1tuGIt/BufV8GzkTlHBsNkFRGHmwv/BjpKwqMobz4keXeyWZTZv/cI9aPlx8lbmNrkNg= X-Gm-Gg: ASbGncsPp7mZJC55dZWGb6Ws3guywRQrZ9sZJzsgkAMbnBpJjURWWLYxdgR7pDqGh2u Evr8dm5pMSwgopONaJRm1yj/beYucGj8JmF+8OVmbNnaDnHN467jfhMuq3E5e6dh3Bq51LxZY4n 6GnHTEZG9Z01WkcydfitVXTURAW7w768HfP1Li9yqfB+Q8WSITllWQ6b2FgBZD6jQ+IVhP9fx9o n8Bi+YcKZLSkd7tyu0pSKQta5QHJxq4pvfwnPjY2qks/k2y7AQ51OAKqtRdQ0RbK/tNAilzJkgS qyiNFh1E5hG6jPTuSINUi4gdrg7FB2ck2fmsvuXxRnckjFGf3fM= X-Received: by 2002:a17:903:1b10:b0:235:2ac3:51f2 with SMTP id d9443c01a7336-23fb3100edcmr234346495ad.45.1753734862414; Mon, 28 Jul 2025 13:34:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFuxUhcvGJgtF6rDcn2PilTqgQgn7t0oHSLKPK2e//pz1CGm2wbhZkHISTRxQ7mDDyxLpBecA== X-Received: by 2002:a17:903:1b10:b0:235:2ac3:51f2 with SMTP id d9443c01a7336-23fb3100edcmr234346205ad.45.1753734862031; Mon, 28 Jul 2025 13:34:22 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-240469a8111sm16679085ad.168.2025.07.28.13.34.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:21 -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 3/7] drm/msm: Fix order of selector programming in cluster snapshot Date: Mon, 28 Jul 2025 13:34:03 -0700 Message-ID: <20250728203412.22573-4-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-GUID: uhnnc9LYXa0F7FCnyF7Zs4vm_RdyvTSk X-Proofpoint-ORIG-GUID: uhnnc9LYXa0F7FCnyF7Zs4vm_RdyvTSk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE1MSBTYWx0ZWRfX5FnMWmbWp3mr +iDzEZuWnNrLYvFOkSnlBZU5ECki/Jyy3sUmJSfrVIKiJRR0q6MgRoTZfQxlWRfAtQ3N0EQoI6I dQDRxr4lVW3/tVLgkCr4P0gwJoJ7Y3WKBdgFve1NXrA89dbfuhF8P+PbF/DIbeUjgyYWNVSOk4N t6AgGEo/mMsO4NhwAHodCcKlT1bWUlIfBnzx0Km1z+BmNG6ORkv5WkV2ztP67OrklBYBaEsOSzB aKk4qZvDA91a1UNMqUAB0YGlOmaI1xX95nZdUOMvSqVlwCD771RlmBf4HAgIyJljD1zSvWSF1h1 uo7cjW64EmA8LDoCO6GECPPy8FDTKjb+UOWYmenkpgAPSWmOhcqImz6AdUgPMdZ/6VM9JwJfVZB D6CWVp+LHgxo7ULSzBgrqOtc09luJuu/7Uc9BosN/6UyIGWDZu/YeRoVH62VbpOI6Mspmsb8 X-Authority-Analysis: v=2.4 cv=CLoqXQrD c=1 sm=1 tr=0 ts=6887decf cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=5vtJ6i-I-lkEOiUwjbYA:9 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 clxscore=1015 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280151 Content-Type: text/plain; charset="utf-8" Program the selector _after_ selecting the aperture. This aligns with the downstream driver, and fixes a case where we were failing to capture ctx0 regs (and presumably what we thought were ctx1 regs were actually ctx0). Suggested-by: Akhil P Oommen Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index e586577e90de..b253ef38eebf 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -759,15 +759,15 @@ static void a7xx_get_cluster(struct msm_gpu *gpu, size_t datasize; int i, regcount =3D 0; =20 - /* Some clusters need a selector register to be programmed too */ - if (cluster->sel) - in +=3D CRASHDUMP_WRITE(in, cluster->sel->cd_reg, cluster->sel->val); - in +=3D CRASHDUMP_WRITE(in, REG_A7XX_CP_APERTURE_CNTL_CD, A7XX_CP_APERTURE_CNTL_CD_PIPE(cluster->pipe_id) | A7XX_CP_APERTURE_CNTL_CD_CLUSTER(cluster->cluster_id) | A7XX_CP_APERTURE_CNTL_CD_CONTEXT(cluster->context_id)); =20 + /* Some clusters need a selector register to be programmed too */ + if (cluster->sel) + in +=3D CRASHDUMP_WRITE(in, cluster->sel->cd_reg, cluster->sel->val); + for (i =3D 0; cluster->regs[i] !=3D UINT_MAX; i +=3D 2) { int count =3D RANGE(cluster->regs, i); =20 --=20 2.50.1 From nobody Sun Oct 5 23:52:23 2025 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 F25AE27A914 for ; Mon, 28 Jul 2025 20:34:25 +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=1753734867; cv=none; b=m0FhrNyXY3Jva8vmYaT9PDDImFqeSyyyyNGneaR2D+acJ5mq6UL6z0CKMjVepfVw7n/pcAhc397jMV660DXeijJCo+gGeaPlfYdLHHthPgsqNSXqgfvCYwyo59mHQyY5m4/SdbiqXrRRKB2IMyacZl73PZVgze+Vxm4JB6fozr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734867; c=relaxed/simple; bh=YAIH+E/3LvpO5GlPE0CQ+tsFKSmMasbpXzwo031Mlqk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YWRKur2eG3tCBb2gLxi8NZoRQp2KaP1tHosqKfNMXxtbv8m7G+g91QcU52Q36mRIKX9x8SDJPjFrkZ4rr4GhTiLb1TGOK4FBNNN3ry+nS4XcchrEuq45QNtnVCaVjyny48jvpWzbOdzE6q3bksB1x9hMPekqriHOWxjNbCPyfg8= 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=FA1Q0dNl; 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="FA1Q0dNl" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlQCN031280 for ; Mon, 28 Jul 2025 20:34:25 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=FblfID0Tg34 q4efy9/6mUQC/8o/8akfX96cV9gNqkhk=; b=FA1Q0dNl4ZOlo74+lWU/K+j9SLn jsjEAa/cqprycRJPxnNmUbP5+DGx9b1x6qkxk6DFI0ULhCn6nc/j4F221+n3TXwm 8QpimZafMakw53DB4k06w5XRnYvA+yCWwIChEjfaSLqdEOlL/qeng7N07gGd2WdS MNN1lA1AyXOLDh7wpF8jV9i738Ne0KRcHfkpKw9UHamcwW4VKl6i4UyErcs7cf/i 5+KGZ7Al25qVvuMxB1CdIwDfzvlpvnD6zqHCCTenOlzApGHcNe281LYxi/AxQRDn 4X2GPBzX5eKKCfxUfbuEApBfol8bbrDDf0K7klO0+qc+RSyBYWfdHJUsmYw== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 485v1xb5kp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:25 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-766607c02easo243575b3a.1 for ; Mon, 28 Jul 2025 13:34:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734864; x=1754339664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FblfID0Tg34q4efy9/6mUQC/8o/8akfX96cV9gNqkhk=; b=j8A9C/439DTEJbVWi7nl/fcqLViemlzW1KF4ivc5IXl4QRD9m5lNyZzt2QLbORL3HF BA97xJdPqJywDPhhsFqji5byiunAbPNEyMUYXm5gxjANnYeFEi10eNQzlMOPy1JXXyrZ PHkB4kL9LUhW/HXuAFcUd31z17xHHYPuaipz11XL7QZbpr9NJuQkb9msowIke6bxP0SM 5Qw8GuBXaki1dELyYzL6/flgF90uCLswrGMr7krgCADbyDLslL12v14LC/K+B5Ptc6Q6 l9Yxb0HzmcIqAQIK9gvjo3Ft3eBTiORGCuYQxFBGK1N+IFcRjSfnIPIHmrnwcRQgJpqW IyKA== X-Forwarded-Encrypted: i=1; AJvYcCWqwtu0W/xVCySVnUQKQ+w06Vysv6KnC/w7Lqg53oLNrSjuJDDTH1vSVjHNwCVtFZoclohF+r3AtXTXe+g=@vger.kernel.org X-Gm-Message-State: AOJu0YykuWvgEPVGqjD7DpepO6H4RGelUSZbqN3ohym8O44Sbx90wY2B FkxHquHPIw/e/YhvaDathuH4HyOsiQi4hmEdRYkjiOtRIuTkkC1FDCYak5ZB7SPgsmQKRGJkndc yG3naDH6tmN6folmI7vJOfUR8YtxcjL92QgYgkU6t/9QP6b9tI3vO8sZNeWdX5JOoqXw= X-Gm-Gg: ASbGncsaaHxfWdHbhsC5APhyc5bUocTG8SVtVpwZO8o7FPiQELP0xjx0LsaoyPZJCMg C2m52Xg/5m0UOoFv0rnF/HUaq3KIqFR6vmHW31TOGyS4YIoH2NosHR+hzlNSFSpD280ppEKshD8 z+/sSVmMtHNirY5QPAFUpGo8PzDSaQLJ6P/x2IDsKDUUwGXJXA4uvXjU0DqwMKvzB4ODq7b237N mvDBVRHl+/2DG4Y/X807TE/4r/SYdupRL1ni2EO8zAnHS50722uhQx9Z4R83Mi0lthGBih1VPNH ayDiAvDhCM4WW3C+ydhmNNPJRKgp1Us2EU/CcwviDkEccID8U9s= X-Received: by 2002:a05:6a00:3a09:b0:742:b31e:e9c1 with SMTP id d2e1a72fcca58-76967c8f960mr1024033b3a.11.1753734863970; Mon, 28 Jul 2025 13:34:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6V857zu2K5JXW/da9VThTUPhbu/3BvEVZayXh4F3IPipEL9YGCsaSIVW60VyqWLz3F3Hnsw== X-Received: by 2002:a05:6a00:3a09:b0:742:b31e:e9c1 with SMTP id d2e1a72fcca58-76967c8f960mr1024004b3a.11.1753734863448; Mon, 28 Jul 2025 13:34:23 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-767bc848735sm2919670b3a.28.2025.07.28.13.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:23 -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 4/7] drm/msm: Constify snapshot tables Date: Mon, 28 Jul 2025 13:34:04 -0700 Message-ID: <20250728203412.22573-5-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE1MSBTYWx0ZWRfX+F7kjUjxLuy7 U//W2wzLQMLgEOr3EFWO14YHxkwp0R1mjbx2gDAwkPikZIGLJanZBF1wl9aaxHann2nYqC72fzi sZ1NYgEoWVbznwqO1DoJ5+LPbHimvvBpJwH25ywfrwbzDbtVB9ghLjdiLbtnxfHobPEfDc+zakd WBGxdCRCx2j9RXr0C0M61gbzcyRSIiMZWUQSAv0+17PloL1A3VoetzMKt2WybiUzQ4MvaxsSKWW to+NchZv9UPdqXd++7GIrwmf2mt1Q1gnfvL1vAkUtOa+OM0D9jP57h6HVdiUO7kk43/E009oZWp B0YtJB82JobOkBnvkYm9x5xFnqM9R5T8vn2LTP4j6gvXCzGdhiBvky8TcRU7lp1J5eY+CIfllzG upO0PQ1rLw0VtfjTXmoHhC/HpGEPDYhxJdFYbhuKWpt8zULCkKzCJynf84nFFrWbfNIUnCNT X-Authority-Analysis: v=2.4 cv=JKw7s9Kb c=1 sm=1 tr=0 ts=6887ded1 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=3YnKlkqyfxy5QV46dWoA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: WLhnb-NONpbvEVq2dJD2jX2_yjSHmxB6 X-Proofpoint-GUID: WLhnb-NONpbvEVq2dJD2jX2_yjSHmxB6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 priorityscore=1501 spamscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280151 Content-Type: text/plain; charset="utf-8" A bit of divergence from the downstream driver from which these headers were imported. But no need for these tables not to be const. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 8 ++++---- drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 8 ++++---- drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index b253ef38eebf..7ba7113f33cd 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -11,7 +11,7 @@ static const unsigned int *gen7_0_0_external_core_regs[] __always_unused; static const unsigned int *gen7_2_0_external_core_regs[] __always_unused; static const unsigned int *gen7_9_0_external_core_regs[] __always_unused; -static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] __alway= s_unused; +static const struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] _= _always_unused; static const u32 gen7_9_0_cx_debugbus_blocks[] __always_unused; =20 #include "adreno_gen7_0_0_snapshot.h" diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h index cb66ece6606b..afcc7498983f 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h @@ -81,7 +81,7 @@ static const u32 gen7_0_0_debugbus_blocks[] =3D { A7XX_DBGBUS_USPTP_7, }; =20 -static struct gen7_shader_block gen7_0_0_shader_blocks[] =3D { +static const struct gen7_shader_block gen7_0_0_shader_blocks[] =3D { {A7XX_TP0_TMO_DATA, 0x200, 4, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_SMO_DATA, 0x80, 4, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_MIPMAP_BASE_DATA, 0x3c0, 4, 2, A7XX_PIPE_BR, A7XX_USPTP= }, @@ -695,7 +695,7 @@ static const struct gen7_sel_reg gen7_0_0_rb_rbp_sel = =3D { .val =3D 0x9, }; =20 -static struct gen7_cluster_registers gen7_0_0_clusters[] =3D { +static const struct gen7_cluster_registers gen7_0_0_clusters[] =3D { { A7XX_CLUSTER_NONE, A7XX_PIPE_BR, STATE_NON_CONTEXT, gen7_0_0_noncontext_pipe_br_registers, }, { A7XX_CLUSTER_NONE, A7XX_PIPE_BV, STATE_NON_CONTEXT, @@ -764,7 +764,7 @@ static struct gen7_cluster_registers gen7_0_0_clusters[= ] =3D { gen7_0_0_vpc_cluster_vpc_ps_pipe_bv_registers, }, }; =20 -static struct gen7_sptp_cluster_registers gen7_0_0_sptp_clusters[] =3D { +static const struct gen7_sptp_cluster_registers gen7_0_0_sptp_clusters[] = =3D { { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ_STATE, gen7_0_0_sp_noncontext_pipe_br_hlsq_state_registers, 0xae00 }, { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_SP_TOP, @@ -914,7 +914,7 @@ static const u32 gen7_0_0_dpm_registers[] =3D { }; static_assert(IS_ALIGNED(sizeof(gen7_0_0_dpm_registers), 8)); =20 -static struct gen7_reg_list gen7_0_0_reg_list[] =3D { +static const struct gen7_reg_list gen7_0_0_reg_list[] =3D { { gen7_0_0_gpu_registers, NULL }, { gen7_0_0_cx_misc_registers, NULL }, { gen7_0_0_dpm_registers, NULL }, diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h index 6f8ad50f32ce..6569f12bf12f 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h @@ -95,7 +95,7 @@ static const u32 gen7_2_0_debugbus_blocks[] =3D { A7XX_DBGBUS_CCHE_2, }; =20 -static struct gen7_shader_block gen7_2_0_shader_blocks[] =3D { +static const struct gen7_shader_block gen7_2_0_shader_blocks[] =3D { {A7XX_TP0_TMO_DATA, 0x200, 6, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_SMO_DATA, 0x80, 6, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_MIPMAP_BASE_DATA, 0x3c0, 6, 2, A7XX_PIPE_BR, A7XX_USPTP= }, @@ -489,7 +489,7 @@ static const struct gen7_sel_reg gen7_2_0_rb_rbp_sel = =3D { .val =3D 0x9, }; =20 -static struct gen7_cluster_registers gen7_2_0_clusters[] =3D { +static const struct gen7_cluster_registers gen7_2_0_clusters[] =3D { { A7XX_CLUSTER_NONE, A7XX_PIPE_BR, STATE_NON_CONTEXT, gen7_2_0_noncontext_pipe_br_registers, }, { A7XX_CLUSTER_NONE, A7XX_PIPE_BV, STATE_NON_CONTEXT, @@ -558,7 +558,7 @@ static struct gen7_cluster_registers gen7_2_0_clusters[= ] =3D { gen7_0_0_vpc_cluster_vpc_ps_pipe_bv_registers, }, }; =20 -static struct gen7_sptp_cluster_registers gen7_2_0_sptp_clusters[] =3D { +static const struct gen7_sptp_cluster_registers gen7_2_0_sptp_clusters[] = =3D { { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ_STATE, gen7_0_0_sp_noncontext_pipe_br_hlsq_state_registers, 0xae00 }, { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_SP_TOP, @@ -737,7 +737,7 @@ static const u32 gen7_2_0_dpm_registers[] =3D { }; static_assert(IS_ALIGNED(sizeof(gen7_2_0_dpm_registers), 8)); =20 -static struct gen7_reg_list gen7_2_0_reg_list[] =3D { +static const struct gen7_reg_list gen7_2_0_reg_list[] =3D { { gen7_2_0_gpu_registers, NULL }, { gen7_2_0_cx_misc_registers, NULL }, { gen7_2_0_dpm_registers, NULL }, diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h index fc62820c0a9d..3785b644382e 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h @@ -117,7 +117,7 @@ static const u32 gen7_9_0_cx_debugbus_blocks[] =3D { A7XX_DBGBUS_GBIF_CX, }; =20 -static struct gen7_shader_block gen7_9_0_shader_blocks[] =3D { +static const struct gen7_shader_block gen7_9_0_shader_blocks[] =3D { { A7XX_TP0_TMO_DATA, 0x0200, 6, 2, A7XX_PIPE_BR, A7XX_USPTP }, { A7XX_TP0_SMO_DATA, 0x0080, 6, 2, A7XX_PIPE_BR, A7XX_USPTP }, { A7XX_TP0_MIPMAP_BASE_DATA, 0x03C0, 6, 2, A7XX_PIPE_BR, A7XX_USPTP }, @@ -1116,7 +1116,7 @@ static const struct gen7_sel_reg gen7_9_0_rb_rbp_sel = =3D { .val =3D 0x9, }; =20 -static struct gen7_cluster_registers gen7_9_0_clusters[] =3D { +static const struct gen7_cluster_registers gen7_9_0_clusters[] =3D { { A7XX_CLUSTER_NONE, A7XX_PIPE_BR, STATE_NON_CONTEXT, gen7_9_0_non_context_pipe_br_registers, }, { A7XX_CLUSTER_NONE, A7XX_PIPE_BV, STATE_NON_CONTEXT, @@ -1185,7 +1185,7 @@ static struct gen7_cluster_registers gen7_9_0_cluster= s[] =3D { gen7_9_0_vpc_pipe_bv_cluster_vpc_ps_registers, }, }; =20 -static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] =3D { +static const struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] = =3D { { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ_STATE, gen7_9_0_non_context_sp_pipe_br_hlsq_state_registers, 0xae00}, { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_SP_TOP, @@ -1294,7 +1294,7 @@ static struct gen7_sptp_cluster_registers gen7_9_0_sp= tp_clusters[] =3D { gen7_9_0_tpl1_pipe_br_cluster_sp_ps_usptp_registers, 0xb000}, }; =20 -static struct a6xx_indexed_registers gen7_9_0_cp_indexed_reg_list[] =3D { +static const struct a6xx_indexed_registers gen7_9_0_cp_indexed_reg_list[] = =3D { { "CP_SQE_STAT", REG_A6XX_CP_SQE_STAT_ADDR, REG_A6XX_CP_SQE_STAT_DATA, 0x00040}, { "CP_DRAW_STATE", REG_A6XX_CP_DRAW_STATE_ADDR, @@ -1337,7 +1337,7 @@ static struct a6xx_indexed_registers gen7_9_0_cp_inde= xed_reg_list[] =3D { REG_A7XX_CP_AQE_STAT_DATA_1, 0x00040}, }; =20 -static struct gen7_reg_list gen7_9_0_reg_list[] =3D { +static const struct gen7_reg_list gen7_9_0_reg_list[] =3D { { gen7_9_0_gpu_registers, NULL}, { gen7_9_0_cx_misc_registers, NULL}, { gen7_9_0_cx_dbgc_registers, NULL}, --=20 2.50.1 From nobody Sun Oct 5 23:52:23 2025 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 4D1F027B500 for ; Mon, 28 Jul 2025 20:34:27 +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=1753734868; cv=none; b=DsPwJv/+ac91/6ziyiT/icGRE9pK9j7axypw6k/Fhsf40ydh3erZf7tCnu9lIOYbXG74rjJXZTe3Ivz3oT29vzsUtnO3nJ60cXYvuhkCmeEH+cSPKAEJs3cD7OD2RlUJXuMoS1tWnetqMh7uocfkSPn/Kv0pvx0yH5XSe9cQj0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734868; c=relaxed/simple; bh=8V6l3AP57/Q2ToIGiQ4XYsiXilViuzjLKRtk6DrANT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oQNkbxJO+EOozgfKtGGc/IR9oshA1Tolm4n9rcfOc1VeMjr/8yEMqdw5iYLLMqcgKw7Y+eyrgALOzBmzoGdDv2XteeCl+8F2KzliqTC14Rj3Jj4gl2tba5PCw6sXeM6E91cTAvmUgeAhi0wK3v/y5GUtuFZHA5HsOQmR628/TYk= 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=Zn/Jihe6; 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="Zn/Jihe6" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlLCT027710 for ; Mon, 28 Jul 2025 20:34:26 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=I8t+2xKA9TH HZTmJzGvWTh6YVgWzaeQG0zONpcACs58=; b=Zn/Jihe6d+bzp6z/IcaME1UWJC5 GillVYY1LDFxQ1lU6yCMRy6zJ9eDOUpeeLk2BDSfXrjIDPQdU1oqHMxhDHUsX0nI fZCvXDNCn/8+y3k9RddhKe94kfDoKawqT6p4oGEaMFFBNWFsM6EimnAHT4AsWrMB dXERVW8mi4U+Fe3AXQ6Vtouqcps7GtB68ykAow32KhqSJkp//9DAi0pnIbWeMyXV LuVpFO5gOaYg2vAnHqZpHBPj5eh1ubi0qfopGR/VIPND7xH/AgUkfWI/FyW7tP5j g3LLkwIe9X4zDktg0zi+FtTf7taMjldos6ut6xJp+zya5amVH5tQ33zOzkw== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4860enu0h8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:26 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3141f9ce4e2so7616217a91.1 for ; Mon, 28 Jul 2025 13:34:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734865; x=1754339665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I8t+2xKA9THHZTmJzGvWTh6YVgWzaeQG0zONpcACs58=; b=P1nueIoORRnUPtfxcGWiJ7tjI657yJZ3knz3WnJYaIuB08SYF5CtwfNQSZJC+ITVbT rv20iaeitbc7XDq/4Pk3CTpH0W/P6CfS0hi2Gf4EUxCqhL/LrUatyN6emPihGb478H4r vZCx6kbELOqqRfwO4gOXcHzsxzE5fvWJWD85GWZxzG9OjTGLMVWOJtzNai3wF9qQO17e hcb8SDnB57cNFSNi8HkuMi0rSM1lvBdjDrDctRuowN4g2l0ecsIIpWFxyZ6SxlVt9AV+ dOj28zsBSYl4zkbmITrUJI+2312x0OZHWeBNWrj/+8qWlkAvXi1r2AMmVix7YGwYVp6X ti1Q== X-Forwarded-Encrypted: i=1; AJvYcCUEENBLxhFcTNGirZzdjYkKbJI0AQfUe1JG26vmav3gdZptC+GTU0DA8olBY9ehSjw9sFkTqau2uomsXJU=@vger.kernel.org X-Gm-Message-State: AOJu0YyEcSZYTPEbvvjSvSJlAz35ugoz/ZgnA68YDZnRTWKhKbJOMp5k 9I7k0CJXt/xBdfzUS9NQcu4+R5AFoQk7snQRllNK67XaEo2yHS48J2j8qcmOvWKskog7lhPoD8S htB6d1TKGLcqzjpWjOmRfVBrHfxO6TQv6cNTGjxkf311TrTivrpE9S6ZOJoNWQUm7VHjWjzZ071 E= X-Gm-Gg: ASbGncv5bQrZvgh5ssNA+XcNS1k9HsTa1r4CHhbGNpP3Gl0zQU6RYC95qVD6qELX4FR bO3IHCfkGADlsvomECW6MTKpBcnY8fmVfUwu/XnLEJ7eImM33vL4F6dZdoYPm7ETLeJ0EdqEn/n jm2n9NisDNssGN4hTwHuQ5SAonLHiopvO81MQe7haoIJCd09BBCoFjs0Z0rMwVVkxtZsG5FLssb 3c5GW4vMNaG7SwrE2WG0bff1vefXoifHwr+q5Cn/Utzc0tsfyUYvIs3aQ3MSYiCpNf3ZlepVoUw SCZXNujRg2pnoA4fsTDN7POjRI9j3eEQurX+QMsu6Bc0+cErcaE= X-Received: by 2002:a17:90b:2409:b0:31e:d2a5:c08d with SMTP id 98e67ed59e1d1-31ed2a5c5a1mr6681373a91.33.1753734865324; Mon, 28 Jul 2025 13:34:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdlbZQJgZiV/klf4QMEE5MCR2s1YEQimkMRUs0qJyT+RaCeltmukYVdgn4Uepp3jzkO6MZlA== X-Received: by 2002:a17:90b:2409:b0:31e:d2a5:c08d with SMTP id 98e67ed59e1d1-31ed2a5c5a1mr6681351a91.33.1753734864911; Mon, 28 Jul 2025 13:34:24 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31f00e778f4sm2480959a91.23.2025.07.28.13.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:24 -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 5/7] drm/msm: Fix a7xx debugbus read Date: Mon, 28 Jul 2025 13:34:05 -0700 Message-ID: <20250728203412.22573-6-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-GUID: BadAC2VHWj3_cveHYJ0v_Av-h0WyN1yX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE0OSBTYWx0ZWRfX5xXn7lvvIySq pDpWaDk4CihSyt8c8GglcE3dBEXeEjob9TiL4UittMztYrv8mELYsYcRUY9MVa+bMw2Mm4RREJ0 SN71wCFV8+Ni/FQLK4Wg0af7z2hSDUCE8AJb7WA2hakPFnmLrwLH1vm/YP26NxOo8vEqnzPwVHM AxlTvpVic3nUf0BHBo8jRrgnLlO5PJpwd6I6aOqMozcy+9FRUOCANnlo39OHsoRAMP1blDFf3Ox 7ltlE03qnP8bA002cn3HA9BE37ZleSaF07rpWRZXCkrWqYNJhb0ekmRiZ6JT4ZHGk1J7NLZw3I8 n+vbfm/726UOydKYClhzl5VmSdzPBJTeHNmTS/WvnHL7FbC0rSyEQQjkA/hN3iab84byYRDxhpc t7CvJBC3cOKDAENqXEnf36NHk30g0vEEC7DdsdapL8Rosujf9n3WfdZQEOM2JzfBuClxXFkT X-Authority-Analysis: v=2.4 cv=DIWP4zNb c=1 sm=1 tr=0 ts=6887ded2 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=E4Rgrv4FocJ6r0LxV30A:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-ORIG-GUID: BadAC2VHWj3_cveHYJ0v_Av-h0WyN1yX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280149 Content-Type: text/plain; charset="utf-8" The bitfield positions changed in a7xx. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 7ba7113f33cd..33df12898902 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -174,8 +174,15 @@ static int a6xx_crashdumper_run(struct msm_gpu *gpu, static int debugbus_read(struct msm_gpu *gpu, u32 block, u32 offset, u32 *data) { - u32 reg =3D A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX(offset) | - A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL(block); + u32 reg; + + if (to_adreno_gpu(gpu)->info->family >=3D ADRENO_7XX_GEN1) { + reg =3D FIELD_PREP(GENMASK(7, 0), offset) | + FIELD_PREP(GENMASK(24, 16), block); + } else { + reg =3D A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX(offset) | + A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL(block); + } =20 gpu_write(gpu, REG_A6XX_DBGC_CFG_DBGBUS_SEL_A, reg); gpu_write(gpu, REG_A6XX_DBGC_CFG_DBGBUS_SEL_B, reg); --=20 2.50.1 From nobody Sun Oct 5 23:52:23 2025 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 50ED127CCF2 for ; Mon, 28 Jul 2025 20:34:28 +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=1753734869; cv=none; b=WWzg6/D53bqbJ7s3+ilx9CMbkmt5ukyhtFCbVXx/FYvDjLXmgm0kJbZdfBZU6FidjdPoTkSfe2Je/gvadFSSj584+cNZAuANdKon+ZQjEfEOTgVRh0ykCkmQu69ImEuBUYx/u2vlAABP0WSNQS3e/yj2oRVlp18wUX80Y9AU4r8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734869; c=relaxed/simple; bh=DkcFgrXlcxwrYVvJKTGLyt7PuaR841KGpI8Wprw//10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H1nLc5J3QstHhiaTMHTna1kPdwyaDHaRQgGlC6XzxlMDm6DzgrdfueJyYMT07kLuLEkQtO3j15ij+kwJ9In6IQPHDtTs7lq1lOXGuyu+A7xB60UjmOxfH0Lb/9/oj5mNQxqUPQzf53aIcXXxbUV+O5QEOeD4ExetRw4BDLRzR4o= 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=gxT81nkX; 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="gxT81nkX" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlMAG018859 for ; Mon, 28 Jul 2025 20:34:27 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=9HL2ElAARF0 /fbev6G08+6TVwHe8Nc/ReEeD7pJWGHU=; b=gxT81nkXjsjgayio9XdonbnMeD7 L2+voPgFoghEPofYHzvzSJ3hLfkheUpUwp6AJecqOkRU/RpXsAyZVmft8OLRHRnp OSDvwcAEzcHv/ElcJ3SY/f1Qbxxtxxa+xYZ4qM17D4MU5kHoyDqkRFBXqyE92xrg DENhi4NVNJJ8NBdEu/wuWBSRQKoO9FfrcFszkovsvso92EplmAaXrABkXkSeOgXn fWB0pahpyQocRVNF4ucOqG89ghmh/G9mxs8epGopELP7oQ97O6fGXcHyR6TM2+G8 0SEehKRpk9xWcynZbgpAh4d1yU/CcuhsMleGjbACtCb06aQ1m8BJo5lihjA== 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 484q85wu31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:27 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-31f2dd30823so225723a91.0 for ; Mon, 28 Jul 2025 13:34:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734866; x=1754339666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9HL2ElAARF0/fbev6G08+6TVwHe8Nc/ReEeD7pJWGHU=; b=JePXXzAVcUp5HBWrAjM0CoUQNUtdBHpKt8Mn1Ic/BZvwyU1Iw782h9JZeeijsEI/kB d4MwcR9+PUkYfmXwQteZrV1aTFHVkgEQaUKxSKPqRe+CjQh+eAZUh2Zxz0Os3Kn/iqU+ rTtxvR2it9GBq7wJzjXU1WqNV/4QeX/Nl4fg/YFiEzdpO0jyM8H9rsAy7ChgVHUxZg0B DedpW8spoIoao06DqgGh9La5hYcygfxG1exbBUBrR2ZEw8B3ujD1HgPqOmyTFv1HGWfe yUEsvdlUITRI/MoflmglHJZ6ZLTie+0l2zUzxgheZHaH2CNHhJJUnTcRyfOH9yIXaq1F XtOw== X-Forwarded-Encrypted: i=1; AJvYcCUiuH8sP2/2NQPNUudfNO7xoWNYUnxF9tYT7PKrQC5OFoxhrmlSN4Vrt7MeU9i6A6C/i9rXtjkyZH8GVmc=@vger.kernel.org X-Gm-Message-State: AOJu0YyfrbZGWg72iV1MseUT+LN//dQ0I6QGfqTboE7gQSJwk7HynXza DkYWlUqawBHT5i07Cw7Bb6DsJKWlVoISLeaafmSfnCLGXzKwrKHP5UtpbmKAd2Ayj6sPx9qp0UC fHfzKhbJWPxsz0xGqPpZAZpO1sWi0IjDgQMSmDddqUK6dz41Cmhbt9n/XRK1Exe8fFkI= X-Gm-Gg: ASbGncsCrMKXDpI0LbDjHE/yJ7OOwlimXMRWHPyq/jsLXFbe+e1zMf0r0rjQ5QtOiR4 lsJdNI9l2u6BWq7D1N5FmWT/cnsJO2y/nB/rwwm5zmsGOUc2O+Q6tAQ87QImSlAEVIqJ0FBO3ha HX5rMMkqkMTHcbVh2xMBv4A8NUcskTVkVdcl2MWsDDMq7YJysuwUPDyVO5EdvcHM5t+K1Gpxas+ h06KYmuZZzMTd3AtBVIWi38p5Uuxs1UFtogOzcmvHJcU7UIEeQykF6/IOEy9EHM2hJ/Abzv8Bp6 uOHOAu1S1/KsMHIuk4Re+GdquLxnQfeP+FF64rOhyL5+c6ngtSw= X-Received: by 2002:a17:90b:564f:b0:313:1e60:584d with SMTP id 98e67ed59e1d1-31e778582ffmr20598902a91.11.1753734866629; Mon, 28 Jul 2025 13:34:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEdJ9/dscUM4BqdHSg4PGTK5hxCSdAWWgSIKT1qLZOsCkP8tbWQs3GjcAPYzq2dmolO2Bt7g== X-Received: by 2002:a17:90b:564f:b0:313:1e60:584d with SMTP id 98e67ed59e1d1-31e778582ffmr20598863a91.11.1753734866210; Mon, 28 Jul 2025 13:34:26 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31e83545d23sm6505289a91.31.2025.07.28.13.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:25 -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 , Connor Abbott , 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 6/7] drm/msm: Fix debugbus snapshot Date: Mon, 28 Jul 2025 13:34:06 -0700 Message-ID: <20250728203412.22573-7-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE0OSBTYWx0ZWRfX4oGML3raIRg6 HrB8uFEy7rBfECNZhYSkyEeKrajo3633iXGvY8QwU8XqgwoFTtAZg4o34ycihb4VnpShIBx6lk4 cepcCINoq/Lse6gvFrLl6/S/y0s5xjJR8Y+IpaZUvl39shmwH6aX2ZQ9OekvxgnDORBr5Ob2qMi 5YulHBu0BQ/9OKttft2g3nD9QNtMNi/ycSSXVVLfzFtsgO0d/jOWStMOkcvRHN8SV6+lp6+4DxP +82zEPPPvFna8G0QN38Acg6Wj2huHqkkxcvv6unlKwvCUrSpPADd1zm/89c1HfdEFfg4hOpamBL d4Jb2kdU19bhhMTVatNSXjRBlzBxsMDYWca2corvMrC0FAEOARWQA/UJ2EDtAeaLV4hDqv8lUnm 3OfVv0UPMCaRb8VCfLUwYue2uq1aRCLWZ2GCqYEGLQwbEyyZZmKaPdAJ4fneb4Ac6P3mcC4A X-Authority-Analysis: v=2.4 cv=TqLmhCXh c=1 sm=1 tr=0 ts=6887ded3 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=Q8ed3UK4sgpFGPsrdooA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-ORIG-GUID: zadFZwKJzpzcBZGeOIqvyBJpWQA4SZNL X-Proofpoint-GUID: zadFZwKJzpzcBZGeOIqvyBJpWQA4SZNL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 adultscore=0 spamscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280149 Content-Type: text/plain; charset="utf-8" We weren't setting the # of captured debugbus blocks. Reported-by: Connor Abbott Suggested-by: Connor Abbott Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 33df12898902..4f0d8c0e6ac5 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -430,8 +430,9 @@ static void a7xx_get_debugbus_blocks(struct msm_gpu *gp= u, a6xx_state, &a7xx_debugbus_blocks[gbif_debugbus_blocks[i]], &a6xx_state->debugbus[i + debugbus_blocks_count]); } - } =20 + a6xx_state->nr_debugbus =3D total_debugbus_blocks; + } } =20 static void a6xx_get_debugbus(struct msm_gpu *gpu, --=20 2.50.1 From nobody Sun Oct 5 23:52:23 2025 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 B7C8327FB07 for ; Mon, 28 Jul 2025 20:34:29 +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=1753734875; cv=none; b=MKmDfaMVqyoDN6M/EFmi23UHVyPa0GvKUtRb+moSQmypYBCXCiOrli0SQagJOsLKzkqjk8rJWPXg5smj9w8XP6QB/X7lSI7rbPgE2xxCAv6osaTqybysbv97DSZtSLyXLkQNwkwRDEQoX0JTsbM6OWLLmGu4QicwcY0HcE0HxcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734875; c=relaxed/simple; bh=a1xn1H8/fa/A9qraVB8eAftc2nCQicSPOhezcVcH5EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hUUZ4r2l3ymLDchr+Msp6E2w8QAr1Y+IFPuXXjpy5C40dLBZm0STZIZ6AgrMN77KAM6UwM8TSBsyqcU0EpfSfQ69lewSkSHbQ/4MFO1zQNwgRylvvzUJSWrOQpC/tz2l4NM2D5f/nJthn7N7QgXu+ggzAw/L7IXN5MOH/J3jnGQ= 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=UQnJb8OL; 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="UQnJb8OL" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56SAlInu027612 for ; Mon, 28 Jul 2025 20:34:29 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=V9+fcbz7W94 r3G/u7UQJHN/TfdQW561mZf8p47PIeZU=; b=UQnJb8OLWP9QwXGogs/DlkXf7Vm zpe+3nPYqDV73hH5QmVsF1roKS4OGWEL3pbWD4iayMxZm3VJe4BZ5NZMEtKL2MbX A7KgUc9TvKS2opSSx9Zyf65Fhsi2r1OC4fGNmWZlCVqZ4qJe5pE/N92kvaoYyR+e siRfoXrTEpn/JqYkFYnQL6t/YwtpTGkBG4uLuoyqH6680TT5IjXnxxhA2+eUh9Ya J/nXg0CdXetsjayL53lOMwl0D6vdiDj9uNVaJTQSFbNAH7tApY1sFKfM3npPLy8h J15A4g04+UcUrb4/1Hp3n1EpzdqyTiJN8FeR5xFmjrRsDtrbvnbINTzmXpw== 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 4860enu0hf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 20:34:28 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-23632fd6248so49486285ad.3 for ; Mon, 28 Jul 2025 13:34:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734868; x=1754339668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V9+fcbz7W94r3G/u7UQJHN/TfdQW561mZf8p47PIeZU=; b=SDqw1YHU58A2eIdL6Ul7Az0Mvp6sIT4YDtuMlVBwuNob67Zs5bMD/Xr5lQevwp9TlN eu3eZqV01gqpgRSQYDI1Ej+FSWk2AiszeZv2Jz6zjl/CNjI/YFLIYJfWjluVMxvbtgpe uNYdrDKxrkpDMhMnJs4ZdkUmXyrYZ5RU5X1S/eSDIciKYXHO6Q8xHyLrfl5ceD3Ay2j/ sQBLOYSlmufHY3NGLGPpIpG0JzDBj+dSaX0sW8jVCSFAcl3BFSkDAASwANvWkO4OPjwz CTpb/CgFoIUnwztgqvaTK+37/n9ddMs68E+URbzLf95L7224tHRBHrSRIDbbhLsJpljj QuPQ== X-Forwarded-Encrypted: i=1; AJvYcCWlnPI7gB0/AX9+frPekNom6WHBblL+wJZwP6b37pvnEu7IcrvbmuyHi9MmzF1zmwTB1dOpYmxZdZA1VDk=@vger.kernel.org X-Gm-Message-State: AOJu0YyQePU0R8SVi/xCNOn3Dy+AjiJJyrTUm+NT0yASlBc/XOQ78jRt AOe572IjWZYdVo1389WdOWPV0NVg6Ccx/PNERRQiJRxx4kfoJDkRI5oYH2qHtSUn2ICsrtfhepT Xu8v7FtTFsuaSkNUnbkrP4hJg0UXHE7BTjBL1cmOaxF84kHi0zV8gy58syRHQmQbYXjY= X-Gm-Gg: ASbGncs9AAEM04V4q7NEAkFLADcMtmLdXmaZ70Saj5mjzwv1pSxAnB7HtZb6tNnsI0p +Y0k7bkexXEydOgZib42MglP2Ewg4yO6pgyKRt1PgoSH6UjmxcggUm8Uw8lFz4Sq2WwKM/cqAR/ i8cPgSeoaNT4hyPkIPD0x8VQAEqsokcJShX5UMzmQSvyYOr4QoELB+rJEe2ZbqC6O0PhXCbRGx3 mnSwUmb3fgECgh/VIPonaWGxjJ3CXGwWXWmcSOi/4LMScpuC4aVveFtaIr9OmvbGaf7Ur0X12UT 0QQhtIQneC6sE4p2sVAaLAJX97Otp5XcGvxJENK2Ys5ppT5X6io= X-Received: by 2002:a17:902:f083:b0:23f:ecc1:ed6f with SMTP id d9443c01a7336-23fecc1f05dmr88609075ad.17.1753734867984; Mon, 28 Jul 2025 13:34:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeYWCqRtE24tEVyEPFKQ+MJ3KSpNHmjoUKuOAzp/vLakvO+2T4gVctQrTsB7zyfP/q9HW23Q== X-Received: by 2002:a17:902:f083:b0:23f:ecc1:ed6f with SMTP id d9443c01a7336-23fecc1f05dmr88608795ad.17.1753734867535; Mon, 28 Jul 2025 13:34:27 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23fbe4fd62dsm61122835ad.111.2025.07.28.13.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:34:27 -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 7/7] drm/msm: Fix a7xx TPL1 cluster snapshot Date: Mon, 28 Jul 2025 13:34:07 -0700 Message-ID: <20250728203412.22573-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728203412.22573-1-robin.clark@oss.qualcomm.com> References: <20250728203412.22573-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: quoted-printable X-Proofpoint-GUID: eFi3-gGOOO1M5tU-IvR1zw0FZLSQZseT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDE0OSBTYWx0ZWRfX4Qz+MuaDBz9D SXpsPCiuy3KjwzdHiE6H6XC8eiXs5OlNBSQ8eqdSxgSGuCH9hbFBgVik12KZVS8q3yqi1ixyjAd e4yTnfDQyM6EcBFiPJ3QkIFRxMy8hUsUdKs+ZKpL7KUMeVnUc7Glh+oLMOBa9ifROegb9Fq2mD7 HGrAkCX5u2ZY3Gg5Vio50u1K1M7bnhUxtjncOYWvjJ5dJEceO4wWEUJaDvCHGreZMeuUywzXbtt AulwhCsoiXyOWojVwV/DjJfK6Ie/TlQ8Wkk+KdyCaBXnVrbfTvkBuO1OJAZtFFLrHsdBu4VA84o JTrhsYTdgiEqwLdqVqnxH8fCZO/+eB8gMDXrv2WiAxCMoLEtbtI2HGfPc/p51zxt7IIrKkRuTZQ lQFpAEFEc7xTTWiw3zhpBP+pqA7/gj6jtGykv4Q8T0CBZoOXkIS5uDdFhRUOC9iBCTzT4d3Q X-Authority-Analysis: v=2.4 cv=DIWP4zNb c=1 sm=1 tr=0 ts=6887ded4 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=zhZQclFZcvAaLIcfx54A:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: eFi3-gGOOO1M5tU-IvR1zw0FZLSQZseT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280149 Content-Type: text/plain; charset="utf-8" Later gens have both a PIPE_BR and PIPE_NONE section. The snapshot tool seems to expect this for x1-85 as well. I guess this was just a bug in downstream kgsl, which went unnoticed? Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 11 +++++++++-- drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h index afcc7498983f..04b49d385f9d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h @@ -668,12 +668,19 @@ static const u32 gen7_0_0_sp_noncontext_pipe_lpac_usp= tp_registers[] =3D { }; static_assert(IS_ALIGNED(sizeof(gen7_0_0_sp_noncontext_pipe_lpac_usptp_reg= isters), 8)); =20 -/* Block: TPl1 Cluster: noncontext Pipeline: A7XX_PIPE_BR */ -static const u32 gen7_0_0_tpl1_noncontext_pipe_br_registers[] =3D { +/* Block: TPl1 Cluster: noncontext Pipeline: A7XX_PIPE_NONE */ +static const u32 gen7_0_0_tpl1_noncontext_pipe_none_registers[] =3D { 0x0b600, 0x0b600, 0x0b602, 0x0b602, 0x0b604, 0x0b604, 0x0b608, 0x0b60c, 0x0b60f, 0x0b621, 0x0b630, 0x0b633, UINT_MAX, UINT_MAX, }; +static_assert(IS_ALIGNED(sizeof(gen7_0_0_tpl1_noncontext_pipe_none_registe= rs), 8)); + +/* Block: TPl1 Cluster: noncontext Pipeline: A7XX_PIPE_BR */ +static const u32 gen7_0_0_tpl1_noncontext_pipe_br_registers[] =3D { + 0x0b600, 0x0b600, + UINT_MAX, UINT_MAX, +}; static_assert(IS_ALIGNED(sizeof(gen7_0_0_tpl1_noncontext_pipe_br_registers= ), 8)); =20 /* Block: TPl1 Cluster: noncontext Pipeline: A7XX_PIPE_LPAC */ diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h index 6569f12bf12f..772652eb61f3 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h @@ -573,6 +573,8 @@ static const struct gen7_sptp_cluster_registers gen7_2_= 0_sptp_clusters[] =3D { gen7_0_0_sp_noncontext_pipe_lpac_usptp_registers, 0xaf80 }, { A7XX_CLUSTER_NONE, A7XX_TP0_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_USPTP, gen7_0_0_tpl1_noncontext_pipe_br_registers, 0xb600 }, + { A7XX_CLUSTER_NONE, A7XX_TP0_NCTX_REG, A7XX_PIPE_NONE, 0, A7XX_USPTP, + gen7_0_0_tpl1_noncontext_pipe_none_registers, 0xb600 }, { A7XX_CLUSTER_NONE, A7XX_TP0_NCTX_REG, A7XX_PIPE_LPAC, 0, A7XX_USPTP, gen7_0_0_tpl1_noncontext_pipe_lpac_registers, 0xb780 }, { A7XX_CLUSTER_SP_PS, A7XX_SP_CTX0_3D_CPS_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ= _STATE, --=20 2.50.1