From nobody Sun Oct 5 21:59:59 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 18E011F78F2 for ; Tue, 29 Jul 2025 14:57:41 +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=1753801063; cv=none; b=CjLUIQx/PFelBsbcQs5aFoudsfzapd5ZzjgmEvYEsejz+LL6uyU2uNaPFBQXLZFZ28aZmiQ60H3PSi9REJ/NRssdv9i7NnO11ZVT/yQHRCtKcBaHIZw7gLkAIOApF/RR1iIVqGVu+u5xR2OFvOYLQeGYuXGphbrFwtzxn1qokfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801063; c=relaxed/simple; bh=e6x/dDP5ia/NlQH+0MKdj/wLpx5h4B+ZdMfBV+aj6qw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y72J4Hx82UDeVDzgyzNOzuYxBsc90JxilECczdJdJu7BkBhxYS8rOtlwXvAFHvf+DPwjH7is6duiy4+LBp6myn8yJbcpTY+Ta7swWxtsvk2TvLcwg4rlOZbOT+AR1rfTip0BL46hdqJlcduWp4Th4ODBwJDPZF9u2l9LZiTXjkM= 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=IiqUseA7; 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="IiqUseA7" 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 56T8rsLb023590 for ; Tue, 29 Jul 2025 14:57:41 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=0qBkf9JDSmf FwdkCS8a187SNR+0cTRqqV9Ya3fpJH68=; b=IiqUseA7ZxZPmNVf5O8ZEZd1UjI snNXRY+1zeGSC0McZYDyiy3tCUSqCWZKN5mQJbLK7Gg89m1ZgWtPV7/p5wxlq/0M nUW2js4rF28MoR8IZJtfLwdB/+SxEZ89AZ+20387HNM3Kn+TtpUzc35HkkOFAIVs nH1ChZ1XwEWuKW3c5gGgc3o0iB4rr6pbROPIU/K4mEft3R6ED0X+eTIEyXzIyeF7 VU+Nly8soc0ZPqljK5L8SNDaqD7O77bs1yKd8CMMaKukeSBWyMWe0LsrGAjgprF5 tMmhAUIJX1songUbbQ2tXmdkk7UJ8uc48fv8Jjua/b88SH1Qvuium1K34Ig== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484r6qrfvw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:41 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-23fe26e5a33so39044345ad.3 for ; Tue, 29 Jul 2025 07:57:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801060; x=1754405860; 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=0qBkf9JDSmfFwdkCS8a187SNR+0cTRqqV9Ya3fpJH68=; b=B4uoclpSD910LqnruCzqflnvRuYKeoYptnufE0CKpp+nFhTWDljakg0KPYDKMUb7la ailo9GicKUAq7vCRwBTfqvogzPI2F5OebOKHzJTmb6E+tqgbT/dCsofQhDEqvLx7lyCc SGchEgUHPdENaF9i/ZQD3Z9QOv/tzjzBBZ3QugZt23vZUwcLpMg/zp/WzpiDscTopvXQ q52WAyFDZP53ZNOPNm4doj2w53pRyVb1tT9tWnbosIV16FE8Ng28K8eTcSnYX6ly7jrf Ok/yuw33GRemH4lzlBatiZOxUwFQpYwLlwd5gJBei9WCiEB/v5JKueHC+wI51SCwcJ9J 9I+g== X-Forwarded-Encrypted: i=1; AJvYcCX1BByao8LTYXzcoDmjKbobUAKsXAVq4j8hObLEmn0FXtzM/jayPOu1HUTFYfpUcd/VX+9x28pdLA62g+A=@vger.kernel.org X-Gm-Message-State: AOJu0YyfKROFFl0akS+HE1qJLe1qqkjZr9dZ/QMMBIZzf6wxIHwflkoY skKUy2a6w07IrCStJjCX30Ua5f9yycESdms7QPsioArWHhS1Ssm8RK06tP0aFaiFsrnSxJlnUu9 +wXyQEJvuEfzWS5H/fs96PX+X3lQrq1Rt3vvBBM7Q0RvC1w5AbNqp2Rt2jASJ8biVQtY= X-Gm-Gg: ASbGncsWidiqYjlXbLHHPeKQquPJLXXo9/UZ4vSuV9e99+4AaJr7fpCGQnms22jbTBW zAZGQx4A/AuuDdIpnFixXxVbVAHhP6ocixmFyu8wqpdDZSwVt3e/QBcUNIP//ydfpIdYDxhLGzM nm9Aw+47lde2AKOi4DqV/QJKMav8RCiKfC4nNbNd/xfVk9IzPLokNa7HSmEQod3dc1Z4oVSB68Z 4rJFVA1U3ZECSOue2O1RevH9V1OE0Kq3vTGw09AWOVSvWxNWvB9VoxNhd39q0ZZw5NXyBKHAH2a Bt8+CxgJiSHEb9P7j7b5cAiPO/dIWCfl3Cb+yU58H6EIwycCHaY= X-Received: by 2002:a17:903:ace:b0:240:1953:f9a with SMTP id d9443c01a7336-24019531719mr133423945ad.2.1753801060222; Tue, 29 Jul 2025 07:57:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGD4GKtP2sJEpJJxujTV2ZRkIuCi7nOh6GWilBcpkOTveTX8D8XdwMAVNRZGCDv3ocJrDEVyw== X-Received: by 2002:a17:903:ace:b0:240:1953:f9a with SMTP id d9443c01a7336-24019531719mr133422875ad.2.1753801058983; Tue, 29 Jul 2025 07:57:38 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24029726586sm48279835ad.19.2025.07.29.07.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57:38 -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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/7] drm/msm: Add missing "location"s to devcoredump Date: Tue, 29 Jul 2025 07:57:18 -0700 Message-ID: <20250729145729.10905-2-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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: AW1haW4tMjUwNzI5MDExMyBTYWx0ZWRfXwiplwFgl7iC9 UXZHFL1pAaUOnsvNNRpdu+xjvzWfCIvAyYXzBfythWm3ng4aP5iofjw4wRPCBbuJ+7Bgg+CtMp+ tjIxhi5E0o435mIL3QduwBLNz/YKAS7ODzb5uclWvBdkTrs6crI09gtEiMcmIjzjeeH7LgrRo8Q /CDVbbliBlxAqUgm/yc4xGhLUx/rULBsKlK6ysotOzq+nVanYr+D+ShiQzWQ1Jx+VASd1U7cyMk MMDZg7FVVC9BYDjHlVwzxpwBCMNafrdZH4ha1Ba0HJ0C27sFUl8yBXkfua5w+qxL/0mxNW7Jsbj xiKU8iM438KUbdFKYG3NsWfBpBW3rPFbgv/fOCJ63gQrJpHQmm9c58HtDr3XFKsDCPhG7qQgwnt 7i5oJgxadte1ouLQKWX492SspfdBUCzYzZcjdeBk2sSOpLGIErNBiuaNVuJP0EhXi9VYlhkK X-Proofpoint-ORIG-GUID: -UTFqw6lZN4Es9puBTuAYCO9R3782T20 X-Authority-Analysis: v=2.4 cv=ea89f6EH c=1 sm=1 tr=0 ts=6888e165 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=YFM8xwheDJGXjHaRWHsA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-GUID: -UTFqw6lZN4Es9puBTuAYCO9R3782T20 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-29_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-2507290113 Content-Type: text/plain; charset="utf-8" This is needed to properly interpret some of the sections. v2: Fix missing \n 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 fe38ea9328d4..a35cec606d59 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -1800,6 +1800,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\n", block->location); =20 for (i =3D 0; i < block->num_sps; i++) { drm_printf(p, " - sp: %d\n", i); @@ -1877,6 +1878,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 21:59:59 2025 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 1F8AD288C84 for ; Tue, 29 Jul 2025 14:57: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=1753801066; cv=none; b=D3xYpVvuT9sFgXXftxNgyIVn3G+YSxsZ2xeh01nzP46p8gU/LnmcaIggYOndXWd2twevLZAQcepdY8jhEtm+ILrn6E5qo5+uNo8Zpon6aPD3Ywpbz/PsLWAUPL5pOcuUM8iHGRYa7gSihPzv+4NBbKctQKmFC6YR2Nl8NSNQUv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801066; c=relaxed/simple; bh=XjzBbwfbdEpy4W7vo1Z59g8aiB5UZLToq3ha1Cf9kVY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RP5vxzsL+8qcN30o068l4DqPB6lMDD1Cd9jhEOVxOvlAkFkUghi1Z0YvXz9anknW2AMP0SYO+guQDkODo5mrT+UlcV/mwtqWr5Oi2Y2vrY82esJwEqz4RmMK+C5FZV352FJGYvgj3BdnX2+CjoT0cKLudz82BKZ6v9Ju90LBe1U= 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=dFZ8g4AE; 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="dFZ8g4AE" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56T9Dkfp018302 for ; Tue, 29 Jul 2025 14:57:43 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=dFZ8g4AEFk1NulFFVw51H0SG9Mi pGNu9HqxxGfjVLVqzcM7M2K8T0TEdjMUql0bGQ9cLBuQ2cbgt2D7uEeohWTjlatB lITjyboGAMT2LJRpuse182ZzQfwpC0NSzb6/6xDS9H21WGli79t4iYnrO/czGKCe sV+cGALA9w47dsy3YWyNMEt1pG/UJ7s8ErGZ22sW3OpE9Msf3SOBQ6C2PJnplnMo uzYqZkggKxRGwX+eXIHVTS1/qx+VqAgArShDEPQRMP9ReCpynddiVPlzs3e+AVP+ tBmq9twwucgX1TK67+oozxTOqLSyMZQxYKXSKT7I4ooots5n6q2UZrgaTGw== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484pbm0ek1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:42 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-24086faa5bcso2201395ad.0 for ; Tue, 29 Jul 2025 07:57:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801061; x=1754405861; 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=ljZuvpQ9IyRx8IV5O0IHzRaci4nKLvZ/Ep35krrdBUJcUClzZgv4c7A8bRXzBTKS6w MA/W5evcPtB/pjF4BI6sOQc1wUf/2mhZL8Z2oyo5XOvFGDjMVbL3xlby6rHUlFA+dvx/ d9IjmG0LYDDjMCexq3Jn0SPJzbAIquKA9/jVNcDWsGORC+O4vhNEwgh/jDD2eoKi5Odl YYUOFv76edeAZq1Wp/AHcXgU2mMM6KlyjT5xiN7mlpe9U7TRxj7lawLjXQWM1TasF0CQ n7uLSFAav3leOZXob9dXCo/0KSUQAU066u99mRuQU6FAFozO/+h8eXQEH7cYZfjb/V7a Z0Vg== X-Forwarded-Encrypted: i=1; AJvYcCVqOfY2/dkSu7TuSGVk+MZcYyFOzTdzqVnEVli/bi50wys/MqsidyjJfYgcdPkRMABwzehhZKkNTmuhxKQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxPXnHa/2k/j/QCZESNnTP7fXgXlrhrCgKvs/z4ob3KMvBXTu/C 4hCYRFsBFXkcJQSe8Q1Zo/NrvQ1PubbTbknmNQsuj8ep44ymrCbWB1Iqi250vd5QUb5pTN0F6Ur g1CzNCySU437Mb1hrOeEqCs5rxsvlTVGulve+dqHA0G4fpcQ4oRa/kdt4tsOyiiwS9Lw= X-Gm-Gg: ASbGncttCgT4crSZ5aK97ZdgwUI6Vos14Sg+BuWLjHtCnedyYEUo+47icD7Wb6C2fpC u4JqeXiP7jXcPOgTqJ4KCgh5gHa+PAve2QyE8fP468LPhk0i3pAObb0dofDxWKC05yzxS6dZiqm x+TMbLGnJnWlSYJ9hKp0ptHG5U3nPTBqO/ypvK4gtJP14+cDv+V+w3So0uLRuYWCDSThOm3JyzH e1ovy/VU5THkUUvE4kJOf21YXi7oftUjYiCl0ZXc9Sl16e/fbklDINU2n2I6Rni41WMpTwgbFEP ruoHUw/caPIVXnhqu6UEkDunAueonwQi6B6x0CHMouEw6uyULkQ= X-Received: by 2002:a17:903:1b2b:b0:234:cc7c:d2e2 with SMTP id d9443c01a7336-23fb3050848mr224991705ad.1.1753801061000; Tue, 29 Jul 2025 07:57:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ9hVBLh4j+kghAF/L46lgqX8VCMZ2DXnQbkvL0U172Ce+B6nS0S/3NES9fr+LT7g7KeWriw== X-Received: by 2002:a17:903:1b2b:b0:234:cc7c:d2e2 with SMTP id d9443c01a7336-23fb3050848mr224990935ad.1.1753801060321; Tue, 29 Jul 2025 07:57:40 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31f15be8545sm3688490a91.21.2025.07.29.07.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57: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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 2/7] drm/msm: Fix section names and sizes Date: Tue, 29 Jul 2025 07:57:19 -0700 Message-ID: <20250729145729.10905-3-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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-Authority-Analysis: v=2.4 cv=LsaSymdc c=1 sm=1 tr=0 ts=6888e166 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=BuD92i612R-MOt5tPB4A:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI5MDExNCBTYWx0ZWRfX9RLxnptG6RWU GTq5RhirFX5hAGKGAMjhwAFeend1IFobEDe8HVIjLR2e8O8IRHVMAk3OmwYfCP1oaA1GgoiJY6Y 0+UtD4fcgbAapqBXvIP31X/CKwjPwa7Y0LJYGVtjx1xwKA29qtAq1KCnjAio0bNdMGW8gfVoWsP n6CGxQwzdwHYAjkFBcy4itTZpqPnUDEalYu08x+zHEbHc9IF0Bn8L8u5urky4N+TdZP6zTwethg r5ycHf7Wtxboe1JYtDWazBV8ADD2ccG4zrEmbjnohTrzAFD1EYooRP/3pIIFg0ywQEBJknZyb81 0ujDEDZ4yJF8U2OoGowZrG6j5D+9wZbLSZGC5ESXBuBHj8ZQA51kisKil5QrqvZc3pX4mGqQo3B /9/ozkBdS1/mAdlRJpmnoIpO5EF3EVJOrGsPFtdRV7wIsf1U7GOdNBQL/no7cKabup6czigD X-Proofpoint-ORIG-GUID: u_O-OmiHH12dvUGNjGg9luqX9BbYNuuO X-Proofpoint-GUID: u_O-OmiHH12dvUGNjGg9luqX9BbYNuuO 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-29_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxlogscore=999 spamscore=0 phishscore=0 suspectscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 mlxscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507290114 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 21:59:59 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 20B4D2857DE for ; Tue, 29 Jul 2025 14:57:43 +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=1753801066; cv=none; b=LThjrezYL1Tb+IzmwRpfPbgviUjdH34fHEjiFk0GNLI4BBnOjRY0uM1JMhb+d7D5KgDdqOrdWdGFFfDAQ4ZRZBpEt7F7lgdUpmAMaQovQ1iJEnGgXFPOFDROw91KwdT3ARbIRQLbjkxQBB0qbazVq34drqFyok/3VECr9JNlCjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801066; c=relaxed/simple; bh=OjCcQPQrfynntfXQWE1QbRhM4jxC/iuvd0QhrBx8e+c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XC5UnTu0J9i1fOA3R7rCnGINbBJvy+HC7Id5KJxg7eXlOpJ5thAZCCodJ5psWGKNC8B5BNQOTrKTFiNe+medmyf0G61oCRJC5PVQZd2H9svEhepSj3vgpfFPD2ftDbaQkUKXh7ZFchnispOAN4AN5d1oSxCd4aVGSOwillW+/Ks= 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=ZiwRHPIz; 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="ZiwRHPIz" 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 56T8rsLc023590 for ; Tue, 29 Jul 2025 14:57:43 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=JAyYn1wklNQ c4y389Esg9VJ4y6TS3xXtsI3mzf8UH2Q=; b=ZiwRHPIzkt/3rNNsb7aQ7Wtdd18 2mqUN0vdF2ms3+s8r2S+BUfhg3DB9QllgpMo9D8qjvLLKrjXoBYHd4FjZMKKWieC 8fSaBhWXiB7vzb2Y7L72RtZX5yOi6l0YmBmbBpJ6VKuDrPHc9dVSH5oPbUUSQKYs 8iMyA2bzj3q0Lf8jptTAkVNWgj6+HpJdJrUVUGz7YVLEDNJIWU/UtPkLyFMxQI3R 9D96nUziOkQ5C5PJwkRbyDc63Z5rz1VcoqkYJhVOQNfTjICVi3+HXgqfxk2oO696 6gGlfUapttfVrzOnOsG5/7uB510eSrhwoC7KD6UNjmIsDD78n+PkExM51+w== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484r6qrfw3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:43 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b38fc4d8dbaso7080653a12.2 for ; Tue, 29 Jul 2025 07:57:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801062; x=1754405862; 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=JAyYn1wklNQc4y389Esg9VJ4y6TS3xXtsI3mzf8UH2Q=; b=LbORM7ohfsKjUuXOmatYboJhcUUhc0KA7Lw4PcZd0TSOy7Q1EbJAJm1lPerdaK5PX7 lKOke0CvySXJMarg0lArfeCJWXqsN/JaxIhPMedBfpsAyhMF3OhxFgscmWps2+1dGgT6 71pfyL/BExYcuA4fz3m2RFyazP9jlBg0iyPbOi0zTi38pdcYobKnZLRilsb6fqvpqswS 0gTw85A6plCY2xJypioNWSQ4hhIRrdkohYnuv7qaDiY8XesO7MiJ5WkJZi8t4fuOlz/Z BUdCYV+rfvge98rJBQgcdh1xhYYPafoge93s0xAWPa5S0kbhB9i3twVJSEHjF+kFwTXp TSVw== X-Forwarded-Encrypted: i=1; AJvYcCUi2kdvFIY160SoiiThamW83+F9kGYIBqtbHgtxhfklerHjLzgvEimUHUmWtgbLlA4fYKW9EqJ721+GLvw=@vger.kernel.org X-Gm-Message-State: AOJu0YzjUCzjVJOMrWZGY/KvosATBkvc/HCFzocnb6B38g2mnp5iAWjN CPyCWQKet9thhIdgcYWpMfZadk2/0/xlBlb/eAMzO69YOUXncVdnGyZL1wuwb9En98BfnBqD2xR G3JHPqKC73ne96cNh4tL4WqaXlS5s9y6yqe+vgySZHlrXJM0tON5pD9NgFeFzgK36j9s= X-Gm-Gg: ASbGncsPwS+/XBiPL8QHSSGREqu9lZvcfAtvMz9ltO1vfdxjZihIt82W/UGudruXICX qiEAMLZHlJy8FrGMw+C9IAUD6fA9SJu1kYpt519WJ/rB1b5zdIVoO5MAJ3RyBf2htjql1BGdHAE /lpAX7fn+fx8NBK+f2YkVcgDqhJ6yA/z+9ECXlheDq1v5+qt3Z9XW87Z3JLj/rnFc7zieyIW+Ee JGvvAbE9EsT2e4u/gTjsI0NXa1mBjYxN6noYWqtNdTk1MFq7+eEx8d0HmvIE2lMgOLPO0q6H60A s4JihuI/2EmgITN1l3Ymd3dPJCq1A1Vc4EgS4gJEzEnxmTKLAQE= X-Received: by 2002:a17:90b:35cb:b0:312:639:a064 with SMTP id 98e67ed59e1d1-31e77afec2fmr23804173a91.28.1753801062176; Tue, 29 Jul 2025 07:57:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1VfCPq05jHjaQmPdpsTNpOERHdd8AcbiU4RZ9VCJMxFekjA0Y9XcD1WRvDW/ywpd3mPK6XA== X-Received: by 2002:a17:90b:35cb:b0:312:639:a064 with SMTP id 98e67ed59e1d1-31e77afec2fmr23804129a91.28.1753801061607; Tue, 29 Jul 2025 07:57:41 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b42121a2c8fsm1289263a12.43.2025.07.29.07.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57:41 -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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 3/7] drm/msm: Fix order of selector programming in cluster snapshot Date: Tue, 29 Jul 2025 07:57:20 -0700 Message-ID: <20250729145729.10905-4-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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: AW1haW4tMjUwNzI5MDExMyBTYWx0ZWRfX2xZpdVwDaFOb ERvV/nb7iFGgglDe+JXXucYlZpQqU37Bjke67r7IFPwWRkwR3M07b83qMOHMeHNPbR3O7ApRWVv Q7/pLT160rA5XeQromiZ0uZYOGjdwentPOTOPlRwUNaeU0kjLo0GoVh3ekyUu+ELU/dI6RUxqF7 LSexvO91A42SmiOwQli0yEVUUnJEALUs9tfD0zIRUVtmBUG8L3EeOhTBy6S3+fNbb/MnB1U7V9/ 4qRpBjcb2zKXHfCjtxH0OboTbjP9zXUcAAtG4LWqwwM62mGfdjeudoQUGLHhNg0oi7g17kSL6vX a+AK8u2vdvUQTdr4/cfx4BZb7csGnZV1pVmPha2yajU6etqhT15ONkEr68ukthNXiwh4htrFD85 ihUipcDxo33Mtwzxzr08txgUNaIAj8PA0oUnM1lmThHn4z/M5NqoECRbQWq0jqHWY9qPGz+G X-Proofpoint-ORIG-GUID: SO5L_rkWk4I-zJJW2TzmWyCXNT9JLnGE X-Authority-Analysis: v=2.4 cv=ea89f6EH c=1 sm=1 tr=0 ts=6888e167 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=5vtJ6i-I-lkEOiUwjbYA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-GUID: SO5L_rkWk4I-zJJW2TzmWyCXNT9JLnGE 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-29_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-2507290113 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 a35cec606d59..5204b28fd7f9 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 21:59:59 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 7443C28D82F for ; Tue, 29 Jul 2025 14:57:46 +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=1753801069; cv=none; b=faEqcksLk3Ih5URX3lNpfzfhh1enz4PFpjW39qRkFbyjPS0APk5XOGzGX6I2x4kkbgWISdpM8h1Pz5J8wYRzg6AAO00JtTMTiObphGQ6LD/oETJseT/ce7pGoxg0IkOiM6nKlv41YkgqDFz6ZsZZo+6m69qNErCyb8dxz2TsKvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801069; c=relaxed/simple; bh=6L08J++NeuoUXi+vGouZnxzyoKCc+rvDZONpqT7Cfy4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mZUpTb8iLGOOhmgw6M+Kz74qGdMooeuER4txTrotGBsdif9YvHGNhehfZp6EzYKxlAvM3qhakR/yTnulBs7bBF2D3gsvypB67rlH3VRc+Si2lG9fs9XNh+kZiO06Jl+ptNggv2o9WGVRKY8S3vjcz8RrNr5wlyU+iDSEOXbNOcI= 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=P5CY6nxQ; 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="P5CY6nxQ" 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 56T8nqY7027612 for ; Tue, 29 Jul 2025 14:57:45 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=y7d4X4d5ItF 0dDHDwv/IU2liYcNeWpQIM7vwyXcj+BU=; b=P5CY6nxQcFdMTGud3F7ywwefPek Mq535HfdQBeu8rbRpnXTcHVU9Rk2wmNR59t4Sjm5FFdyy/KMMkqnuX9RbObrTk+3 edf/jtiohnEXKzRtHFeqzJrvQaWyqNFOAfWj/3f8c9zpy5ZX605GhKzIGrYQWTX9 XotuwZmQdH399HbLjl3Mum61RPFl7wCBJPp8KUQDFfJF22nbSpL6+g7f9kV0DusM +JCwAqU+ROQDPgxh+ABbz/XU1ioFHJ+SaJEF9UVkBgxxbu/Wt7X1702gyhjqSlDb UUswABUTdDWETEII/aa6kWf95s6ii8OAXhDK4NmnmfqErhC3yrydPVU0hqw== 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 4860enwsjp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:45 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-31f32271a1fso1209249a91.0 for ; Tue, 29 Jul 2025 07:57:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801065; x=1754405865; 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=y7d4X4d5ItF0dDHDwv/IU2liYcNeWpQIM7vwyXcj+BU=; b=exm1LLShjZDhuUpYs80CYJHGV766r72UfenIw9g5X4dlc0sr8u9NGADtWOKI5KeDyD OftNVG6yl+Htxs+75CFBFYMSFwR1tUzjZXOPlUUQ2eWSSK9o66WneO19PLZWbyz2A4bj DfsBmB1dbe5P9QfOjN/LQ42KFYBwS2zyzISGxeneWvEECBAPvjEupsWZ5Khl9BI2UMFi 9T/KdM8iLqrTpPc76QUdJ+hSrkydNzThJnEeGdEijYZ9cPMdnKg5mi8tvqSqPRWFJ1cY yhFKq+9GkfEns8rV8facqmFaWlyAP9o0LhF7iNzzF15oCdLdSUds0ukgD4zi5MilfQOK ClLg== X-Forwarded-Encrypted: i=1; AJvYcCXxmH/Ovvq6HYVJLhDUOTeLmO+QD4Dxk4sr42/fQ9mksOOxBz58M0sc7T32p5N9n5OA0Te2fyLlpk7x12M=@vger.kernel.org X-Gm-Message-State: AOJu0YzFEEFUc4WZ72qXJPZhcoDk9GzMUjzV1W9zQcIcsm+wxJbmkAfF YQ1cVCer7sPy9ZkMkjXfFF7f3xgx40/F0cZVGOuAtQn6raYQOuqSLLbdKZBG4it5e1ClMVINTMh FqP08HwZp4c1HK3IUb0nO16VhNETxC4/Y7Ie1JAx1FShCQMN9KFTQ+87JOMrN0JFzbkg= X-Gm-Gg: ASbGncuMAQFWODidFF3nKFt9w8XwbfvBSCbyUZmPZJsbwdmo6+NdU7/IiiEmDaPyfJe SFB+O0CeM0XNh8eEGL5AommFEiJhYR0ZFal87Ky6L/6WbPyuJ472Jmz/Y/iI+qBZp4tONun5BoM wSfD37JhYR0vsx5Crt7yUO3UXTa2LJmH3GwFnjkPpalkJXr4o0iA/Wj+vNFtUHL+/6hbzItvvGF zzAqSMK3w9kE3sQ185HOIyn+gxYG69mEjq4w3kQbSy9percWivtyfiEveyMCBEMCgbibCPfxjwx u/5ujmsLlSi++RGPWCjTy06HHoY06zan31tc0MZ9tpjszrQTKWQ= X-Received: by 2002:a17:90b:5103:b0:2fa:17e4:b1cf with SMTP id 98e67ed59e1d1-31f28c8db3fmr5467890a91.2.1753801064223; Tue, 29 Jul 2025 07:57:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEErS7yrMdyPzrrL1N7Q4D4+DJ70Monuo9B0K5LgChnn+aazXuTnS9j1X614LdgBbPqry4rWg== X-Received: by 2002:a17:90b:5103:b0:2fa:17e4:b1cf with SMTP id 98e67ed59e1d1-31f28c8db3fmr5467776a91.2.1753801063043; Tue, 29 Jul 2025 07:57:43 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31e66eabf0esm12322932a91.11.2025.07.29.07.57.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57:42 -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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 4/7] drm/msm: Constify snapshot tables Date: Tue, 29 Jul 2025 07:57:21 -0700 Message-ID: <20250729145729.10905-5-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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: uiGiGDs47K4IIc4EqADBAgbJE9CgCQwC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI5MDExMyBTYWx0ZWRfXwUSQV+OBFW63 mN8rszR+H7UaipfOj5XObXmGYxPnzXku0HNLJ+u428jjRPILJx4Xibppu1+6+9lbNJ5LExl80ya xKRBMsZge+zqeBrj1F8p549g7zk1Lqr/4ve8Ny/VigD2hslwpQyhOsbxMRNoSkI0KWR5DtZR4Jt hL/I9yYJ5slX29+CVlneiBTVABpj7Ay46S7DXlTvaAqa55uXYCENNUL55tseTsPxF0E/aog1x0l euuUu3+LBOUagsejXTg1M+eW3lkG6HdDe+TwqD7SWJ8RxLLXN/XrcjIqVZzMuvM4qafDb/g6y4D bHdEf8xgKBycNOQTpwmakx9awpQiS6Z93QgYUYT8CNC3An5wBaFSeKXAPd+CLn8FaHakmLvq64z za7KvfseIGAOwN+n10vNNjXh5TKrrTR6716Vf9OB+V9TEN2TiY6XOzNKDkMrmnnqx8aDkMZw X-Authority-Analysis: v=2.4 cv=DIWP4zNb c=1 sm=1 tr=0 ts=6888e169 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=3YnKlkqyfxy5QV46dWoA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-ORIG-GUID: uiGiGDs47K4IIc4EqADBAgbJE9CgCQwC 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-29_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-2507290113 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 5204b28fd7f9..173c14f215a7 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 21:59:59 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 D17C528F92E for ; Tue, 29 Jul 2025 14:57:47 +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=1753801069; cv=none; b=HaZmVzFVCgdpuNziQ4ijAI5gYOUJlZ9iAZbEXg4L9c5hu6U/Z5qQrZiemAIxPoJBUiVO6lgz9Uyagxdsa6xEskpyA/XlnC9y+tJM60m9B1dLEow1tga+LZC7yG992g+rD1hYmjUuPsKruzLMihnWUlGQG7Vk5oErgn1mOIm7s7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801069; c=relaxed/simple; bh=FAN6MDlQ+moZayDw2NfRU6KnZ5pK8/y1vLnQw1RaZ7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OKrbB6VsW4/Qd3XHrmQn/aSEtWAn0xzvLJhE9pz4cvmyj0Wum1pUEIAaGowf8nNS6frme7UgpVSpyZ/BWiNT+8x09XjgZNVJmY51fL3t5RgdFuQZiLbM2PHtSFHD44TWXH7KSfhC81rcbT9l4H/p7zYJxQYSCW9eAJa4bomowDE= 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=iiZYV5jr; 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="iiZYV5jr" 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 56T8Krrk027594 for ; Tue, 29 Jul 2025 14:57:47 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=mD0NBZ6SOPW kY6KB67p+Vrn86xtl4nZV3W1LSsEOfPE=; b=iiZYV5jriManv4CDr58TLuNr65y F3hzRYwPt2s67ATn13QZ/6gDeuUYU3uD4URo+ta7htvq+r3eETOy1VvFOiJmxgNy cRNHjFJ36qq1/ybOdfYDP7dhA0VOPouoN9z1JvBnHvvpJxjv4EnYs64poNCsCEdx VgrPyzVEKhxkLtQ8fgXW8mTpWiG9LDKRjpHwwleAN4Q5NjWkhF3KueR9P9qRUm5o qVvXNYGLurukCT/96AxEfqVQCsb0qFAGw8/lbX91E9MLAQgfO/O9ddLDjg2PCbTZ fdGT773F9GA4kc4spG72TylUKJpoWSjFNNaLhad06NCoC10dT3MAgAkOVOw== 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 4860enwsjs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:46 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-31327b2f8e4so5561403a91.1 for ; Tue, 29 Jul 2025 07:57:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801065; x=1754405865; 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=mD0NBZ6SOPWkY6KB67p+Vrn86xtl4nZV3W1LSsEOfPE=; b=q3H5MvJyMSNZZBzN5PpMaoiM2Xb2DG7qKeEx3Y3zBN4HQHiuZjRdsTmm5tbFzLSSyF TV4HEtRux/NCvL5L0Z3Oc7J7641pQ+jIBGxM10KYSb5/McWhJFV9ChfoKPbsk/6JGWZq Elg3fK2QpxIDDMjAZxLUQhdeGXKGCnS9fQgam8jhrdXiWhGwvvi0TiHWIp0EMoPjRr4o VzIsEEFDVdVpcZr1UKd1PelSY5j3R+FSxJEWVsjcpS3E/UaODibJIDdZM08w/rOG7ELr 3iz2kL04Jl0ogtmnwP03gnFh7oH7cALySb2BnSyOwTJeIPz+8G4QzPcSHqv/OkVDoUdy EXtA== X-Forwarded-Encrypted: i=1; AJvYcCWT3jRUSFuDVlAIwFuQWRkCx+oekj+lbi2m+LiJ4jbkxv6hdGqpO2g3VkK2VI+zEK8VCNo7F82jAweHlao=@vger.kernel.org X-Gm-Message-State: AOJu0YwXk9+2DJ61diBP5lt+DiosxC1nPmvKzW6T412rY2QfaBLCoKC7 m2XqlpDE4VrB+ZLtYM1R3rA0tDHjeZfqttSMT1cI6qSBdbgwpcfD/7TdvvcYzbia3nagORAlmvf NEbickBtRrEuTd+n4FWdbhNGWrWfCgrgRgWkecPoUwIHlDk3V1di1w4xfekzZgXcVyv8= X-Gm-Gg: ASbGncvsdYgzPQ8/xfW2jrq0trF/2Sy+P5XSEBbc70VmB+q/EymAbzeuRiB2eFqqTJB ZVJbXbvGmEqGQ5U/L0ifQi0kS+6URmCdKAaVdnkTzqaSdvfg9V6MxIe8FxY8IY7O34Pkj81+2Lo hBXRm08FWCChmYi/bYVuFvzzcJeFbFUtGt+IrO4CbrNHLjXMEUPSjCEJkutZnIgb/ubWrCs8Tal pREodBb5cvOHbVl3GpD5WNLbqs739scMHYzzVqsTMJUTzQPO70XZDGkfsfUtyopSwi6fboh60RO k3+yP6KyCGJrZz/oVlYrFJ2nmW+ku2l4E4bgq60alw0eho6w+BA= X-Received: by 2002:a17:90b:4d8f:b0:315:fefe:bebf with SMTP id 98e67ed59e1d1-31e7785f8bbmr20455320a91.13.1753801064895; Tue, 29 Jul 2025 07:57:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEiMpmUR+bY4vgJDJrIuyQ52pRlkgEThbWo2keOzuYnD0mITzM0Bk5ZrIUFuV4Dy4dKAex9g== X-Received: by 2002:a17:90b:4d8f:b0:315:fefe:bebf with SMTP id 98e67ed59e1d1-31e7785f8bbmr20455279a91.13.1753801064338; Tue, 29 Jul 2025 07:57:44 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31e66eabf0esm12322972a91.11.2025.07.29.07.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57:44 -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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 5/7] drm/msm: Fix a7xx debugbus read Date: Tue, 29 Jul 2025 07:57:22 -0700 Message-ID: <20250729145729.10905-6-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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: 8afBe7c4wIlz3jwf4wiJYl-Z0rSuK8pS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI5MDExMyBTYWx0ZWRfX2Pn7xSI5eiUU 363lWjtMjc4i3AVngNXLB7dexq1ihHhMILP/KHsGFXpXwxFHIeWli6b9idTZgS1jjZE/LOeDAMd yzKh79ikDWmoSReY61l+AjP5G5MaWENq5fJU6ib/m4/EmoL6TVSbKlIWrHiNOTJh4JBf8/i+HCO IVS7cNsFgLTWB+FbGlUWDNpfn99JQfVhvvmX0+Jm7BW5DxR/49UbStj+9m30dnT/G7vtG5/4iai WuMyB7t8NfZWUWg/ThV9UCt0375gFZfMKh5uOEk3tAaUNsnJ2SB46TsILuK6Dt/Aai1HPVVb6Ai OlbAnZ243EmsAlANmgLc+7uUOgogiShQS3Rg4mBN6WX8cyLrf247n/bIbTLmDAai5Nhdg26zt/K BWv8B669o/f5RlZA53Iwp9EkuiUVb/6IzG3t1iy5Z7KZiZIBtWXaYLNxdmbVZb7WOWgEdgGV X-Authority-Analysis: v=2.4 cv=DIWP4zNb c=1 sm=1 tr=0 ts=6888e16a cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=IkVRe3mbPPK2UihE07gA:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-ORIG-GUID: 8afBe7c4wIlz3jwf4wiJYl-Z0rSuK8pS 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-29_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-2507290113 Content-Type: text/plain; charset="utf-8" The bitfield positions changed in a7xx. v2: Don't open-code the bitfield building Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 11 +++++++++-- drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 173c14f215a7..8317e1107389 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 A7XX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX(offset) | + A7XX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL(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); diff --git a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml b/drivers/gpu/dr= m/msm/registers/adreno/a6xx.xml index d860fd94feae..7a32f6715752 100644 --- a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml +++ b/drivers/gpu/drm/msm/registers/adreno/a6xx.xml @@ -594,10 +594,14 @@ by a particular renderpass/blit. - + + + + + --=20 2.50.1 From nobody Sun Oct 5 21:59:59 2025 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 2241829186F for ; Tue, 29 Jul 2025 14:57:48 +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=1753801070; cv=none; b=ZYTAYridOa+q18p0dd2jQV+Rw297lMRLghGGz2uN9/r1bYpBvNc/mMu25dNqt/MYZEq+heXURhCJcYaGTjEvC2b0vwfG6QyTmjduB/SU4IYx2sjUW59FVLUC9ERl6rbuU+WD/BtJ4ogTCZ0mPMsV5uCm06oIZZASq2SFY2QLSZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801070; c=relaxed/simple; bh=8EH8A9BzE7HOMEuqzDRblValFMLmOx5fGsLpG1xj7mA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JiSrHaxfV5iFUB/aB3cl/Iv7vj7LbbGVOn1+X/ACSnbueM7sugBJdihqiKzGJkqdZ52gG7T7WI686KLx9ieG+aNPgIeM59WHvKvpMiDQHyA5f3T0utk+Thx/VM5aNtTU3f3dMP3qCO71T7jjNMuElk1O3QoMl36Wluz0JQbbkjc= 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=cwE4C6zi; 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="cwE4C6zi" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56T9VJvP005849 for ; Tue, 29 Jul 2025 14:57:48 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=bV9napCh09s i1kGi9emra2vbNQVuKZFFrQKfXkn3mks=; b=cwE4C6zi1myTmBMi/zSeVDwYByp cSRwkxUl1oaeXRMzSaMvqhpXkRVPK7kz8kHclbNaBDupQMhj61Qp0oUo8A7W21PY 1v8lIH+9t+BoNHrFJR/vzp1RXA8Km3JIZF0uDZXWnS7jidqhfVTVp9/OCYuV3D7n 9q3Vjb3ibCyjMjyJbJUDLUFXWBoFkbM7ib1uE/+WBkRVXLPohlGS/EC/Mtz3o8iF z2UwZevKN/aF0lmno08TbILqcfBtX+mFS76YbbTK1+jjYjpP0hz7VW1ItKHQWdQF CRHhHqA74hzgTv6sA/U+9Vdj+GAOKVLS/UZPWFU+q5MzzJa/9yPAQfi0SMA== 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 484mcr8pdn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:47 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748f13ef248so5574945b3a.3 for ; Tue, 29 Jul 2025 07:57:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801067; x=1754405867; 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=bV9napCh09si1kGi9emra2vbNQVuKZFFrQKfXkn3mks=; b=es6j/4nzcz0Ybd2U7bkG0AMHFeWSZ70ZoVI4467AJFNhHxXKpNljJ4L1hcojcMMbh6 Btm56H9mkGhdiwn7PUm5JWB1pBiUFquCnShE52CtKt9FrRSZleAD5RqCD0WgIFCp2S9L yTZfCc57GFKg5llVio9ohzRY7hbMoRcCxbJSilkS3iXU8ogrHrLsfL0+ao/Wfa3znGqN /CMlJA593iIX2BYEHzk/cOzV2qlc/T0/5m+aC7GMOke+MBYpP0nGlVcJBT9CfrVOGaSt 4nWCgTO/OFZIZOTRgYfTTLdTyobnwvCJW7tfT5C9hbgtfQaeYyarttgj/IoweZdTJw0Q Bw/g== X-Forwarded-Encrypted: i=1; AJvYcCUrBh17LXNilIRppmbAww44LlqiYiIBNGP/EfB5g78TIDISGgvj5y+NWFAm0o1q6Quch/S4KDOWLjLXonU=@vger.kernel.org X-Gm-Message-State: AOJu0YzhFL2N1+9+ajnQ+sHsF6pYDxRQlpTSsxPbQ2ksOTlyjsyCmUni p8idAlq4laK1/qizop3Or91/pst7UBWCQWb3DIjsCPTatxt8SyGvnKIT9ySDx/QlepCYhS/RN2w Mk1heUq1bEjlKiZiwEMgfj+dVBsJNd5CnTd/oJDYjd9GrvIA0MCXTdj2uFxMMF3r3GA0= X-Gm-Gg: ASbGncvfYrOVBr8ueRjxazYmkoJC033W9mx6n/w14DXlGVlQRkNWFrBjRR8UraDa6fq cBIPSlLMiY62cQv1hteLHBTs8jGgYm7b1iQh/2Phy8PS6ObIn80odqyDPcbI2iRoHPrvegN3SXv UZHR/acAvNbkDmbfgk8my8QLBw1GsZ87fGfdw/pM0B+vSzC0PWJ1Cu8w1pjLjf5JfCmmJSnV/is ccrqtMHsYnlWhNQHDThtd7XfmRDCDzbLNfu27dwFmC8CkxMqhENBqvf3uxhNkyFi1k7j22WwGrG YuDZoiKhvNl9SyA7XDOLvwKuGIPF6wBJga3Hbx/7AHeZJosaAvk= X-Received: by 2002:a05:6a20:4322:b0:21f:d0f6:13ba with SMTP id adf61e73a8af0-23d6ffe8724mr25354330637.1.1753801066011; Tue, 29 Jul 2025 07:57:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkVUdWVY1jgk5W7nGQYN/xwaTvSOwMDc1T4fWKqth8CqZfG64KwyTPkn95VrDifdcVac2c4Q== X-Received: by 2002:a05:6a20:4322:b0:21f:d0f6:13ba with SMTP id adf61e73a8af0-23d6ffe8724mr25354282637.1.1753801065484; Tue, 29 Jul 2025 07:57:45 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b420db5d93bsm1812782a12.27.2025.07.29.07.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57:45 -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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 6/7] drm/msm: Fix debugbus snapshot Date: Tue, 29 Jul 2025 07:57:23 -0700 Message-ID: <20250729145729.10905-7-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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: AW1haW4tMjUwNzI5MDExNCBTYWx0ZWRfX8wEwvSjV3T1q iKY4vj5M21oqV4O/cZ4Ac2Bba7qfMdk4UN06TgtZXvW7oGzn55JsOFVJk3oLTSqEhxgc0TtzN50 sWaqjQaugGLmn4P4XMR3jdF64ALD2tfl31uZtv/wDj9qFsC8gGrlRYcOzYGGGMXdEf8PMUy4VJh fVXdjkdiXRD5uMZSNL6shn2veHeESTTMLKg1F29cqrV1OK6nXsp7t8osNkAa5xg9TlXkE8srTK9 9znkHrBoIz6hphXS0wuSW1guNiz3zZzcqjIlv9/dk+QGiUSnyvdU2tzBnTJaZ+OYPEpYEOK4iNv JpzB57LfBW4ozTdlM5SR076jqh2Ow664VF7mZSl6Qb+yI87V+tQeJ3XvnNlwxFAPrwItpyC1eE/ wpETgxEubetSLsIPvrv6tXHlT1UvjqkOpqmRfj1JLQEWJK6NGIWmlLRsjaWaN/VFmbNZyQps X-Authority-Analysis: v=2.4 cv=Hth2G1TS c=1 sm=1 tr=0 ts=6888e16b cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=Q8ed3UK4sgpFGPsrdooA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-GUID: NUl7ZnPYKHZgaKRMxSxaiB7X_idcD_qv X-Proofpoint-ORIG-GUID: NUl7ZnPYKHZgaKRMxSxaiB7X_idcD_qv 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-29_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 mlxscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 clxscore=1015 spamscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507290114 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 8317e1107389..ab9b35e44778 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 21:59:59 2025 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 2282529290F for ; Tue, 29 Jul 2025 14:57:50 +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=1753801072; cv=none; b=QgqxwQN1LUUR5R6VOdU8n/NqZMwPpispEkvwsUSvSpykkD2kRxFTtIPfgd4BgDbzdFicVXqDZXvhFtGcH2fVlwc5O7Asewk9ZjwKBENY2P2f0UzPGpc2GAR9BNq3sGHNkMzGbSbqjJYTSR4PWUYVOZn5IB9VWjBp0TPijYgNPN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801072; c=relaxed/simple; bh=a1xn1H8/fa/A9qraVB8eAftc2nCQicSPOhezcVcH5EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aMU3vWcRbwXNHZ6J++vGTi0ZsCws436RH9zCm+EAAXfuQTHzQrhxeXkSq/O84oaPSyJfOBclGvllGOS2xie/tsiDNfsoGDh0Ix3KlNC9B2nRoqZc9hhxezQ3IKEy4c16jqng8v71DoklnBkhMW3IwhTrpCtaQO8+iO+LUv/NJnI= 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=g6wM7N4l; 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="g6wM7N4l" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56T7dFVS015048 for ; Tue, 29 Jul 2025 14:57:50 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=g6wM7N4lQvCzapGTjsB24ecQdnP AZKmCtkvjBv21XGHYm8aWaC+7I76LlAa2KB9QE8lCJvj8qwgnFfprxqu86+uw/WG FmQiSjoc5ug0xhf88AG5LhRtKEmAgulTy/1cn4tRNff1OvmFxN+gznutqPG9sGHF x+vlR73Y1jpcIKBdTvVH6RMXS8EiSvu/Za1cARBm9L4u0XO3xM/+o1pOobtct5Vq grnn4JEVp+dspPJ/18t9WcQHWDfc8zkB1b2Ye6/cAXTD4nVo9PIFr+ULuZH3agAO TNLen4WvhzPmqFop6LZq102scGiPpbq3m1ltK/r2T6FAZ4QfyXNp5FbySTA== 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 484q3xrfre-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 29 Jul 2025 14:57:49 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2400a0ad246so20891835ad.2 for ; Tue, 29 Jul 2025 07:57:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801068; x=1754405868; 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=ri7XMU9rSoHMhgcpgJ7PqGvoJr7Q5XDXaLnbnxsG5/ASLeh1oTQPdd1jChsWwJJl/5 HzHaqc6atZ6Q01zyODm7dGo4HIVYLB64g+DR3SRdKf/yWtxujCO8OBfTs/BFkBRuovro o4gf/3Mb3crKxp7LPRfaAP2ISsF1pAIXXzER0shfnIxd7O0xMz1H28OUWk9jSRIZQsg4 iiOUgiuBcvIdtI2NU+PqJIB9phR2SL2+m9uLDr6PKfCTrXYP8PAbfc7qFpfxd3A+u2PH TZNLLz2dPx7/iNVq20NwNv2NTwYbB2U8PYUfVu9PIXTkpJiB+mA9X2pQTiwz35DqVdwm 90FA== X-Forwarded-Encrypted: i=1; AJvYcCWizFixQXv03G+BYppfYHHZjWMi9hJ8i75t0N5afUSekLB7X0hXyaW4xaUj0bqCPFS2b8le+YoTAVBWm/k=@vger.kernel.org X-Gm-Message-State: AOJu0YzotcsMglEfzTMDnduf1jmq0US7XuBcXnlib4kroIVSx6sU+w83 UXU5OQspH6XLNP/ec7suEytDVO4jxRp+9nhtHxfkFdjoQrnZ/u0lg+qmmyZmgbv3Rj1i32VW50S kvDCy3gi8AJn9G03h0HjeIK6SvetX78Y8k47yPHJfBIkkgITQiksTMR2JEoCwdN43ydA= X-Gm-Gg: ASbGncvSeuTqN9bDXWmmAKglBaAT+Pg902gOhgVO87ZjBS8ZkMislaQx6KjMyFOGDsr /Ul0pcxvXNi2ff/qxBlBIv5IFlOJBTssjpKvudlnlg+OaBXBLCZhxRWGltT1dpsVlysppLG2py6 Tx8DzQ6iiDtVeJ+WU8UR5LAFTL2z6bv/+bAr+xbMgAvkXDAsQXSCmVPq02uSyGUOuTD/S62Vj8B 7leYpX2O/ivAlO7QMYfy62gx2SW2XVv58ucdkDIGfZRMbiutRsZk3m9A4KeeVtQrWQqw//CE7Sp T7Zzfoksb9VvaFu6Ia246pcU9BzxAvBdUy2G7UZJ79p2hV7nFfE= X-Received: by 2002:a17:903:2451:b0:240:92d1:5cd3 with SMTP id d9443c01a7336-24092d165cbmr2863005ad.20.1753801067688; Tue, 29 Jul 2025 07:57:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjD1LFBD1KVpA0YlTQXKqialrZE77rREWeWa02W98WBwqwV+/tbJVbfbaFAXRlp8TRRBpndg== X-Received: by 2002:a17:903:2451:b0:240:92d1:5cd3 with SMTP id d9443c01a7336-24092d165cbmr2862505ad.20.1753801067077; Tue, 29 Jul 2025 07:57:47 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24025f5a3ecsm49977215ad.136.2025.07.29.07.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:57:46 -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 , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 7/7] drm/msm: Fix a7xx TPL1 cluster snapshot Date: Tue, 29 Jul 2025 07:57:24 -0700 Message-ID: <20250729145729.10905-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729145729.10905-1-robin.clark@oss.qualcomm.com> References: <20250729145729.10905-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-Authority-Analysis: v=2.4 cv=JovxrN4C c=1 sm=1 tr=0 ts=6888e16d 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: CXnD-qYR6s-cC937niG2VMx9tp1rciMh X-Proofpoint-GUID: CXnD-qYR6s-cC937niG2VMx9tp1rciMh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI5MDExNCBTYWx0ZWRfXwNJLu/n6VPoD F+VI5IxM9jQepA4+83b6pbz8afYT+9FT9cvVcv8GUVd5dY4Q6oZ3pPgJ6sJncSJo5E7mVpU5h8y 60GPQJc2sUC3AP4VRQ4AHglcR9pMu/Z5NJJ0lu3tuE3eSUJ9FU1jQVQTkO24TngAnl3f+DjSyvx VwvXKKsRK3WX5OsZLIJ/4Ze+MRfqhdUzS9T0kSiLtQyUSmuYx9kXMwMvGOQNuKDgsqr8Y4YH0in p38nna8HMhjuLvINDeJp1groxN8Bdl/+BgD30glJ0VewIG5psgUu0dxdxrehrz/d2vUiGhwm9ep drtdafOJ55QeucSMpn5INJcp4X0Fe9WIp6x/ACVD/yimselcnJbCQA/bDNCjxygdRBiIgsWOW8c 3r2bKWwbi6yWV8Gw29beM5nBt2pjtoq3PX2Umh/ctwGd1Ojn61VWhUM+pxDLpLIlIiuXOvt3 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-29_03,2025-07-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 priorityscore=1501 bulkscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 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-2507290114 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