From fef36e058de03cda343a2bd0f0f84b99b4c81c7e Mon Sep 17 00:00:00 2001 From: Bartosz Dunajski Date: Fri, 28 Jan 2022 09:42:16 +0000 Subject: [PATCH] Remove VEBOX related ftr flags Signed-off-by: Bartosz Dunajski --- .../gen9/bxt/linux/hw_info_config_tests.cpp | 1 - .../gen9/bxt/test_hw_info_config_bxt.cpp | 3 +-- .../gen9/cfl/test_hw_info_config_cfl.cpp | 3 +-- .../gen9/kbl/test_hw_info_config_kbl.cpp | 3 +-- .../gen9/skl/test_hw_info_config_skl.cpp | 3 --- .../sku_info/sku_info_base_reference.h | 6 ----- shared/source/gen9/hw_info_bxt.cpp | 3 +-- shared/source/gen9/hw_info_cfl.cpp | 1 - shared/source/gen9/hw_info_kbl.cpp | 1 - shared/source/gen9/hw_info_skl.cpp | 1 - .../os_interface/windows/sharedata_wrapper.h | 4 --- .../sku_info/operations/sku_info_transfer.h | 4 +-- .../operations/windows/sku_info_receiver.h | 4 --- shared/source/sku_info/sku_info_base.h | 7 ++---- .../wsl_compute_helper_types_demarshall.h | 24 ------------------ .../wsl_compute_helper_types_marshall.h | 8 ------ .../source/wsl_compute_helper_types_tokens.h | 4 --- .../wsl_compute_helper_types_tokens_structs.h | 25 ------------------- 18 files changed, 7 insertions(+), 98 deletions(-) diff --git a/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp b/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp index 0d00c6dd3f..62d54fa0b8 100644 --- a/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp @@ -38,7 +38,6 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, WhenConfiguringHwInfoThenConfigIsCorrect) { EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); //constant sysInfo/ftr flags - EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled); EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid); drm->storedDeviceID = 0x5A85; diff --git a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp index 7d4bbbcd79..a88aa26b3f 100644 --- a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -51,7 +51,6 @@ BXTTEST_F(BxtHwInfo, givenBoolWhenCallBxtHardwareInfoSetupThenFeatureTableAndWor EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuMidBatchPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuThreadGroupLevelPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftrL3IACoherency); - EXPECT_EQ(setParamBool, featureTable.flags.ftrVEBOX); EXPECT_EQ(setParamBool, featureTable.flags.ftrULT); EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuMidThreadLevelPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftr3dMidBatchPreempt); diff --git a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index 92bc8fe988..0f97566fa2 100644 --- a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -52,7 +52,6 @@ CFLTEST_F(CflHwInfo, givenBoolWhenCallCflHardwareInfoSetupThenFeatureTableAndWor EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuMidBatchPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuThreadGroupLevelPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftrL3IACoherency); - EXPECT_EQ(setParamBool, featureTable.flags.ftrVEBOX); EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuMidThreadLevelPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftr3dMidBatchPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftr3dObjectLevelPreempt); diff --git a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp index c53824fbeb..2358c8cc2f 100644 --- a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -54,7 +54,6 @@ KBLTEST_F(KblHwInfo, givenBoolWhenCallKblHardwareInfoSetupThenFeatureTableAndWor EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuMidBatchPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuThreadGroupLevelPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftrL3IACoherency); - EXPECT_EQ(setParamBool, featureTable.flags.ftrVEBOX); EXPECT_EQ(setParamBool, featureTable.flags.ftrGpGpuMidThreadLevelPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftr3dMidBatchPreempt); EXPECT_EQ(setParamBool, featureTable.flags.ftr3dObjectLevelPreempt); diff --git a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index 8016c58de9..0af6cf4319 100644 --- a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp @@ -70,10 +70,7 @@ SKLTEST_F(SklHwInfo, givenBoolWhenCallSklHardwareInfoSetupThenFeatureTableAndWor EXPECT_EQ(setParamBool, featureTable.flags.ftrFbc2AddressTranslation); EXPECT_EQ(setParamBool, featureTable.flags.ftrFbcBlitterTracking); EXPECT_EQ(setParamBool, featureTable.flags.ftrFbcCpuTracking); - EXPECT_EQ(setParamBool, featureTable.flags.ftrVEBOX); EXPECT_EQ(setParamBool, featureTable.flags.ftrTileY); - EXPECT_EQ(false, featureTable.flags.ftrSingleVeboxSlice); - EXPECT_EQ(false, featureTable.flags.ftrVcs2); EXPECT_EQ(setParamBool, workaroundTable.flags.waEnablePreemptionGranularityControlByUMD); EXPECT_EQ(setParamBool, workaroundTable.flags.waSendMIFLUSHBeforeVFE); diff --git a/opencl/test/unit_test/sku_info/sku_info_base_reference.h b/opencl/test/unit_test/sku_info/sku_info_base_reference.h index 1cbaacec46..94122cc318 100644 --- a/opencl/test/unit_test/sku_info/sku_info_base_reference.h +++ b/opencl/test/unit_test/sku_info/sku_info_base_reference.h @@ -24,8 +24,6 @@ struct SkuInfoBaseReference { refFtrTable.FtrTileY = 1; refFtrTable.FtrDisplayYTiling = 1; refFtrTable.FtrFbc = 1; - refFtrTable.FtrVERing = 1; - refFtrTable.FtrVcs2 = 1; refFtrTable.FtrLCIA = 1; refFtrTable.FtrIA32eGfxPTEs = 1; refFtrTable.FtrWddm2GpuMmu = 1; @@ -107,9 +105,6 @@ struct SkuInfoBaseReference { refFtrTable.flags.ftrFbcBlitterTracking = true; refFtrTable.flags.ftrFbcCpuTracking = true; - refFtrTable.flags.ftrVcs2 = true; - refFtrTable.flags.ftrVEBOX = true; - refFtrTable.flags.ftrSingleVeboxSlice = true; refFtrTable.flags.ftrULT = true; refFtrTable.flags.ftrLCIA = true; refFtrTable.flags.ftrGttCacheInvalidation = true; @@ -122,7 +117,6 @@ struct SkuInfoBaseReference { refFtrTable.flags.ftrCrystalwell = true; refFtrTable.flags.ftrLLCBypass = true; refFtrTable.flags.ftrDisplayEngineS3d = true; - refFtrTable.flags.ftrVERing = true; refFtrTable.flags.ftrWddm2GpuMmu = true; refFtrTable.flags.ftrWddm2_1_64kbPages = true; diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp index 7eeca10230..cfafdead64 100644 --- a/shared/source/gen9/hw_info_bxt.cpp +++ b/shared/source/gen9/hw_info_bxt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -96,7 +96,6 @@ void BXT::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { featureTable->flags.ftrGpGpuMidBatchPreempt = true; featureTable->flags.ftrGpGpuThreadGroupLevelPreempt = true; featureTable->flags.ftrL3IACoherency = true; - featureTable->flags.ftrVEBOX = true; featureTable->flags.ftrULT = true; featureTable->flags.ftrGpGpuMidThreadLevelPreempt = true; featureTable->flags.ftr3dMidBatchPreempt = true; diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp index 4d97b9fcde..dbca891fcc 100644 --- a/shared/source/gen9/hw_info_cfl.cpp +++ b/shared/source/gen9/hw_info_cfl.cpp @@ -90,7 +90,6 @@ void CFL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { featureTable->flags.ftrGpGpuMidBatchPreempt = true; featureTable->flags.ftrGpGpuThreadGroupLevelPreempt = true; featureTable->flags.ftrL3IACoherency = true; - featureTable->flags.ftrVEBOX = true; featureTable->flags.ftrGpGpuMidThreadLevelPreempt = true; featureTable->flags.ftr3dMidBatchPreempt = true; featureTable->flags.ftr3dObjectLevelPreempt = true; diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp index 03153049ef..879cdf6ed2 100644 --- a/shared/source/gen9/hw_info_kbl.cpp +++ b/shared/source/gen9/hw_info_kbl.cpp @@ -91,7 +91,6 @@ void KBL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { featureTable->flags.ftrGpGpuMidBatchPreempt = true; featureTable->flags.ftrGpGpuThreadGroupLevelPreempt = true; featureTable->flags.ftrL3IACoherency = true; - featureTable->flags.ftrVEBOX = true; featureTable->flags.ftrGpGpuMidThreadLevelPreempt = true; featureTable->flags.ftr3dMidBatchPreempt = true; featureTable->flags.ftr3dObjectLevelPreempt = true; diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp index e62a2fbf38..f6147c738e 100644 --- a/shared/source/gen9/hw_info_skl.cpp +++ b/shared/source/gen9/hw_info_skl.cpp @@ -112,7 +112,6 @@ void SKL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { featureTable->flags.ftrFbc2AddressTranslation = true; featureTable->flags.ftrFbcBlitterTracking = true; featureTable->flags.ftrFbcCpuTracking = true; - featureTable->flags.ftrVEBOX = true; featureTable->flags.ftrTileY = true; workaroundTable->flags.waEnablePreemptionGranularityControlByUMD = true; diff --git a/shared/source/os_interface/windows/sharedata_wrapper.h b/shared/source/os_interface/windows/sharedata_wrapper.h index 3085362bf9..b51e609a14 100644 --- a/shared/source/os_interface/windows/sharedata_wrapper.h +++ b/shared/source/os_interface/windows/sharedata_wrapper.h @@ -87,9 +87,6 @@ struct SKU_FEATURE_TABLE_KMD : SKU_FEATURE_TABLE_GMM { bool FtrFbcBlitterTracking : 1; bool FtrFbcCpuTracking : 1; - bool FtrVcs2 : 1; - bool FtrVEBOX : 1; - bool FtrSingleVeboxSlice : 1; bool FtrULT : 1; bool FtrLCIA : 1; bool FtrGttCacheInvalidation : 1; @@ -102,7 +99,6 @@ struct SKU_FEATURE_TABLE_KMD : SKU_FEATURE_TABLE_GMM { bool FtrCrystalwell : 1; bool FtrLLCBypass : 1; bool FtrDisplayEngineS3d : 1; - bool FtrVERing : 1; bool FtrWddm2GpuMmu : 1; bool FtrWddm2_1_64kbPages : 1; bool FtrWddmHwQueues : 1; diff --git a/shared/source/sku_info/operations/sku_info_transfer.h b/shared/source/sku_info/operations/sku_info_transfer.h index b832e614cc..754a4dac8f 100644 --- a/shared/source/sku_info/operations/sku_info_transfer.h +++ b/shared/source/sku_info/operations/sku_info_transfer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -28,8 +28,6 @@ class SkuInfoTransfer { TRANSFER_FTR_TO_GMM(TileY); TRANSFER_FTR_TO_GMM(DisplayYTiling); TRANSFER_FTR_TO_GMM(Fbc); - TRANSFER_FTR_TO_GMM(VERing); - TRANSFER_FTR_TO_GMM(Vcs2); TRANSFER_FTR_TO_GMM(LCIA); TRANSFER_FTR_TO_GMM(IA32eGfxPTEs); TRANSFER_FTR_TO_GMM(Wddm2GpuMmu); diff --git a/shared/source/sku_info/operations/windows/sku_info_receiver.h b/shared/source/sku_info/operations/windows/sku_info_receiver.h index 9c99c00689..77708d53da 100644 --- a/shared/source/sku_info/operations/windows/sku_info_receiver.h +++ b/shared/source/sku_info/operations/windows/sku_info_receiver.h @@ -59,9 +59,6 @@ class SkuInfoReceiver { RECEIVE_FTR(FbcBlitterTracking); RECEIVE_FTR(FbcCpuTracking); - RECEIVE_FTR(Vcs2); - RECEIVE_FTR(VEBOX); - RECEIVE_FTR(SingleVeboxSlice); RECEIVE_FTR(ULT); RECEIVE_FTR(LCIA); RECEIVE_FTR(GttCacheInvalidation); @@ -74,7 +71,6 @@ class SkuInfoReceiver { RECEIVE_FTR(Crystalwell); RECEIVE_FTR(LLCBypass); RECEIVE_FTR(DisplayEngineS3d); - RECEIVE_FTR(VERing); RECEIVE_FTR(Wddm2GpuMmu); RECEIVE_FTR(Wddm2_1_64kbPages); diff --git a/shared/source/sku_info/sku_info_base.h b/shared/source/sku_info/sku_info_base.h index c9153d5514..0267a47f93 100644 --- a/shared/source/sku_info/sku_info_base.h +++ b/shared/source/sku_info/sku_info_base.h @@ -52,13 +52,10 @@ struct FeatureTableBase { uint32_t ftrFbc2AddressTranslation : 1; uint32_t ftrFbcBlitterTracking : 1; uint32_t ftrFbcCpuTracking : 1; - uint32_t ftrVcs2 : 1; - uint32_t ftrVEBOX : 1; - uint32_t ftrSingleVeboxSlice : 1; - // DW1 uint32_t ftrULT : 1; uint32_t ftrLCIA : 1; uint32_t ftrGttCacheInvalidation : 1; + // DW1 uint32_t ftrTileMappedResource : 1; uint32_t ftrAstcHdr2D : 1; uint32_t ftrAstcLdr2D : 1; @@ -67,7 +64,6 @@ struct FeatureTableBase { uint32_t ftrCrystalwell : 1; uint32_t ftrLLCBypass : 1; uint32_t ftrDisplayEngineS3d : 1; - uint32_t ftrVERing : 1; uint32_t ftrWddm2GpuMmu : 1; uint32_t ftrWddm2_1_64kbPages : 1; uint32_t ftrWddmHwQueues : 1; @@ -87,6 +83,7 @@ struct FeatureTableBase { uint32_t ftrPpgtt64KBWalkOptimization : 1; uint32_t ftrUnified3DMediaCompressionFormats : 1; uint32_t ftr57bGPUAddressing : 1; + uint32_t reserved : 5; }; BcsInfoMask ftrBcsInfo = 1; diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h index 52ee2894a4..d867a7a9d8 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h @@ -1733,12 +1733,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP: { dst.FtrDesktop = readTokValue(*tok); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING: { - dst.FtrVERing = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2: { - dst.FtrVcs2 = readTokValue(*tok); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT: { dst.FtrULT = readTokValue(*tok); } break; @@ -1913,9 +1907,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_CPU_TRACKING: { dst.FtrFbcCpuTracking = readTokValue(*tok); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_VEBOX: { - dst.FtrVEBOX = readTokValue(*tok); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS54736__FTR_REND_COMP: { dst.FtrRendComp = readTokValue(*tok); } break; @@ -1928,9 +1919,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_DISPLAY_ENGINE_S3D: { dst.FtrDisplayEngineS3d = readTokValue(*tok); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SINGLE_VEBOX_SLICE: { - dst.FtrSingleVeboxSlice = readTokValue(*tok); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SIMULATION_MODE: { dst.FtrSimulationMode = readTokValue(*tok); } break; @@ -2955,12 +2943,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP: { dst.SkuTable.FtrDesktop = readTokValue(*tokSkuTable); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING: { - dst.SkuTable.FtrVERing = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2: { - dst.SkuTable.FtrVcs2 = readTokValue(*tokSkuTable); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT: { dst.SkuTable.FtrULT = readTokValue(*tokSkuTable); } break; @@ -3135,9 +3117,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_CPU_TRACKING: { dst.SkuTable.FtrFbcCpuTracking = readTokValue(*tokSkuTable); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_VEBOX: { - dst.SkuTable.FtrVEBOX = readTokValue(*tokSkuTable); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS54736__FTR_REND_COMP: { dst.SkuTable.FtrRendComp = readTokValue(*tokSkuTable); } break; @@ -3150,9 +3129,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_DISPLAY_ENGINE_S3D: { dst.SkuTable.FtrDisplayEngineS3d = readTokValue(*tokSkuTable); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SINGLE_VEBOX_SLICE: { - dst.SkuTable.FtrSingleVeboxSlice = readTokValue(*tokSkuTable); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SIMULATION_MODE: { dst.SkuTable.FtrSimulationMode = readTokValue(*tokSkuTable); } break; diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h index 047f505617..f4fe8e3e8f 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h @@ -1058,8 +1058,6 @@ template inline void marshall(TOKSTR__SKU_FEATURE_TABLE &dst, const _SKU_FEATURE_TABLET &src) { dst = {}; dst.FtrDesktop.setValue(src.FtrDesktop); - dst.FtrVERing.setValue(src.FtrVERing); - dst.FtrVcs2.setValue(src.FtrVcs2); dst.FtrULT.setValue(src.FtrULT); dst.FtrIVBM0M1Platform.setValue(src.FtrIVBM0M1Platform); dst.FtrChannelSwizzlingXOREnabled.setValue(src.FtrChannelSwizzlingXOREnabled); @@ -1119,12 +1117,10 @@ inline void marshall(TOKSTR__SKU_FEATURE_TABLE &dst, const _SKU_FEATURE_TABLET & dst.FtrFbc2AddressTranslation.setValue(src.FtrFbc2AddressTranslation); dst.FtrFbcBlitterTracking.setValue(src.FtrFbcBlitterTracking); dst.FtrFbcCpuTracking.setValue(src.FtrFbcCpuTracking); - dst.FtrVEBOX.setValue(src.FtrVEBOX); dst.FtrRendComp.setValue(src.FtrRendComp); dst.FtrDisplayYTiling.setValue(src.FtrDisplayYTiling); dst.FtrS3D.setValue(src.FtrS3D); dst.FtrDisplayEngineS3d.setValue(src.FtrDisplayEngineS3d); - dst.FtrSingleVeboxSlice.setValue(src.FtrSingleVeboxSlice); dst.FtrSimulationMode.setValue(src.FtrSimulationMode); dst.FtrEnableGuC.setValue(src.FtrEnableGuC); dst.FtrVgt.setValue(src.FtrVgt); @@ -1401,8 +1397,6 @@ inline void marshall(TOKSTR__ADAPTER_INFO &dst, const _ADAPTER_INFOT &src) { dst.GfxPlatform.usRevId_PCH.setValue(src.GfxPlatform.usRevId_PCH); dst.GfxPlatform.eGTType.setValue(src.GfxPlatform.eGTType); dst.SkuTable.FtrDesktop.setValue(src.SkuTable.FtrDesktop); - dst.SkuTable.FtrVERing.setValue(src.SkuTable.FtrVERing); - dst.SkuTable.FtrVcs2.setValue(src.SkuTable.FtrVcs2); dst.SkuTable.FtrULT.setValue(src.SkuTable.FtrULT); dst.SkuTable.FtrIVBM0M1Platform.setValue(src.SkuTable.FtrIVBM0M1Platform); dst.SkuTable.FtrChannelSwizzlingXOREnabled.setValue(src.SkuTable.FtrChannelSwizzlingXOREnabled); @@ -1461,12 +1455,10 @@ inline void marshall(TOKSTR__ADAPTER_INFO &dst, const _ADAPTER_INFOT &src) { dst.SkuTable.FtrFbc2AddressTranslation.setValue(src.SkuTable.FtrFbc2AddressTranslation); dst.SkuTable.FtrFbcBlitterTracking.setValue(src.SkuTable.FtrFbcBlitterTracking); dst.SkuTable.FtrFbcCpuTracking.setValue(src.SkuTable.FtrFbcCpuTracking); - dst.SkuTable.FtrVEBOX.setValue(src.SkuTable.FtrVEBOX); dst.SkuTable.FtrRendComp.setValue(src.SkuTable.FtrRendComp); dst.SkuTable.FtrDisplayYTiling.setValue(src.SkuTable.FtrDisplayYTiling); dst.SkuTable.FtrS3D.setValue(src.SkuTable.FtrS3D); dst.SkuTable.FtrDisplayEngineS3d.setValue(src.SkuTable.FtrDisplayEngineS3d); - dst.SkuTable.FtrSingleVeboxSlice.setValue(src.SkuTable.FtrSingleVeboxSlice); dst.SkuTable.FtrSimulationMode.setValue(src.SkuTable.FtrSimulationMode); dst.SkuTable.FtrEnableGuC.setValue(src.SkuTable.FtrEnableGuC); dst.SkuTable.FtrVgt.setValue(src.SkuTable.FtrVgt); diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h index dddef2cc5f..fe97080e96 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h @@ -422,8 +422,6 @@ enum TOK : uint32_t { TOK_FS_GT_SYSTEM_INFO__CACHE_TYPES = 363, TOK_FBD_GT_SYSTEM_INFO__MAX_VECS = 371, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP = 381, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING = 395, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2 = 398, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT = 423, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_IVBM0M1PLATFORM = 425, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED = 434, @@ -482,12 +480,10 @@ enum TOK : uint32_t { TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC2ADDRESS_TRANSLATION = 761, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_BLITTER_TRACKING = 762, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_CPU_TRACKING = 764, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_VEBOX = 800, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS54736__FTR_REND_COMP = 934, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS54736__FTR_DISPLAY_YTILING = 937, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_S3D = 1123, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_DISPLAY_ENGINE_S3D = 1124, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SINGLE_VEBOX_SLICE = 1160, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SIMULATION_MODE = 1168, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS88095__FTR_ENABLE_GU_C = 1224, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS89755__FTR_VGT = 1239, diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h index 24e6f8f927..7e329ff9c4 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h @@ -447,8 +447,6 @@ struct TOKSTR__SKU_FEATURE_TABLE { : base(TOK_S_SKU_FEATURE_TABLE__ANONYMOUS3245, 0, sizeof(*this) - sizeof(base)) {} TokenDword FtrDesktop = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP}; - TokenDword FtrVERing = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING}; - TokenDword FtrVcs2 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2}; TokenDword FtrULT = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT}; TokenDword FtrIVBM0M1Platform = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_IVBM0M1PLATFORM}; TokenDword FtrChannelSwizzlingXOREnabled = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED}; @@ -559,24 +557,6 @@ struct TOKSTR__SKU_FEATURE_TABLE { static_assert(std::is_standard_layout_v, ""); static_assert(sizeof(TOKSTR_ANONYMOUS37751) % sizeof(uint32_t) == 0, ""); - struct TOKSTR_ANONYMOUS42853 { - TokenVariableLength base; - - TOKSTR_ANONYMOUS42853(uint16_t tokenId, uint32_t elementId = 0) - : base(tokenId, elementId, offsetof(TOKSTR_ANONYMOUS42853, FtrVEBOX) + sizeof(FtrVEBOX) - offsetof(TOKSTR_ANONYMOUS42853, FtrFbc), (sizeof(*this) - sizeof(base)) / sizeof(uint32_t)) {} - - TOKSTR_ANONYMOUS42853() - : base(TOK_S_SKU_FEATURE_TABLE__ANONYMOUS42853, 0, sizeof(*this) - sizeof(base)) {} - - TokenDword FtrFbc = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC}; - TokenDword FtrFbc2AddressTranslation = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC2ADDRESS_TRANSLATION}; - TokenDword FtrFbcBlitterTracking = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_BLITTER_TRACKING}; - TokenDword FtrFbcCpuTracking = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_CPU_TRACKING}; - TokenDword FtrVEBOX = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_VEBOX}; - }; - static_assert(std::is_standard_layout_v, ""); - static_assert(sizeof(TOKSTR_ANONYMOUS42853) % sizeof(uint32_t) == 0, ""); - struct TOKSTR_ANONYMOUS54736 { TokenVariableLength base; @@ -603,7 +583,6 @@ struct TOKSTR__SKU_FEATURE_TABLE { TokenDword FtrS3D = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_S3D}; TokenDword FtrDisplayEngineS3d = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_DISPLAY_ENGINE_S3D}; - TokenDword FtrSingleVeboxSlice = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SINGLE_VEBOX_SLICE}; TokenDword FtrSimulationMode = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SIMULATION_MODE}; }; static_assert(std::is_standard_layout_v, ""); @@ -652,8 +631,6 @@ struct TOKSTR__SKU_FEATURE_TABLE { static_assert(sizeof(TOKSTR_ANONYMOUS91822) % sizeof(uint32_t) == 0, ""); TokenDword FtrDesktop = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP}; // Indirect field from anonymous struct - TokenDword FtrVERing = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING}; // Indirect field from anonymous struct - TokenDword FtrVcs2 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2}; // Indirect field from anonymous struct TokenDword FtrULT = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT}; // Indirect field from anonymous struct TokenDword FtrIVBM0M1Platform = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_IVBM0M1PLATFORM}; // Indirect field from anonymous struct TokenDword FtrChannelSwizzlingXOREnabled = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED}; // Indirect field from anonymous struct @@ -712,12 +689,10 @@ struct TOKSTR__SKU_FEATURE_TABLE { TokenDword FtrFbc2AddressTranslation = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC2ADDRESS_TRANSLATION}; // Indirect field from anonymous struct TokenDword FtrFbcBlitterTracking = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_BLITTER_TRACKING}; // Indirect field from anonymous struct TokenDword FtrFbcCpuTracking = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_FBC_CPU_TRACKING}; // Indirect field from anonymous struct - TokenDword FtrVEBOX = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS42853__FTR_VEBOX}; // Indirect field from anonymous struct TokenDword FtrRendComp = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS54736__FTR_REND_COMP}; // Indirect field from anonymous struct TokenDword FtrDisplayYTiling = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS54736__FTR_DISPLAY_YTILING}; // Indirect field from anonymous struct TokenDword FtrS3D = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_S3D}; // Indirect field from anonymous struct TokenDword FtrDisplayEngineS3d = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_DISPLAY_ENGINE_S3D}; // Indirect field from anonymous struct - TokenDword FtrSingleVeboxSlice = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SINGLE_VEBOX_SLICE}; // Indirect field from anonymous struct TokenDword FtrSimulationMode = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS66219__FTR_SIMULATION_MODE}; // Indirect field from anonymous struct TokenDword FtrEnableGuC = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS88095__FTR_ENABLE_GU_C}; // Indirect field from anonymous struct TokenDword FtrVgt = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS89755__FTR_VGT}; // Indirect field from anonymous struct