diff --git a/.pick_status.json b/.pick_status.json index eaa5be815ec..41de1578cba 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6250,7 +6250,7 @@ "description": "amd: add missing gfx11 register definitions", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "caa09f66ae4e97972ec9609896b4ad64a9c9d115" }, diff --git a/src/amd/registers/gfx11.json b/src/amd/registers/gfx11.json index 38308f06641..39de995af65 100644 --- a/src/amd/registers/gfx11.json +++ b/src/amd/registers/gfx11.json @@ -10911,7 +10911,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": { @@ -14558,7 +14561,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 67883f40975..b79c0cc7d86 100644 --- a/src/amd/registers/parse_kernel_headers.py +++ b/src/amd/registers/parse_kernel_headers.py @@ -683,6 +683,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