fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 11:20:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno: Don't program non-context reg with CRB
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
PC_UNKNOWN_9E72 is a non-context reg, and the weird hangs without
duplicating a reg writes was due to using CP_CONTEXT_REG_BUNCH with it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37415>
This commit is contained in:
Connor Abbott 2025-09-16 11:24:32 -04:00 • committed by Marge Bot
parent 0a1f56fb90
commit 5511cdf2aa
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/freedreno/a6xx/fd6_emit.cc
View file

@ -831,7 +831,7 @@ fd6_emit_static_non_context_regs(struct fd_context *ctx, fd_cs &cs)
{
struct fd_screen *screen = ctx->screen;
fd_ncrb<CHIP> ncrb(cs, 27 + ARRAY_SIZE(screen->info->a6xx.magic_raw));
fd_ncrb<CHIP> ncrb(cs, 28 + ARRAY_SIZE(screen->info->a6xx.magic_raw));
if (CHIP >= A7XX) {
/* On A7XX, RB_CCU_CNTL was broken into two registers, RB_CCU_CNTL which has
@ -907,6 +907,8 @@ fd6_emit_static_non_context_regs(struct fd_context *ctx, fd_cs &cs)
ncrb.add(GRAS_BIN_FOVEAT(CHIP));
ncrb.add(RB_BIN_FOVEAT(CHIP));
}
ncrb.add(A6XX_PC_UNKNOWN_9E72());
}
/**
@ -936,15 +938,8 @@ fd6_emit_static_context_regs(struct fd_context *ctx, fd_cs &cs)
);
crb.add(A6XX_VFD_MODE_CNTL(.vertex = true, .instance = true));
if (CHIP == A6XX) {
if (CHIP == A6XX)
crb.add(VPC_UNKNOWN_9107(CHIP));
} else {
/* This seems to be load-bearing, we need to set it both here
* and below. Previously we were unconditionally zero'ing
* VPC_UNKNOWN_9107 which happens to be the same offset.
*/
crb.add(VPC_RAST_STREAM_CNTL(CHIP));
}
crb.add(A6XX_RB_UNKNOWN_8811(.dword = 0x00000010));
crb.add(PC_MODE_CNTL(CHIP, .dword=screen->info->a6xx.magic.PC_MODE_CNTL));
crb.add(GRAS_LRZ_PS_INPUT_CNTL(CHIP));
@ -982,8 +977,6 @@ fd6_emit_static_context_regs(struct fd_context *ctx, fd_cs &cs)
crb.add(VPC_UNKNOWN_9210(CHIP));
}
crb.add(A6XX_PC_UNKNOWN_9E72());
crb.add(A6XX_TPL1_MODE_CNTL(
.isammode = ISAMMODE_GL,
.texcoordroundmode = COORD_TRUNCATE,