From 63b21e3066a451415917472228b05f71b34d1a48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 24 Jan 2023 03:49:42 -0500 Subject: [PATCH] amd: add missing gfx11 register definitions Fixes: caa09f66ae4 - amd: add chip identification for gfx1100-1103 Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/registers/gfx11.json | 8 ++++++-- src/amd/registers/parse_kernel_headers.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/amd/registers/gfx11.json b/src/amd/registers/gfx11.json index 51db7b3..60e15b7 100644 --- a/src/amd/registers/gfx11.json +++ b/src/amd/registers/gfx11.json @@ -10921,7 +10921,10 @@ {"bits": [21, 21], "name": "SKIP_LOW_COMP_RATIO"}, {"bits": [22, 22], "name": "FDCC_ENABLE"}, {"bits": [23, 23], "name": "DCC_COMPRESS_DISABLE"}, - {"bits": [24, 24], "name": "FRAGMENT_COMPRESS_DISABLE"} + {"bits": [24, 24], "name": "FRAGMENT_COMPRESS_DISABLE"}, + {"bits": [25, 25], "name": "DISABLE_OVERRIDE_INCONSISTENT_KEYS"}, + {"bits": [26, 26], "name": "ENABLE_MAX_COMP_FRAG_OVERRIDE"}, + {"bits": [27, 29], "name": "MAX_COMP_FRAGS"} ] }, "CB_COLOR0_INFO": { @@ -14584,7 +14587,8 @@ "fields": [ {"bits": [1, 1], "name": "EN_REG_RT_INDEX"}, {"bits": [3, 3], "name": "EN_PRIM_PAYLOAD"}, - {"bits": [4, 4], "name": "EN_DRAW_VP"} + {"bits": [4, 4], "name": "EN_DRAW_VP"}, + {"bits": [6, 6], "name": "EN_VRS_RATE"} ] }, "VGT_ESGS_RING_ITEMSIZE": { diff --git a/src/amd/registers/parse_kernel_headers.py b/src/amd/registers/parse_kernel_headers.py index 920cbcf..9cd0425 100644 --- a/src/amd/registers/parse_kernel_headers.py +++ b/src/amd/registers/parse_kernel_headers.py @@ -719,6 +719,34 @@ fields_missing = { "VGT_DRAW_PAYLOAD_CNTL": [["EN_VRS_RATE", 6, 6]], "VGT_SHADER_STAGES_EN": [["PRIMGEN_PASSTHRU_NO_MSG", 26, 26]], }, + 'gfx11': { + "VGT_DRAW_PAYLOAD_CNTL": [["EN_VRS_RATE", 6, 6]], + # Only GFX1103_R2: + "CB_COLOR0_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR1_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR2_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR3_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR4_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR5_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR6_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + "CB_COLOR7_FDCC_CONTROL": [["DISABLE_OVERRIDE_INCONSISTENT_KEYS", 25, 25], + ["ENABLE_MAX_COMP_FRAG_OVERRIDE", 26, 26], + ["MAX_COMP_FRAGS", 27, 29]], + }, } ######### END HARDCODED CONFIGURATION -- 2.7.4