diff --git a/.pick_status.json b/.pick_status.json index fc708385776..1c61c0f1ead 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1604,7 +1604,7 @@ "description": "amd/registers: add correct gfx11.x enums for BINNING_MODE", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ced3fbbcf9354789b7aff0b99fb8df1b4f67110f", "notes": null diff --git a/src/amd/registers/gfx11.json b/src/amd/registers/gfx11.json index 5f8fc95d029..23d5d82d007 100644 --- a/src/amd/registers/gfx11.json +++ b/src/amd/registers/gfx11.json @@ -20,8 +20,8 @@ "entries": [ {"name": "BINNING_ALLOWED", "value": 0}, {"name": "FORCE_BINNING_ON", "value": 1}, - {"name": "DISABLE_BINNING_USE_NEW_SC", "value": 2}, - {"name": "DISABLE_BINNING_USE_LEGACY_SC", "value": 3} + {"name": "BINNING_ONE_PRIM_PER_BATCH", "value": 2}, + {"name": "BINNING_DISABLED", "value": 3} ] }, "BlendOp": { diff --git a/src/amd/registers/gfx115.json b/src/amd/registers/gfx115.json index 03f320a7fa6..20e0f2c64f2 100644 --- a/src/amd/registers/gfx115.json +++ b/src/amd/registers/gfx115.json @@ -20,8 +20,7 @@ "entries": [ {"name": "BINNING_ALLOWED", "value": 0}, {"name": "FORCE_BINNING_ON", "value": 1}, - {"name": "DISABLE_BINNING_USE_NEW_SC", "value": 2}, - {"name": "DISABLE_BINNING_USE_LEGACY_SC", "value": 3} + {"name": "BINNING_DISABLED", "value": 3} ] }, "BlendOp": { diff --git a/src/amd/registers/parse_kernel_headers.py b/src/amd/registers/parse_kernel_headers.py index 79e0f00fd0f..2da746c8589 100644 --- a/src/amd/registers/parse_kernel_headers.py +++ b/src/amd/registers/parse_kernel_headers.py @@ -444,6 +444,23 @@ VRSHtileEncoding = { ] } +BinningModeGfx11 = { + "entries": [ + {"name": "BINNING_ALLOWED", "value": 0}, + {"name": "FORCE_BINNING_ON", "value": 1}, + {"name": "BINNING_ONE_PRIM_PER_BATCH", "value": 2}, + {"name": "BINNING_DISABLED", "value": 3} + ] +} + +BinningModeGfx115Plus = { + "entries": [ + {"name": "BINNING_ALLOWED", "value": 0}, + {"name": "FORCE_BINNING_ON", "value": 1}, + {"name": "BINNING_DISABLED", "value": 3} + ] +} + missing_enums_all = { 'FLOAT_MODE': { "entries": [ @@ -669,6 +686,11 @@ missing_enums_gfx11plus = { }, } +missing_enums_gfx115plus = { + **missing_enums_gfx11plus, + "BinningMode": BinningModeGfx115Plus, +} + enums_missing = { 'gfx6': { **missing_enums_all, @@ -704,9 +726,10 @@ enums_missing = { }, 'gfx11': { **missing_enums_gfx11plus, + "BinningMode": BinningModeGfx11, }, 'gfx115': { - **missing_enums_gfx11plus, + **missing_enums_gfx115plus, }, }