AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadcom/qpu: set V3D 7.x names for some waddr aliasing

Browse Source 
V3D 7.x got rid of the accumulator, but still uses the values for
WADDR_R5 and WADDR_R5REP, so let's return a proper name and add some
aliases.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25450>
This commit is contained in:
Alejandro Piñeiro
2021-08-05 01:00:47 +02:00
committed by Marge Bot
parent e1c19d55ea
commit f9bcefa964
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/qpu/qpu_instr.c
+8
View File
@@ -35,6 +35,14 @@ v3d_qpu_magic_waddr_name(const struct v3d_device_info *devinfo,
if (devinfo->ver < 40 && waddr == V3D_QPU_WADDR_TMU)
return "tmu";
/* V3D 7.x QUAD and REP aliases R5 and R5REPT in the table below
*/
if (devinfo->ver >= 71 && waddr == V3D_QPU_WADDR_QUAD)
return "quad";
if (devinfo->ver >= 71 && waddr == V3D_QPU_WADDR_REP)
return "rep";
static const char *waddr_magic[] = {
[V3D_QPU_WADDR_R0] = "r0",
[V3D_QPU_WADDR_R1] = "r1",
src/broadcom/qpu/qpu_instr.h
+4 -2
View File
@@ -93,7 +93,8 @@ enum v3d_qpu_waddr {
V3D_QPU_WADDR_R2 = 2, /* Reserved on V3D 7.x */
V3D_QPU_WADDR_R3 = 3, /* Reserved on V3D 7.x */
V3D_QPU_WADDR_R4 = 4, /* Reserved on V3D 7.x */
V3D_QPU_WADDR_R5 = 5,
V3D_QPU_WADDR_R5 = 5, /* V3D 4.x */
V3D_QPU_WADDR_QUAD = 5, /* V3D 7.x */
V3D_QPU_WADDR_NOP = 6,
V3D_QPU_WADDR_TLB = 7,
V3D_QPU_WADDR_TLBU = 8,
@@ -129,7 +130,8 @@ enum v3d_qpu_waddr {
V3D_QPU_WADDR_TMUHSCM = 44,
V3D_QPU_WADDR_TMUHSF = 45,
V3D_QPU_WADDR_TMUHSLOD = 46,
V3D_QPU_WADDR_R5REP = 55,
V3D_QPU_WADDR_R5REP = 55, /* V3D 4.x */
V3D_QPU_WADDR_REP = 55, /* V3D 7.x */
};
struct v3d_qpu_flags {