fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 17:30:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

pan/bi: Use CLPER_V6 on Mali G31

Browse source 
Apparently, CLPER_V7 is missing from Mali G31, but CLPER_V6 works. Fixes
INSTR_INVALID_ENC faults and failures in
dEQP-GLES3.functional.shaders.derivate.* on Dvalin.

Technically not an errata but an implementation difference. I suspect
Mali G51 will need this as well, should we ever allowlist it.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12478>
(cherry picked from commit 61c8e39649)

Conflicts:
	src/panfrost/bifrost/bi_quirks.h
This commit is contained in:
Alyssa Rosenzweig 2021-08-19 22:09:32 +00:00 • committed by Dylan Baker
parent 9075d635de
commit 9fa11ec3d1
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -733,7 +733,7 @@
"description": "pan/bi: Use CLPER_V6 on Mali G31",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

17
src/panfrost/bifrost/bi_quirks.h
View file

@ -39,15 +39,26 @@
#define BIFROST_NO_FP32_TRANSCENDENTALS (1 << 1)
/* Whether this GPU lacks support for the full form of the CLPER instruction.
* These GPUs use a simple encoding of CLPER that does not support
* inactive_result, subgroup_size, or lane_op. Using those features requires
* lowering to additional ALU instructions. The encoding forces inactive_result
* = zero, subgroup_size = subgroup4, and lane_op = none. */
#define BIFROST_LIMITED_CLPER (1 << 2)
static inline unsigned
bifrost_get_quirks(unsigned product_id)
{
switch (product_id >> 8) {
case 0x60:
return BIFROST_NO_PRELOAD | BIFROST_NO_FP32_TRANSCENDENTALS;
return BIFROST_NO_PRELOAD | BIFROST_NO_FP32_TRANSCENDENTALS |
BIFROST_LIMITED_CLPER;
case 0x62:
return BIFROST_NO_PRELOAD;
case 0x70:
return BIFROST_NO_PRELOAD | BIFROST_LIMITED_CLPER;
case 0x70: /* G31 */
return BIFROST_LIMITED_CLPER;
case 0x71:
case 0x72:
case 0x74:
return 0;

2
src/panfrost/bifrost/bifrost_compile.c
View file

@ -1965,7 +1965,7 @@ bi_emit_alu(bi_builder *b, nir_alu_instr *instr)
bi_index left, right;
if (b->shader->arch == 6) {
if (b->shader->quirks & BIFROST_LIMITED_CLPER) {
left = bi_clper_v6_i32(b, s0, lane1);
right = bi_clper_v6_i32(b, s0, lane2);
} else {