fix: Update completion fence for all switched ring buffers

Related-To: GSD-4966
Source: 13b0fb5

Signed-off-by: Maciej Plewka <[email protected]>

Author: MaciejPlewka

shared/source/direct_submission/linux/drm_direct_submission.inl

@@ -230,9 +230,9 @@ void DrmDirectSubmission<GfxFamily, Dispatcher>::handleSwitchRingBuffers() {
     if (this->disableMonitorFence) {
         this->currentTagData.tagValue++;
 
-        bool updateCompletionFences = this->ringStart;
-        if (DebugManager.flags.EnableRingSwitchTagUpdateWa.get() == 0) {
-            updateCompletionFences = true;
+        bool updateCompletionFences = true;
+        if (DebugManager.flags.EnableRingSwitchTagUpdateWa.get() != -1) {
+            updateCompletionFences = !DebugManager.flags.EnableRingSwitchTagUpdateWa.get() || this->ringStart;
         }
 
         if (updateCompletionFences) {

shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp

@@ -80,6 +80,7 @@ struct MockDrmDirectSubmission : public DrmDirectSubmission<GfxFamily, Dispatche
     using BaseClass::getTagAddressValue;
     using BaseClass::handleNewResourcesSubmission;
     using BaseClass::handleResidency;
+    using BaseClass::handleSwitchRingBuffers;
     using BaseClass::isCompleted;
     using BaseClass::isNewResourceHandleNeeded;
     using BaseClass::miMemFenceRequired;
@@ -882,3 +883,57 @@ HWTEST_F(DrmDirectSubmissionTest, givenBlitterDispatcherAndMultiTileDeviceWhenCr
     bool ret = directSubmission.allocateResources();
     EXPECT_TRUE(ret);
 }
+HWTEST_F(DrmDirectSubmissionTest, givenDrmDirectSubmissionWhenHandleSwitchRingBufferCalledThenPrevRingBufferHasUpdatedFenceValue) {
+    MockDrmDirectSubmission<FamilyType, RenderDispatcher<FamilyType>> drmDirectSubmission(*device->getDefaultEngine().commandStreamReceiver);
+    auto prevCompletionFenceVal = 1u;
+    auto prevRingBufferIndex = 0u;
+    auto newCompletionFenceValue = 10u;
+    drmDirectSubmission.currentTagData.tagValue = newCompletionFenceValue;
+    drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence = prevCompletionFenceVal;
+    drmDirectSubmission.handleSwitchRingBuffers();
+    EXPECT_EQ(drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence, newCompletionFenceValue + 1);
+}
+HWTEST_F(DrmDirectSubmissionTest, givenDrmDirectSubmissionWhenEnableRingSwitchTagUpdateWaEnabledAndRingNotStartedThenCompletionFenceIsNotUpdated) {
+    DebugManagerStateRestore dbgRestorer;
+    DebugManager.flags.EnableRingSwitchTagUpdateWa.set(1);
+    MockDrmDirectSubmission<FamilyType, RenderDispatcher<FamilyType>> drmDirectSubmission(*device->getDefaultEngine().commandStreamReceiver);
+    auto prevCompletionFenceVal = 1u;
+    auto prevRingBufferIndex = 0u;
+    auto newCompletionFenceValue = 10u;
+
+    drmDirectSubmission.ringStart = false;
+
+    drmDirectSubmission.currentTagData.tagValue = newCompletionFenceValue;
+    drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence = prevCompletionFenceVal;
+    drmDirectSubmission.handleSwitchRingBuffers();
+    EXPECT_EQ(drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence, prevCompletionFenceVal);
+}
+HWTEST_F(DrmDirectSubmissionTest, givenDrmDirectSubmissionWhenEnableRingSwitchTagUpdateWaEnabledAndRingStartedThenCompletionFenceIsUpdated) {
+    DebugManagerStateRestore dbgRestorer;
+    DebugManager.flags.EnableRingSwitchTagUpdateWa.set(1);
+    MockDrmDirectSubmission<FamilyType, RenderDispatcher<FamilyType>> drmDirectSubmission(*device->getDefaultEngine().commandStreamReceiver);
+    auto prevCompletionFenceVal = 1u;
+    auto prevRingBufferIndex = 0u;
+    auto newCompletionFenceValue = 10u;
+
+    drmDirectSubmission.ringStart = true;
+
+    drmDirectSubmission.currentTagData.tagValue = newCompletionFenceValue;
+    drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence = prevCompletionFenceVal;
+    drmDirectSubmission.handleSwitchRingBuffers();
+    EXPECT_EQ(drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence, newCompletionFenceValue + 1);
+    drmDirectSubmission.ringStart = false;
+}
+HWTEST_F(DrmDirectSubmissionTest, givenDrmDirectSubmissionWhenEnableRingSwitchTagUpdateWaDisabledThenCompletionFenceIsUpdated) {
+    DebugManagerStateRestore dbgRestorer;
+    DebugManager.flags.EnableRingSwitchTagUpdateWa.set(0);
+    MockDrmDirectSubmission<FamilyType, RenderDispatcher<FamilyType>> drmDirectSubmission(*device->getDefaultEngine().commandStreamReceiver);
+    auto prevCompletionFenceVal = 1u;
+    auto prevRingBufferIndex = 0u;
+    auto newCompletionFenceValue = 10u;
+
+    drmDirectSubmission.currentTagData.tagValue = newCompletionFenceValue;
+    drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence = prevCompletionFenceVal;
+    drmDirectSubmission.handleSwitchRingBuffers();
+    EXPECT_EQ(drmDirectSubmission.ringBuffers[prevRingBufferIndex].completionFence, newCompletionFenceValue + 1);
+}