freedreno: Don't set UCHE_CLIENT_PF
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

The kernel sets this up, and it's also read by the kernel for GPU
fault, so don't write this in Mesa.

Signed-off-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41131>
This commit is contained in:
Karmjit Mahil 2026-04-23 12:53:43 +01:00 committed by Marge Bot
parent 7428af29f6
commit 4d4eb027d5

View file

@ -293,7 +293,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x10000000],
@ -332,7 +331,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0x00000880],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00000430],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0x00080000],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -366,7 +364,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00000400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0x01000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -437,7 +434,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0x00000880],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001430],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0x00080000],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x10000001],
@ -473,7 +469,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00000420],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -509,7 +504,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001430],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -545,7 +539,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0x01000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000004],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -586,7 +579,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0x00000006],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -621,7 +613,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0x01000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -656,7 +647,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0x6],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 1],
@ -693,7 +683,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0x1200000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0x2000400],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -743,7 +732,6 @@ add_gpus([
[A6XXRegs.REG_A6XX_GRAS_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_SP_CHICKEN_BITS, 0x00001400],
[A6XXRegs.REG_A6XX_SP_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A6XX_HLSQ_DBG_ECO_CNTL, 0x02000000],
[A6XXRegs.REG_A6XX_VPC_DBG_ECO_CNTL, 0],
[A6XXRegs.REG_A6XX_UCHE_UNKNOWN_0E12, 0x1],
@ -880,7 +868,6 @@ a730_raw_magic_regs = [
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_1, 0x00402400],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_2, 0x00000000],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_3, 0x00000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E10, 0x00000000],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E11, 0x00000040],
[A6XXRegs.REG_A7XX_SP_HLSQ_DBG_ECO_CNTL, 0x00008000],
@ -930,7 +917,6 @@ a740_raw_magic_regs = [
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_1, 0x00400400],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_2, 0x00430800],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_3, 0x00000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E10, 0x00000000],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E11, 0x00000000],
[A6XXRegs.REG_A7XX_SP_HLSQ_DBG_ECO_CNTL, 0x00000000],
@ -1037,7 +1023,6 @@ add_gpus([
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_1, 0x00400400],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_2, 0x00430800],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_3, 0x00000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E10, 0x00000000],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E11, 0x00000000],
[A6XXRegs.REG_A7XX_SP_HLSQ_DBG_ECO_CNTL, 0x00000000],
@ -1121,7 +1106,6 @@ add_gpus([
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_1, 0x00400400],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_2, 0x00430820],
[A6XXRegs.REG_A7XX_SP_CHICKEN_BITS_3, 0x00000000],
[A6XXRegs.REG_A6XX_UCHE_CLIENT_PF, 0x00000084],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E10, 0x00000000],
[A6XXRegs.REG_A7XX_UCHE_UNKNOWN_0E11, 0x00000080],
[A6XXRegs.REG_A7XX_SP_HLSQ_DBG_ECO_CNTL, 0x00000000],