Refactor tag update for stop ring buffer

Signed-off-by: Lukasz Jobczyk <[email protected]>

Author: LukaszJobczyk

shared/source/direct_submission/direct_submission_hw.h

@@ -78,6 +78,7 @@ class DirectSubmissionHw {
     virtual bool handleResidency() = 0;
     virtual void handleNewResourcesSubmission();
     virtual size_t getSizeNewResourceHandler();
+    virtual void handleStopRingBuffer(){};
     virtual uint64_t switchRingBuffers();
     virtual void handleSwitchRingBuffers() = 0;
     GraphicsAllocation *switchRingBuffersAllocations();

shared/source/direct_submission/direct_submission_hw.inl

@@ -157,6 +157,7 @@ bool DirectSubmissionHw<GfxFamily, Dispatcher>::startRingBuffer() {
     if (ringStart) {
         return true;
     }
+
     size_t startSize = getSizeSemaphoreSection();
     size_t requiredSize = startSize + getSizeDispatch() + getSizeEnd();
     if (ringCommandStream.getAvailableSpace() < requiredSize) {
@@ -174,6 +175,10 @@ bool DirectSubmissionHw<GfxFamily, Dispatcher>::startRingBuffer() {
 
 template <typename GfxFamily, typename Dispatcher>
 bool DirectSubmissionHw<GfxFamily, Dispatcher>::stopRingBuffer() {
+    if (!ringStart) {
+        return true;
+    }
+
     void *flushPtr = ringCommandStream.getSpace(0);
     Dispatcher::dispatchCacheFlush(ringCommandStream, *hwInfo, gpuVaForMiFlush);
     if (disableMonitorFence) {
@@ -192,6 +197,7 @@ bool DirectSubmissionHw<GfxFamily, Dispatcher>::stopRingBuffer() {
     semaphoreData->QueueWorkCount = currentQueueWorkCount;
     cpuCachelineFlush(semaphorePtr, MemoryConstants::cacheLineSize);
 
+    this->handleStopRingBuffer();
     this->ringStart = false;
 
     return true;

shared/source/direct_submission/linux/drm_direct_submission.h

@@ -29,6 +29,7 @@ class DrmDirectSubmission : public DirectSubmissionHw<GfxFamily, Dispatcher> {
     bool isNewResourceHandleNeeded();
     void handleNewResourcesSubmission() override;
     size_t getSizeNewResourceHandler() override;
+    void handleStopRingBuffer() override;
     void handleSwitchRingBuffers() override;
     uint64_t updateTagValue() override;
     void getTagAddressValue(TagData &tagData) override;

shared/source/direct_submission/linux/drm_direct_submission.inl

@@ -34,13 +34,8 @@ DrmDirectSubmission<GfxFamily, Dispatcher>::DrmDirectSubmission(Device &device,
 
 template <typename GfxFamily, typename Dispatcher>
 inline DrmDirectSubmission<GfxFamily, Dispatcher>::~DrmDirectSubmission() {
-    if (this->ringStart) {
-        this->stopRingBuffer();
-        if (this->disableMonitorFence) {
-            this->currentTagData.tagValue++;
-        }
-        this->wait(static_cast<uint32_t>(this->currentTagData.tagValue));
-    }
+    this->stopRingBuffer();
+    this->wait(static_cast<uint32_t>(this->currentTagData.tagValue));
     this->deallocateResources();
 }
 
@@ -130,6 +125,13 @@ size_t DrmDirectSubmission<GfxFamily, Dispatcher>::getSizeNewResourceHandler() {
     return size;
 }
 
+template <typename GfxFamily, typename Dispatcher>
+void DrmDirectSubmission<GfxFamily, Dispatcher>::handleStopRingBuffer() {
+    if (this->disableMonitorFence) {
+        this->currentTagData.tagValue++;
+    }
+}
+
 template <typename GfxFamily, typename Dispatcher>
 void DrmDirectSubmission<GfxFamily, Dispatcher>::handleSwitchRingBuffers() {
     if (this->disableMonitorFence) {

shared/test/unit_test/direct_submission/direct_submission_tests.cpp

@@ -277,6 +277,7 @@ HWTEST_F(DirectSubmissionTest,
 
     bool ret = directSubmission.allocateResources();
     directSubmission.disableMonitorFence = true;
+    directSubmission.ringStart = true;
 
     EXPECT_TRUE(ret);
 

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

@@ -94,12 +94,17 @@ HWTEST_F(DrmDirectSubmissionTest, givenDrmDirectSubmissionWhenCallingLinuxImplem
     drmDirectSubmission.getTagAddressValue(tagData);
     EXPECT_EQ(drmDirectSubmission.currentTagData.tagAddress, tagData.tagAddress);
     EXPECT_EQ(drmDirectSubmission.currentTagData.tagValue + 1, tagData.tagValue);
+
+    *drmDirectSubmission.tagAddress = 1u;
 }
 
 HWTEST_F(DrmDirectSubmissionTest, whenCreateDirectSubmissionThenValidObjectIsReturned) {
     auto directSubmission = DirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>::create(*device.get(),
                                                                                                  *osContext.get());
     EXPECT_NE(directSubmission.get(), nullptr);
+
+    bool ret = directSubmission->initialize(false);
+    EXPECT_TRUE(ret);
 }
 
 HWTEST_F(DrmDirectSubmissionTest, givenDisabledMonitorFenceWhenDispatchSwitchRingBufferThenDispatchPipeControl) {