From mboxrd@z Thu Jan 1 00:00:00 1970 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 C8BDB285CBF for ; Tue, 30 Sep 2025 05:51:00 +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=1759211470; cv=none; b=oN4hj02uMqb0s8FR/OpOxYpiXvNIimSHm3ujNhEGR0Ssvw1rEiQw6DvaD95qY1RfjJpzMYB9wyNZq6p0fngtTknkuX1f+/xeE9nW2NJAsqwPLfTmpuemSQ3hSk1UsuBaZk1/v1kO3zSIY6IFOu1p+i62rYFxfVqeJdELU/5gVto= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759211470; c=relaxed/simple; bh=3yhpxoKFHd+urFH3bQUe2zCQj5yMI96pGEyPCWgKoIY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oUnBO4QBFLzNQwdnhhVgEMzbh3XF0C28Y+DErMo1xVTy/zcBFqfbvg29fzrOyX8p9BK7r3nVqbp1PqYT4g6QEbc1Y4gxSLrHExa1DWtKe9cri0WDam0DOeuH/0LpGJ89XDI+HigUkEagW74zHWsQOd/KIQ11P66Ns08Fb7FuRYk= 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=N3N5t/+Z; 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="N3N5t/+Z" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58U4HOWL027373 for ; Tue, 30 Sep 2025 05:51:00 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= ShC5H+LmNUzg73PQdRLphsnfojO5yOUZ29DFYPYvx5o=; b=N3N5t/+Z+abxMWnC 2kAxho8QzLNRqCbE487oTN2m7K4PSOQMi3X4sAWob8PaST+j/EM/HxDRLqiRR7n/ YwbQX5unb2PNCsSGAPyIgcyTStSunDoBxh/68sdQT2W0YRSfK381uJrGW0neD4Tm IxRuXFbkyofhytfSE5Xl1pMl03KvjBDV2Gm/Sb0jAzAEzpSpoOvKVnYzFtnwVeyT PWSsrTv22oJkK1axcQYke3GE8HSBSrbKUD446VSKuJVddEf0ElYD4ngemRj5TDnu 9QEjQCtH8tHDwnRmcYiQGf6an6yzkgP+butsEtlZkGXRuvQf5HBwglS/LnvIGVSS 4tuLFA== 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 49e851fq79-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 30 Sep 2025 05:50:59 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3324538ceb0so8812934a91.1 for ; Mon, 29 Sep 2025 22:50:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759211458; x=1759816258; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ShC5H+LmNUzg73PQdRLphsnfojO5yOUZ29DFYPYvx5o=; b=EEyKjCIMsUHv95Bmjb2GzSWxsPIJG73eDF4+GCw80sdr8rrGFQzQyl36L9o4O1V+Tn kUwUFbLDwPsTNophX/ild6cBxU4wfCI7NgNW7cZ4qX3yGTbO+Z6w8IYPO+ggVSuL74aw MnkSnDnaad4D1qGHahuegSWgCvJahyrsSOLOumyXXwqZvtqTEUOHd/j4ymxeFhIXr054 I2TS7WudGr4qfjwCrjMc9ZltPqo5Nj9NBtNbDFc8z9HslEHAc03FJdKRv0pcU0Kk6RAN NG3r3ZRq1Mr8s4GyR7lnRsovkLdpUufHCbNkZfkfY+jgmrwJA03mnRs1kQU6ePdJmiBU bE0A== X-Forwarded-Encrypted: i=1; AJvYcCUKXZijTFOO2v+hp/0KFC+2r24T7dhSex24eT/eSEoa8j4sGmA5//ilGk2vZqjcN033ns7GZdvSf9DL@vger.kernel.org X-Gm-Message-State: AOJu0Yx+ACh6e12ldCoXmxxSo/a9nCPsiLZP131/jWl/HZgeRrpdA2mu skuvAOko4IBBCZ04ts3HtWeub/u8uNtqjBE51Y+r0/h0j03+eUrhUnDcMBKaFmvW8HJvoilXMpZ eA0G4CRa0a2xnUaYJGDKdf9Xevan0jIDn8HIHq9mJVa3CYSs6yYY1mCBaQKfb+p+t X-Gm-Gg: ASbGncunCz9CIe5n7UPdHEIZl7T9Xc5xGeb0yyLZbD09ocjauDswZA9DrG1wSn/X67A rKDPXmR+7ouQ5MnRu+eYAl0Sz2QFAu4A6EjH5/3btxK/AUjRjbZHpnG3NaCJH1wXtLGKDvkM9Li vCAc3DYRtudd5+PG5U8jo3IwqgW58DecC1/fh6fF/hj7YrxLTzDAlV7W4jCmj9B04jJ8zaFGcrT bOLYtUluoru4NbzRtXsrApIBaThsaM+rGMallrnOVO2hDjYNEXtShGVe1CgbqA8skGasqL4vzMZ 5IezvUAaVsE/VSoRQENgyH4ZWd3CGSbosfM5y2uoSOBsOUbcEEEumLv/firTP/3Abo2Aig== X-Received: by 2002:a17:90b:1b4f:b0:335:5e84:6d37 with SMTP id 98e67ed59e1d1-3355e846e68mr14654225a91.6.1759211456741; Mon, 29 Sep 2025 22:50:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGG49+yF7frh7lEziXuvWHvgPAJ9z5L2rhmeWW+2LdylXTmRs0m3qUKQ1HT+s85/mwWZdP/cA== X-Received: by 2002:a17:90b:1b4f:b0:335:5e84:6d37 with SMTP id 98e67ed59e1d1-3355e846e68mr14654197a91.6.1759211455996; Mon, 29 Sep 2025 22:50:55 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3341be23412sm19029779a91.20.2025.09.29.22.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 22:50:55 -0700 (PDT) From: Akhil P Oommen Date: Tue, 30 Sep 2025 11:18:14 +0530 Subject: [PATCH 09/17] drm/msm/a6xx: Sync latest register definitions Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250930-kaana-gpu-support-v1-9-73530b0700ed@oss.qualcomm.com> References: <20250930-kaana-gpu-support-v1-0-73530b0700ed@oss.qualcomm.com> In-Reply-To: <20250930-kaana-gpu-support-v1-0-73530b0700ed@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 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.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759211380; l=214137; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=3yhpxoKFHd+urFH3bQUe2zCQj5yMI96pGEyPCWgKoIY=; b=cUQ8HyZ6/1e1GYxKpzFE1fyF60kPRCr43Tu4cA9qIrad9h8PRxOpTHhfHrU3fpTwz67o6QFcc D4ZrkULCm80Bfo3GnkwRUJyZ2bfON+vObrPZ6KtDaaPconTesf4PVLx X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Authority-Analysis: v=2.4 cv=OJoqHCaB c=1 sm=1 tr=0 ts=68db6fc3 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=e5mUnYsNAAAA:8 a=SSmOFEACAAAA:8 a=EUspDBNiAAAA:8 a=vEUdr9KV3zqUqJRwHYAA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 a=Vxmtnl_E_bksehYqCbjh:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTI3MDAzMiBTYWx0ZWRfX12DcrlJeFOZl LMKayQu6LkSTzOjN+ZndZv7YZNYFyxWOIA5k3PfajjYhWONvr1zYUAVl2IIxy+rFuT1l33d/0Fq OvMCqS7Rh4ReoQbZPoBA6dYzeQ5DB/X5BarEqHxzrD52fZyo4hi34qB3IwmQ98/VXQJj0jWianq KiU0ma7+sQ+gWyu+8Y0coItVUMGIAWlCZAkKXoW3LXc6grnqXu2CdKJSEkthWQupjPiyTb+6Bes WR3Jn7OqZwDY+Qd87gGt/cEursz+bifSMjmwFDTRkYqaR9vkO0oUKZS4RiWwtDDrz8Us/+YgbGN yeI3JcN1SPrIATDnh0Nk3QV6xBuV36f9dHagV7oVJI9E7N98dsnulAX2VLaQI0BY/GLi0KmwNxW a59GgWbF7/F8mChO9yI17U+atyjk8g== X-Proofpoint-ORIG-GUID: iY_nERms15iEEjepLC_RHt5F2dqjksTE X-Proofpoint-GUID: iY_nERms15iEEjepLC_RHt5F2dqjksTE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-30_01,2025-09-29_04,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2509270032 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 | 1939 +++++++++++++++----- .../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, 1886 insertions(+), 514 deletions(-) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 0c0dfb25f01b193b10946fae20138caf32cf0ed2..7acf2cc13cd047eb7f5b3f14e1a42a1cc145e087 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -201,6 +201,7 @@ ADRENO_HEADERS = \ 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/adreno/a6xx_gpu.c index 27168f3a7264f2651cb41c8d59e6dc80ddba4262..bd4f98b5457356c5454d0316e59d7e8253401712 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -375,7 +375,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) rbmemptr_stats(ring, index, alwayson_end)); /* 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); /* @@ -516,7 +516,7 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) rbmemptr_stats(ring, index, alwayson_end)); /* 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); OUT_PKT7(ring, CP_THREAD_CONTROL, 1); @@ -1285,7 +1285,7 @@ static int hw_init(struct msm_gpu *gpu) } 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); /* Setting the mem pool size */ if (adreno_is_a610(adreno_gpu)) { @@ -1550,7 +1550,7 @@ static void a6xx_recover(struct msm_gpu *gpu) for (i = 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))); if (hang_debug) a6xx_dump(gpu); @@ -1737,10 +1737,10 @@ static int a6xx_fault_handler(void *arg, unsigned long iova, int flags, void *da const char *block = "unknown"; u32 scratch[] = { - 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)), }; 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 4c5fe627d368dadadae84e0d4478f4e93bf5a422..688b8ce02fdc38e22459d5e366a3f97b99904118 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[] = { CLUSTER(CLUSTER_GRAS, a6xx_gras_cluster, 0, 0), - CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rac, REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, 0x0), - CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rbp, REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, 0x9), + CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rac, REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, 0x0), + CLUSTER(CLUSTER_PS, a6xx_ps_cluster_rbp, REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, 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[] = { static const struct a6xx_registers a6xx_reglist[] = { 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), }; static const u32 a6xx_ahb_registers[] = { diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h b/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h index 087473679893591a6c622fe6999d157eaad593aa..d513e03fef08b2f9cc25261e11f50fdf06169d77 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_registers[] = { static_assert(IS_ALIGNED(sizeof(gen7_0_0_tpl1_noncontext_pipe_lpac_registers), 8)); static const struct gen7_sel_reg gen7_0_0_rb_rac_sel = { - .host_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val = 0x0, }; static const struct gen7_sel_reg gen7_0_0_rb_rbp_sel = { - .host_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val = 0x9, }; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h b/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h index 9bec75e830a3cc158d7ef332ffebc02138ad5fa8..7897622ea6f7b04b7a1318e7609d632ce18c5e5f 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_hlsq_state_registers[] = { static_assert(IS_ALIGNED(sizeof(gen7_2_0_sp_noncontext_pipe_lpac_hlsq_state_registers), 8)); static const struct gen7_sel_reg gen7_2_0_rb_rac_sel = { - .host_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val = 0x0, }; static const struct gen7_sel_reg gen7_2_0_rb_rbp_sel = { - .host_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val = 0x9, }; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h b/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h index 70805a5121be1ba01e3154134ad94f9f37536506..20125d1aa21d76298f41fa2823780ae6708668da 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[] = { static_assert(IS_ALIGNED(sizeof(gen7_9_0_tpl1_pipe_lpac_cluster_sp_ps_usptp_registers), 8)); static const struct gen7_sel_reg gen7_9_0_rb_rac_sel = { - .host_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val = 0, }; static const struct gen7_sel_reg gen7_9_0_rb_rbp_sel = { - .host_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_HOST, - .cd_reg = REG_A6XX_RB_RB_SUB_BLOCK_SEL_CNTL_CD, + .host_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_HOST, + .cd_reg = REG_A6XX_RB_SUB_BLOCK_SEL_CNTL_CD, .val = 0x9, }; diff --git a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml b/drivers/gpu/drm/msm/registers/adreno/a6xx.xml index 369b96d7f7c9f34d551a540e69c679c75a4b7bd8..ddde2e03b748f447b5e57571e2b04c68f8f2efc2 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="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd"> + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + @@ -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,267 @@ by a particular renderpass/blit. - - - - - + + + + + + + + - + + + + - + - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - 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 consumed by $addr - - - - number of remaining dwords incl current dword being consumed? - - + + + + + + + + + + + + + + + + - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -342,22 +537,59 @@ by a particular renderpass/blit. - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -376,49 +608,96 @@ by a particular renderpass/blit. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -610,6 +930,8 @@ by a particular renderpass/blit. + + @@ -638,72 +960,277 @@ by a particular renderpass/blit. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - Set to true when binning, isn't changed afterwards - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + - + - - - + + + + + + + + + + + + + - - + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -712,26 +1239,55 @@ by a particular renderpass/blit. + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -803,10 +1359,14 @@ by a particular renderpass/blit. - - + + + + - + + + @@ -829,6 +1389,7 @@ by a particular renderpass/blit. + @@ -839,6 +1400,18 @@ by a particular renderpass/blit. + + + + + + + + + + + + @@ -853,6 +1426,7 @@ by a particular renderpass/blit. + @@ -860,9 +1434,7 @@ by a particular renderpass/blit. - - - + @@ -887,6 +1459,7 @@ by a particular renderpass/blit. + @@ -921,10 +1494,23 @@ by a particular renderpass/blit. + + + + + + + + + + + + + @@ -951,6 +1537,13 @@ by a particular renderpass/blit. + + + + + + + @@ -958,25 +1551,31 @@ by a particular renderpass/blit. + + + + + + @@ -984,9 +1583,17 @@ by a particular renderpass/blit. + + + + + + + + @@ -994,6 +1601,7 @@ by a particular renderpass/blit. + @@ -1008,6 +1616,7 @@ by a particular renderpass/blit. + @@ -1022,10 +1631,16 @@ by a particular renderpass/blit. + + + + + + @@ -1085,6 +1700,7 @@ by a particular renderpass/blit. + @@ -1123,6 +1739,23 @@ by a particular renderpass/blit. + + + + + 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 +1763,7 @@ by a particular renderpass/blit. + @@ -1137,6 +1771,7 @@ by a particular renderpass/blit. + @@ -1158,13 +1793,21 @@ by a particular renderpass/blit. + + + + + + + + @@ -1176,14 +1819,26 @@ by a particular renderpass/blit. + + + + + + + + + + + + @@ -1203,6 +1858,7 @@ by a particular renderpass/blit. + @@ -1210,6 +1866,7 @@ by a particular renderpass/blit. + @@ -1217,8 +1874,10 @@ by a particular renderpass/blit. + + @@ -1226,6 +1885,7 @@ by a particular renderpass/blit. + @@ -1263,6 +1923,12 @@ by a particular renderpass/blit. + + + + + + @@ -1275,14 +1941,17 @@ by a particular renderpass/blit. + + + @@ -1290,6 +1959,9 @@ by a particular renderpass/blit. + + + + + + + @@ -1357,11 +2033,11 @@ by a particular renderpass/blit. + LUT used to convert quality buffer values to HW shading rate values. An array of 4-bit values. - - - + + @@ -1408,16 +2084,35 @@ by a particular renderpass/blit. + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + @@ -1534,8 +2230,32 @@ by a particular renderpass/blit. - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1627,6 +2347,8 @@ by a particular renderpass/blit. + + @@ -1708,6 +2430,14 @@ by a particular renderpass/blit. + + + + + + + + @@ -1720,6 +2450,14 @@ by a particular renderpass/blit. + + + + + + + + @@ -1799,7 +2537,7 @@ by a particular renderpass/blit. - + @@ -1814,7 +2552,17 @@ by a particular renderpass/blit. --> - + + + + + + + + + + + @@ -1849,9 +2597,19 @@ by a particular renderpass/blit. the address is specified through CP_EVENT_WRITE7::WRITE_SAMPLE_COUNT. - - + + + + + + + + + + + + - + - + @@ -1963,7 +2721,7 @@ by a particular renderpass/blit. - + @@ -1972,26 +2730,40 @@ by a particular renderpass/blit. - + + + + + - + + + + + + + - - - - + + + + + + + - - + + + @@ -2014,6 +2786,10 @@ by a particular renderpass/blit. + + + + @@ -2028,6 +2804,9 @@ by a particular renderpass/blit. + + + @@ -2042,6 +2821,7 @@ by a particular renderpass/blit. + @@ -2051,6 +2831,7 @@ by a particular renderpass/blit. + @@ -2091,9 +2872,13 @@ by a particular renderpass/blit. + + + + @@ -2119,6 +2904,15 @@ by a particular renderpass/blit. + + Packed array of a6xx_varying_interp_mode + + + + Packed array of a6xx_varying_ps_repl_mode + + + @@ -2128,6 +2922,11 @@ by a particular renderpass/blit. + + + + + + + @@ -2181,13 +2983,23 @@ by a particular renderpass/blit. + + + + + + + + + + @@ -2211,6 +3023,10 @@ by a particular renderpass/blit. + + + + @@ -2231,6 +3047,7 @@ by a particular renderpass/blit. + - - - - + + + + + + + + + + - - - - + + + + + + + + + + @@ -2285,6 +3131,7 @@ by a particular renderpass/blit. + @@ -2292,10 +3139,13 @@ by a particular renderpass/blit. + + + @@ -2304,6 +3154,7 @@ by a particular renderpass/blit. + @@ -2311,12 +3162,19 @@ by a particular renderpass/blit. + + + + + + + @@ -2326,6 +3184,9 @@ by a particular renderpass/blit. + + + @@ -2333,6 +3194,7 @@ by a particular renderpass/blit. + + + + @@ -2381,7 +3247,13 @@ by a particular renderpass/blit. + + + + + + @@ -2391,24 +3263,37 @@ by a particular renderpass/blit. + + - - - - + + + + + + + + + + + + + + + @@ -2419,6 +3304,10 @@ by a particular renderpass/blit. + + + + @@ -2430,20 +3319,30 @@ by a particular renderpass/blit. + + + + + Written by CP_SET_VISIBILITY_OVERRIDE handler + - + + + - + + + @@ -2532,9 +3431,13 @@ by a particular renderpass/blit. - + + + + + - - - @@ -3036,6 +3940,7 @@ by a particular renderpass/blit. must be at least the actual CONSTLEN. + @@ -3158,6 +4063,18 @@ by a particular renderpass/blit. + + + + + + + + + + + + + + + @@ -3235,7 +4157,8 @@ by a particular renderpass/blit. - + + @@ -3244,10 +4167,14 @@ by a particular renderpass/blit. - + + + + + - + + + + + + + + + + + + + + + + + + + + - - + + + + + @@ -3307,6 +4259,8 @@ by a particular renderpass/blit. + + @@ -3387,10 +4341,11 @@ by a particular renderpass/blit. + - + @@ -3458,10 +4418,8 @@ by a particular renderpass/blit. - - - - + + @@ -3745,6 +4703,7 @@ by a particular renderpass/blit. + @@ -3784,12 +4743,12 @@ by a particular renderpass/blit. - + - + @@ -3917,7 +4876,9 @@ 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 4e42f055b85fdcdd8bc4cbe505f2b81750281065..81538831dc19390ebd090102a5eb5849f8bc38ad 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="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000000000000000000000000000000000..aee8871d006fd20fb08648c9dbebbe36cd697944 --- /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/drivers/gpu/drm/msm/registers/adreno/adreno_common.xml index 06020dc1df4465de2e0a9cfbc4426c5f849f9df0..79d204f1e40065ccefe096ad8f46105b3ef76f96 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="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd"> + -- 2.51.0