fix: correct fallback path when creating topology map in Wddm

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -206,6 +206,7 @@ bool Wddm::translateTopologyInfo(TopologyMapping &mapping) {
 
         // subSliceIndex is used to track the index number of subslices from all SS or DSS in this slice
         int subSliceIndex = -1;
+        bool dssEnabled = false;
         for (uint32_t dss = 0; dss < GT_MAX_DUALSUBSLICE_PER_SLICE; dss++) {
             if (!gtSystemInfo.SliceInfo[x].DSSInfo[dss].Enabled) {
                 subSliceIndex += 2;
@@ -217,14 +218,16 @@ bool Wddm::translateTopologyInfo(TopologyMapping &mapping) {
                 if (!gtSystemInfo.SliceInfo[x].DSSInfo[dss].SubSlice[y].Enabled) {
                     continue;
                 }
+                dssEnabled = true;
                 subSliceCount++;
                 subSliceIndices.push_back(subSliceIndex);
 
                 euCount += gtSystemInfo.SliceInfo[x].DSSInfo[dss].SubSlice[y].EuEnabledCount;
             }
         }
 
-        if (subSliceCount == 0) {
+        if (!dssEnabled) {
+            subSliceIndex = -1;
             for (uint32_t sss = 0; sss < GT_MAX_SUBSLICE_PER_SLICE; sss++) {
                 subSliceIndex++;
                 if (!gtSystemInfo.SliceInfo[x].SubSliceInfo[sss].Enabled) {

shared/test/unit_test/os_interface/windows/wddm_tests.cpp

@@ -453,9 +453,8 @@ TEST_F(WddmTests, GivenOnlySubsliceEnabledWhenQueryingTopologyThenExpectTrue) {
     EXPECT_EQ(topologyMap.at(0).sliceIndices.size(), 1u);
     EXPECT_EQ(topologyMap.at(0).sliceIndices[0], 0);
     EXPECT_EQ(topologyMap.at(0).subsliceIndices.size(), 2u);
-    const auto base = 2 * GT_MAX_DUALSUBSLICE_PER_SLICE;
-    EXPECT_EQ(topologyMap.at(0).subsliceIndices[0], base + 1);
-    EXPECT_EQ(topologyMap.at(0).subsliceIndices[1], base + 3);
+    EXPECT_EQ(topologyMap.at(0).subsliceIndices[0], 1);
+    EXPECT_EQ(topologyMap.at(0).subsliceIndices[1], 3);
 }
 
 TEST_F(WddmTests, GivenBothSublicesAndDualSubslicesEnabledWhenQueryingTopologyThenOnlyDSSInfoCounted) {