From nobody Mon Feb 9 16:51:08 2026 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 EEA913128C0 for ; Mon, 10 Nov 2025 16:39:18 +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=1762792768; cv=none; b=qQ8Zx5+hXzp5rTC4Qo1Q8fT/7atAn3c9m6+dmYAaFRJ9Mu6DigQJK0E2NWCYFGx3UDLekfANT311+Je9tl4Jv+LUIQCRZAnFvhlambEEOkJECYqAtD/IvmhTyvhR2q4/MIfoHyvGYbuOL9Q9+8ij4jeWdjccgwYQuTs3JqwXb0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762792768; c=relaxed/simple; bh=yGngXiCZ8sb1m//TUvvv5uLLdAAW0/QXWIsotOuxvOk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WfUqpyucV1N3bD25qpFkDUq7adYN3A0P73PlzCBaSh7WHnkYxMV3FF+0F0k1O6fVzUcTD8dLFmDM3muEPUfLb0sJfgdSCx214XSA+BfHpyw/pz5N3wSFur9zwo5u0TBsdYSFufWnRWXLxJiUGSl9zTEBspPHy8jkQZObeG85khU= 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=Fwon7ef1; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=QGhLST1+; 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="Fwon7ef1"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QGhLST1+" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AAD0wAs3676831 for ; Mon, 10 Nov 2025 16:39:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= t11ssUgDOurcpwhnONJmRHjsqVR89oqVMtmwAK7VpRE=; b=Fwon7ef1rYlH99y3 ntRd3RzAy8b+VeKyJ9IqsEjRI7U/ealww5uZv2kkgQn7o5wvHAZ0U0MCutE4/pEg AyLkqe+pLHDKhE8Ul+tOMjddXXteZ06sjL5fEahOlF+PFKv8iwpQ8CuLas4cyFs7 7qoff8VdRgsqsaGBSdo8cZDuI6jSPG2N4GkShjr5l7VU0EduJ/pM1VGfdQhB6WKf Zt0sBq9Xpjq/Yml7lq1PlRsji1pec53UbOvBi3u7mVUhkXKmcywD5DCEei+JvSkU zZuK+mbMW9aljuS2AAynQmo1YOEzQ+ymF+nxMGvObsBfeYs/FTNvB3B3n+G0skrl h4Pg3g== 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 4abgjh8q2g-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 10 Nov 2025 16:39:17 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3437f0760daso4374606a91.1 for ; Mon, 10 Nov 2025 08:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762792755; x=1763397555; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=t11ssUgDOurcpwhnONJmRHjsqVR89oqVMtmwAK7VpRE=; b=QGhLST1+xOiWBTpa1FodsGnoqNnIgSwhkU7NUsWkZwSQCQoF2MjKV/0lnOb5zE9s/x nQLe1k+8EztG1/7ksftq0Wl4Vxayd+hGGvrudTdtjQO9O5E3+JqdHconq02rHwXkwTAv Str1I63fbC6UxnkCQ03wdpyiG1ebE/eqqseElluiyqpqN/aLxUvu+Go93sQ3H9VIAQ2N xHNM1LSl3WqvCALQZ12aLtLg2GcRWy2KhKmW2J7JA3BkThAgs91SP5LWmf0Xty3Mkz4G +BzRojHYD1i76WzWbmLDuHQW/PqDXE4UF5illy52mjaxvDyn4FUoGbZrAWV397+CqXHM YaHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762792755; x=1763397555; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=t11ssUgDOurcpwhnONJmRHjsqVR89oqVMtmwAK7VpRE=; b=Itwx732yHjiuKRSTRNW5unLEbWSQ+xQDEYJzQV2ss+AzaDWCUpomkwWxoHQA8w4Ag8 dAOSPN2RtVT02eXLCWxFxhCec7g6EuIfFcgclDJ27pRGf3SRpHDwlE5WJ8J96VFWIwbT gNknUvJthxtUMMFiF4W1vXjn+wcYEtH8n0zLrtEOphlRVrpBkVsLyp8UR+p8SLcxYke2 Fy6MSskIBXIoLkKdN0DKkujsI5mmQF2okrXK5W4Ym5zCZ+gT4/x37RXCWu40avn/cpXI AzCoMvmWFS8TyEEsuVXouTmaFkItWHNQVbF3o6bUHhO+QJNFkePx/w+yOyE2EqXU3QpH 3VrQ== X-Forwarded-Encrypted: i=1; AJvYcCXu/u5bJdB0GoTR6R+WeDSpt5xSvlUD3WTXvhtpiChvvSAjDE6X9Kqqm/VTe0QIVqbPAynVFRz6Uda61fY=@vger.kernel.org X-Gm-Message-State: AOJu0YwzmRyo1TV3vSwnt4KeOyumo5x6yZKzrEP3P3eOjFUe5GJIiMz0 xH5uzQKeJ/mSRQ872wyDSvaYMB4Z4FPqzBr45PGoUR6WpcQTmIdj3hJB1N8lMxJ4X0J7uyExz/4 OP+UjXtfYY7dHdx0PuV1pNk6jGi80jQgIzAPLotk3MGzk6tAu6G4IXZCXIte1b0btWWo= X-Gm-Gg: ASbGncsv3pzyqD5v028P5y7G7MV/POXUC+r+wIiVnuk+BTzDZ3v00VPTWLrw/dtNeG3 X2m+2jgmbie3BvdHEjjujbTcRin71pt//9eLJuzHbQC5uX/CpirxDG5KMSeby9C/T6eENKeiXvp AgWCw97D0qF8+H8ukxUn+DEOgOaNjPqy20eowW5pS9Q/Pzbn7Au8VfXCZq8lKnv/1N/qeF0atGx 6ZxSBuU3MPBKrTYwrWnVc+P/UT9Ue+O3xyGmSPKz68N+nWcdwUSJfiqoWG1CU1KVkpjKIHirzwG PFuwJqBzjrnkA24poEM6bRuMnXNGwwm/BOhN5cRSyDLN49nYpyTBnumh6R5TyVj/+jO9bfhodf6 mVzdVMwm6mTInWgyfGZzB5tE= X-Received: by 2002:a17:90b:1b12:b0:338:3d07:5174 with SMTP id 98e67ed59e1d1-3436cb7cfbdmr11255829a91.5.1762792754449; Mon, 10 Nov 2025 08:39:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZKBrr8StgNfkRu5/TABYTlvy6vYpKnywGNne+RgESnRtlrnQm99HoAkL7ygTlAjFxjIST6w== X-Received: by 2002:a17:90b:1b12:b0:338:3d07:5174 with SMTP id 98e67ed59e1d1-3436cb7cfbdmr11255763a91.5.1762792753581; Mon, 10 Nov 2025 08:39:13 -0800 (PST) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3434c337b20sm11468922a91.13.2025.11.10.08.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 08:39:13 -0800 (PST) From: Akhil P Oommen Date: Mon, 10 Nov 2025 22:07:14 +0530 Subject: [PATCH v2 08/21] drm/msm/a6xx: Sync latest register definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251110-kaana-gpu-support-v2-8-bef18acd5e94@oss.qualcomm.com> References: <20251110-kaana-gpu-support-v2-0-bef18acd5e94@oss.qualcomm.com> In-Reply-To: <20251110-kaana-gpu-support-v2-0-bef18acd5e94@oss.qualcomm.com> To: Rob Clark , Bjorn Andersson , Konrad Dybcio , Sean Paul , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Jonathan Marek , Jordan Crouse , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Connor Abbott Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Akhil P Oommen X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762792679; l=213778; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=yGngXiCZ8sb1m//TUvvv5uLLdAAW0/QXWIsotOuxvOk=; b=4v2BhuOTjniA+soodlRSDb5oAdl9k5m1iFjfJJtVCY9bdfOXzPogNVlhnTAZiRvnh2upQCj4y zR+9RL0ikcdB3yRxFTyp3u1pR1NUYUm0WzYBQWtYilv62K4pAbhSxRs X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTEwMDE0MCBTYWx0ZWRfX7KO1jiS178XI 7y3nUNgKO6vyYf8k30SpgdC+8Y33ah09asrE8/wizAvP+uQB5lXSRkJrWq7SosphMRV66o/O3ax 3T24aJ8flNh8cIxD8fgWV761aaf169MrI0OEMHuO5u10ikV5DZa2wGyHEzN590oGlAwiRzUR1Jb X0+ksRa1GPD2HyIPhZRavn0/junQpehV1H0jwmrpWngAZIyBuCmlfIajmQiH3TbISFpW3DdhSQ0 09mJsyoyPTiM+NkBIjtrv1jy8FG7ZhLc2zWalYTCWHePWK0n/9axu4QAghvjpn/6ab4BZIdULDO AMuXSR65AMus+2+F4E67PX5EWOX2fnCDGhk4tGqQgDGMY7VpTi8e17Yac3XDChUmxZ/lUvMPDAf DDm4rA2oYMR3YH10QFe/eCOOBdqDpg== X-Proofpoint-GUID: B2qyhseIBgCfgevm1i93YwwhTYsnKPX7 X-Proofpoint-ORIG-GUID: B2qyhseIBgCfgevm1i93YwwhTYsnKPX7 X-Authority-Analysis: v=2.4 cv=La8xKzfi c=1 sm=1 tr=0 ts=69121535 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=e5mUnYsNAAAA:8 a=SSmOFEACAAAA:8 a=EUspDBNiAAAA:8 a=vEUdr9KV3zqUqJRwHYAA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 a=Vxmtnl_E_bksehYqCbjh:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-10_06,2025-11-10_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 adultscore=0 phishscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511100140 Sync the latest register definitions from Mesa which includes the updates for A8x family. Co-developed-by: Rob Clark Signed-off-by: Rob Clark Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 16 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 8 +- .../gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 8 +- .../gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 8 +- .../gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 8 +- drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 1947 +++++++++++++++-= ---- .../gpu/drm/msm/registers/adreno/a6xx_enums.xml | 2 +- .../drm/msm/registers/adreno/a8xx_descriptors.xml | 120 ++ .../gpu/drm/msm/registers/adreno/a8xx_enums.xml | 289 +++ .../gpu/drm/msm/registers/adreno/adreno_common.xml | 1 + 11 files changed, 1894 insertions(+), 514 deletions(-) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 0c0dfb25f01b..7acf2cc13cd0 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -201,6 +201,7 @@ ADRENO_HEADERS =3D \ generated/a6xx_perfcntrs.xml.h \ generated/a7xx_enums.xml.h \ generated/a7xx_perfcntrs.xml.h \ + generated/a8xx_enums.xml.h \ generated/a6xx_gmu.xml.h \ generated/adreno_common.xml.h \ generated/adreno_pm4.xml.h \ diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 51d32c66512e..ef2f1f986718 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -381,7 +381,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm= _gem_submit *submit) rbmemptr_stats(ring, index, alwayson_end)); =20 /* Write the fence to the scratch register */ - OUT_PKT4(ring, REG_A6XX_CP_SCRATCH_REG(2), 1); + OUT_PKT4(ring, REG_A6XX_CP_SCRATCH(2), 1); OUT_RING(ring, submit->seqno); =20 /* @@ -522,7 +522,7 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm= _gem_submit *submit) rbmemptr_stats(ring, index, alwayson_end)); =20 /* Write the fence to the scratch register */ - OUT_PKT4(ring, REG_A6XX_CP_SCRATCH_REG(2), 1); + OUT_PKT4(ring, REG_A6XX_CP_SCRATCH(2), 1); OUT_RING(ring, submit->seqno); =20 OUT_PKT7(ring, CP_THREAD_CONTROL, 1); @@ -1291,7 +1291,7 @@ static int hw_init(struct msm_gpu *gpu) } =20 if (adreno_is_a660_family(adreno_gpu)) - gpu_write(gpu, REG_A6XX_CP_LPAC_PROG_FIFO_SIZE, 0x00000020); + gpu_write(gpu, REG_A7XX_CP_LPAC_PROG_FIFO_SIZE, 0x00000020); =20 /* Setting the mem pool size */ if (adreno_is_a610(adreno_gpu)) { @@ -1556,7 +1556,7 @@ static void a6xx_recover(struct msm_gpu *gpu) =20 for (i =3D 0; i < 8; i++) DRM_DEV_INFO(&gpu->pdev->dev, "CP_SCRATCH_REG%d: %u\n", i, - gpu_read(gpu, REG_A6XX_CP_SCRATCH_REG(i))); + gpu_read(gpu, REG_A6XX_CP_SCRATCH(i))); =20 if (hang_debug) a6xx_dump(gpu); @@ -1743,10 +1743,10 @@ static int a6xx_fault_handler(void *arg, unsigned l= ong iova, int flags, void *da const char *block =3D "unknown"; =20 u32 scratch[] =3D { - gpu_read(gpu, REG_A6XX_CP_SCRATCH_REG(4)), - gpu_read(gpu, REG_A6XX_CP_SCRATCH_REG(5)), - gpu_read(gpu, REG_A6XX_CP_SCRATCH_REG(6)), - gpu_read(gpu, REG_A6XX_CP_SCRATCH_REG(7)), + gpu_read(gpu, REG_A6XX_CP_SCRATCH(4)), + gpu_read(gpu, REG_A6XX_CP_SCRATCH(5)), + gpu_read(gpu, REG_A6XX_CP_SCRATCH(6)), + gpu_read(gpu, REG_A6XX_CP_SCRATCH(7)), }; =20 if (info) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.h index 4c5fe627d368..688b8ce02fdc 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h @@ -71,8 +71,8 @@ static const struct a6xx_cluster { u32 sel_val; } a6xx_clusters[] =3D { CLUSTER(CLUSTER_GRAS, a6xx_gras_cluster, 0, 0), - CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rac, REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNT= L_CD, 0x0), - CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rbp, REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNT= L_CD, 0x9), + CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rac, REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_C= D, 0x0), + CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rbp, REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_C= D, 0x9), CLUSTER(CLUSTER_PS, a6xx_ps_cluster, 0, 0), CLUSTER(CLUSTER_FE, a6xx_fe_cluster, 0, 0), CLUSTER(CLUSTER_PC_VS, a6xx_pc_vs_cluster, 0, 0), @@ -303,8 +303,8 @@ static const u32 a660_registers[] =3D { static const struct a6xx_registers a6xx_reglist[] =3D { REGS(a6xx_registers, 0, 0), REGS(a660_registers, 0, 0), - REGS(a6xx_rb_rac_registers, REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, 0), - REGS(a6xx_rb_rbp_registers, REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, 9), + REGS(a6xx_rb_rac_registers, REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, 0), + REGS(a6xx_rb_rbp_registers, REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, 9), }; =20 static const u32 a6xx_ahb_registers[] =3D { 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 087473679893..d513e03fef08 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 @@ -691,14 +691,14 @@ static const u32 gen7_0_0_tpl1_noncontext_pipe_lpac_r= egisters[] =3D { static_assert(IS_ALIGNED(sizeof(gen7_0_0_tpl1_noncontext_pipe_lpac_registe= rs), 8)); =20 static const struct gen7_sel_reg gen7_0_0_rb_rac_sel =3D { - .host_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val =3D 0x0, }; =20 static const struct gen7_sel_reg gen7_0_0_rb_rbp_sel =3D { - .host_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val =3D 0x9, }; =20 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 9bec75e830a3..7897622ea6f7 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 @@ -478,14 +478,14 @@ static const u32 gen7_2_0_sp_noncontext_pipe_lpac_hls= q_state_registers[] =3D { static_assert(IS_ALIGNED(sizeof(gen7_2_0_sp_noncontext_pipe_lpac_hlsq_stat= e_registers), 8)); =20 static const struct gen7_sel_reg gen7_2_0_rb_rac_sel =3D { - .host_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val =3D 0x0, }; =20 static const struct gen7_sel_reg gen7_2_0_rb_rbp_sel =3D { - .host_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val =3D 0x9, }; =20 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 70805a5121be..20125d1aa21d 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 @@ -1105,14 +1105,14 @@ static const u32 gen7_9_0_tpl1_pipe_lpac_cluster_sp= _ps_usptp_registers[] =3D { static_assert(IS_ALIGNED(sizeof(gen7_9_0_tpl1_pipe_lpac_cluster_sp_ps_uspt= p_registers), 8)); =20 static const struct gen7_sel_reg gen7_9_0_rb_rac_sel =3D { - .host_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val =3D 0, }; =20 static const struct gen7_sel_reg gen7_9_0_rb_rbp_sel =3D { - .host_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg =3D REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg =3D REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val =3D 0x9, }; =20 diff --git a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml b/drivers/gpu/dr= m/msm/registers/adreno/a6xx.xml index 369b96d7f7c9..b4d65f474cb9 100644 --- a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml +++ b/drivers/gpu/drm/msm/registers/adreno/a6xx.xml @@ -7,9 +7,11 @@ xsi:schemaLocation=3D"https://gitlab.freedesktop.org/freed= reno/ rules-fd.xsd"> + + =20 - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + @@ -115,11 +214,16 @@ by a particular renderpass/blit. - + + + + + - + + - + b0..7 identifies where MRB data starts (and RB data ends) b8.15 identifies where VSD data starts (and MRB data ends) @@ -131,7 +235,7 @@ by a particular renderpass/blit. - + low bits identify where CP_SET_DRAW_STATE stateobj processing starts (and IB2 data ends). I'm guessing @@ -147,176 +251,275 @@ by a particular renderpass/blit. - - - - - + + + + + + + + - + + + =20 - + + + + + + + + + + - + + + + + + + =20 - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + =20 - - - - - - - - - - - - - - - number of remaining dwords incl current dword being consumed? - - - - number of remaining dwords incl current dword being consumed? - - - - number of remaining dwords incl current dword being consumed? - - - - number of remaining dwords incl current dword being consumed? - - - - number of dwords that have already been read but haven't been consu= med by $addr - - - + + + + + + + + + + + + + + + + + + + + + + number of remaining dwords incl current dword being consumed? - + + + + + + + + + + + + + + + + =20 - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -342,22 +545,59 @@ by a particular renderpass/blit. - - - + + + - =20 - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =20 - - + + + + + + + + + + + + + =20 @@ -376,49 +616,96 @@ by a particular renderpass/blit. =20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =20 =20 - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + =20 - + - - - - - + + + + + + + + =20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + =20 @@ -610,6 +938,8 @@ by a particular renderpass/blit. + + @@ -638,72 +968,277 @@ by a particular renderpass/blit. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - Set to true when binning, isn't changed afterwards - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + - + - - - + + + + + + + + + + + + + =20 - - + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -712,26 +1247,55 @@ by a particular renderpass/blit. + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =20 + @@ -803,10 +1367,14 @@ by a particular renderpass/blit. =20 =20 - - + + + + - + + + =20 @@ -829,6 +1397,7 @@ by a particular renderpass/blit. =20 + =20 @@ -839,6 +1408,18 @@ by a particular renderpass/blit. =20 + + + + + + + + + + + + @@ -853,6 +1434,7 @@ by a particular renderpass/blit. =20 + =20 @@ -860,9 +1442,7 @@ by a particular renderpass/blit. =20 - - - + =20 @@ -887,6 +1467,7 @@ by a particular renderpass/blit. =20 + =20 @@ -921,10 +1502,23 @@ by a particular renderpass/blit. =20 + + + + + + + + + + + + + =20 @@ -951,6 +1545,13 @@ by a particular renderpass/blit. + + + + + + + =20 @@ -958,25 +1559,31 @@ by a particular renderpass/blit. =20 + + + =20 =20 + =20 =20 + =20 =20 + =20 @@ -984,9 +1591,17 @@ by a particular renderpass/blit. =20 + + + + + + + + @@ -994,6 +1609,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1008,6 +1624,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1022,10 +1639,16 @@ by a particular renderpass/blit. =20 + + + + =20 + + @@ -1085,6 +1708,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1123,6 +1747,23 @@ by a particular renderpass/blit. =20 =20 + + + + + Disable LRZ feedback writes + + + Allows draws that don't have GRAS_LRZ_CNTL.LRZ_WRITE but have + GRAS_LRZ_CNTL.ENABLE to contribute to LRZ during RENDERING pass. + In sysmem mode GRAS_LRZ_CNTL.LRZ_WRITE is not considered. + + + + + + + @@ -1130,6 +1771,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1137,6 +1779,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1158,13 +1801,21 @@ by a particular renderpass/blit. =20 + + + + + + + =20 =20 + =20 @@ -1176,14 +1827,26 @@ by a particular renderpass/blit. =20 + + + + + + + + + =20 =20 + + + @@ -1203,6 +1866,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1210,6 +1874,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1217,8 +1882,10 @@ by a particular renderpass/blit. =20 + =20 + =20 @@ -1226,6 +1893,7 @@ by a particular renderpass/blit. =20 + =20 @@ -1263,6 +1931,12 @@ by a particular renderpass/blit. =20 + + + + + + =20 @@ -1275,14 +1949,17 @@ by a particular renderpass/blit. =20 + =20 =20 + =20 + =20 @@ -1290,6 +1967,9 @@ by a particular renderpass/blit. =20 + + + =20 =20 + + + =20 + =20 @@ -1357,11 +2041,11 @@ by a particular renderpass/blit. =20 + =20 LUT used to convert quality buffer values to HW shading rate values.= An array of 4-bit values. - - - + + =20 @@ -1408,16 +2092,35 @@ by a particular renderpass/blit. =20 + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + =20 + =20 @@ -1534,8 +2238,32 @@ by a particular renderpass/blit. - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1627,6 +2355,8 @@ by a particular renderpass/blit. + + =20 @@ -1708,6 +2438,14 @@ by a particular renderpass/blit. =20 + + + + + + + + @@ -1720,6 +2458,14 @@ by a particular renderpass/blit. + + + + + + + + @@ -1799,7 +2545,7 @@ by a particular renderpass/blit. - + @@ -1814,7 +2560,17 @@ by a particular renderpass/blit. --> - + + + + + + + + + + + @@ -1849,9 +2605,19 @@ by a particular renderpass/blit. the address is specified through CP_EVENT_WRITE7::WRITE_SAMPLE_COUNT. - =20 - + + + + + + + + + + + + =20 =20 - + - + =20 @@ -1963,7 +2729,7 @@ by a particular renderpass/blit. - + @@ -1972,26 +2738,40 @@ by a particular renderpass/blit. - + + + + + - + + + + + + + - - - - + + + + + + + - - + + + =20 @@ -2014,6 +2794,10 @@ by a particular renderpass/blit. =20 + + + + @@ -2028,6 +2812,9 @@ by a particular renderpass/blit. =20 + + + =20 @@ -2042,6 +2829,7 @@ by a particular renderpass/blit. =20 + =20 @@ -2051,6 +2839,7 @@ by a particular renderpass/blit. =20 + @@ -2091,9 +2880,13 @@ by a particular renderpass/blit. =20 + + + + =20 @@ -2119,6 +2912,15 @@ by a particular renderpass/blit. =20 + + Packed array of a6xx_varying_interp_mode + + + + Packed array of a6xx_varying_ps_repl_mode + + + @@ -2128,6 +2930,11 @@ by a particular renderpass/blit. =20 + + + + + + =20 + =20 @@ -2181,13 +2991,23 @@ by a particular renderpass/blit. =20 + + + + + + + + =20 + =20 + =20 @@ -2211,6 +3031,10 @@ by a particular renderpass/blit. =20 + + + + @@ -2231,6 +3055,7 @@ by a particular renderpass/blit. =20 + =20 =20 - - - - + + + + + + + + + + - - - - + + + + + + + + + =20 + =20 @@ -2285,6 +3139,7 @@ by a particular renderpass/blit. =20 + =20 @@ -2292,10 +3147,13 @@ by a particular renderpass/blit. =20 + =20 + =20 + =20 =20 @@ -2304,6 +3162,7 @@ by a particular renderpass/blit. =20 + =20 @@ -2311,12 +3170,19 @@ by a particular renderpass/blit. =20 + =20 =20 + + + + + + =20 @@ -2326,6 +3192,9 @@ by a particular renderpass/blit. =20 + + + @@ -2333,6 +3202,7 @@ by a particular renderpass/blit. =20 + =20 + + =20 =20 + =20 @@ -2381,7 +3255,13 @@ by a particular renderpass/blit. =20 + + + + + + =20 @@ -2391,24 +3271,37 @@ by a particular renderpass/blit. =20 + + - - - - + + + + + + + + + + =20 + + + + + =20 @@ -2419,6 +3312,10 @@ by a particular renderpass/blit. =20 + + + + - + + + =20 @@ -2532,9 +3439,13 @@ by a particular renderpass/blit. =20 =20 - + + + + + =20 =20 - - - @@ -3036,6 +3948,7 @@ by a particular renderpass/blit. must be at least the actual CONSTLEN. + @@ -3158,6 +4071,18 @@ by a particular renderpass/blit. =20 + + + + + + + + + + + + =20 + =20 =20 + + @@ -3235,7 +4165,8 @@ by a particular renderpass/blit. =20 - + + @@ -3244,10 +4175,14 @@ by a particular renderpass/blit. =20 - + + + + + =20 - - + + =20 =20 + + + @@ -3307,6 +4268,8 @@ by a particular renderpass/blit. =20 + + @@ -3387,10 +4350,11 @@ by a particular renderpass/blit. + =20 - + =20 @@ -3458,10 +4427,8 @@ by a particular renderpass/blit. =20 - - - - + + =20 @@ -3745,6 +4712,7 @@ by a particular renderpass/blit. =20 + =20 @@ -3784,12 +4752,12 @@ by a particular renderpass/blit. - + =20 - + =20 =20 @@ -3918,6 +4886,7 @@ by a particular renderpass/blit. + diff --git a/drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml b/drivers/= gpu/drm/msm/registers/adreno/a6xx_enums.xml index 4e42f055b85f..81538831dc19 100644 --- a/drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml +++ b/drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml @@ -303,7 +303,7 @@ xsi:schemaLocation=3D"https://gitlab.freedesktop.org/fr= eedreno/ rules-fd.xsd"> =20 + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/gpu/drm/msm/registers/adreno/a8xx_enums.xml b/drivers/= gpu/drm/msm/registers/adreno/a8xx_enums.xml new file mode 100644 index 000000000000..aee8871d006f --- /dev/null +++ b/drivers/gpu/drm/msm/registers/adreno/a8xx_enums.xml @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/gpu/drm/msm/registers/adreno/adreno_common.xml b/drive= rs/gpu/drm/msm/registers/adreno/adreno_common.xml index 06020dc1df44..79d204f1e400 100644 --- a/drivers/gpu/drm/msm/registers/adreno/adreno_common.xml +++ b/drivers/gpu/drm/msm/registers/adreno/adreno_common.xml @@ -11,6 +11,7 @@ xsi:schemaLocation=3D"https://gitlab.freedesktop.org/free= dreno/ rules-fd.xsd"> + =20 --=20 2.51.0