summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Russell <bkylerussell@gmail.com>2022-05-07 17:56:09 -0400
committerMarge Bot <emma+marge@anholt.net>2022-06-03 17:28:18 +0000
commit6195ecc599c8acd0eafb67181f57b59c93bf9b86 (patch)
tree2dea7c8dafc8aad071e7808263d2b2eca3bb6a1b
parent53c72db5d3c5c00eec054d5530efee60afd94310 (diff)
etnaviv: don't halve max_instructions for GC400
This allows glamor to successfully compile its shaders on the GC400. When running glamor using the GC400, Xorg reports that the compiled shaders exceed the maximum allowed instructions because the value reported from the kernel is halved. Xserver[314]: etna_draw_vbo:318: compiled shaders are not okay $ cat /sys/kernel/debug/dri/128/gpu | grep instruction_count instruction_count: 256 However, the spec for the Unified vertex-fragment shader explicitly lists 256 as the maximum number of instructions for each shader ("256 for vertex shaders; 256 for fragment shaders"). Signed-off-by: Kyle Russell <bkylerussell@gmail.com> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> (cherry picked from commit aa29e0d858799554396bedefbdcf64a6185d0c47) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16661>
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_screen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 3e803c8a2bd..985ff2ddf86 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -871,7 +871,7 @@ etna_get_specs(struct etna_screen *screen)
} else {
screen->specs.vs_offset = 0x4000;
screen->specs.ps_offset = 0x6000;
- screen->specs.max_instructions = instruction_count / 2;
+ screen->specs.max_instructions = instruction_count;
}
screen->specs.has_icache = false;
}