Pass proper handle to initContextAuxTableRegister function

Resolves: NEO-4082, NEO-4080, NEO-4079
Change-Id: If8d0b69126d6442e8a9a102cd21f78944f8551e9
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

runtime/gmm_helper/page_table_mngr.h

@@ -16,6 +16,8 @@
 namespace NEO {
 class Gmm;
 class LinearStream;
+
+void gmmSetCsrHandle(GMM_PAGETABLE_MGR *pageTableManager, HANDLE csrHandle);
 class GmmPageTableMngr {
   public:
     MOCKABLE_VIRTUAL ~GmmPageTableMngr();
@@ -43,5 +45,7 @@ class GmmPageTableMngr {
     GmmPageTableMngr(unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb);
     GMM_CLIENT_CONTEXT *clientContext = nullptr;
     GMM_PAGETABLE_MGR *pageTableManager = nullptr;
+    decltype(&gmmSetCsrHandle) gmmSetCsrHandleFunc = gmmSetCsrHandle;
+    void *csrHandle = nullptr;
 };
 } // namespace NEO

runtime/gmm_helper/page_table_mngr_impl.cpp

@@ -31,10 +31,15 @@ bool GmmPageTableMngr::updateAuxTable(uint64_t gpuVa, Gmm *gmm, bool map) {
 
 void GmmPageTableMngr::initPageTableManagerRegisters() {
     if (!initialized) {
-        initContextAuxTableRegister(this, GMM_ENGINE_TYPE::ENGINE_TYPE_RCS);
+        initContextAuxTableRegister(csrHandle, GMM_ENGINE_TYPE::ENGINE_TYPE_RCS);
 
         initialized = true;
     }
 }
 
+void GmmPageTableMngr::setCsrHandle(void *csrHandleIn) {
+    csrHandle = csrHandleIn;
+    gmmSetCsrHandleFunc(pageTableManager, csrHandle);
+}
+
 } // namespace NEO

runtime/os_interface/linux/page_table_manager_functions.cpp

@@ -12,10 +12,12 @@
 #include "gmm_client_context.h"
 
 namespace NEO {
+
+void gmmSetCsrHandle(GMM_PAGETABLE_MGR *pageTableManager, HANDLE csrHandle) {
+}
+
 GmmPageTableMngr::GmmPageTableMngr(unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) {
     clientContext = platform()->peekGmmClientContext()->getHandle();
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableFlags);
 }
-
-void GmmPageTableMngr::setCsrHandle(void *csrHandle) {}
 } // namespace NEO

runtime/os_interface/windows/page_table_manager_functions.cpp

@@ -12,12 +12,13 @@
 #include "gmm_client_context.h"
 
 namespace NEO {
+
+void gmmSetCsrHandle(GMM_PAGETABLE_MGR *pageTableManager, HANDLE csrHandle) {
+    pageTableManager->GmmSetCsrHandle(csrHandle);
+}
+
 GmmPageTableMngr::GmmPageTableMngr(unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) {
     clientContext = platform()->peekGmmClientContext()->getHandle();
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableCb, translationTableFlags);
 }
-
-void GmmPageTableMngr::setCsrHandle(void *csrHandle) {
-    pageTableManager->GmmSetCsrHandle(csrHandle);
-}
 } // namespace NEO

unit_tests/mocks/mock_gmm_page_table_mngr.cpp

@@ -7,6 +7,8 @@
 
 #include "unit_tests/mocks/mock_gmm_page_table_mngr.h"
 
+void dummySetCsrHandle(GMM_PAGETABLE_MGR *, HANDLE){};
+
 namespace NEO {
 using namespace ::testing;
 
@@ -17,7 +19,7 @@ GmmPageTableMngr *GmmPageTableMngr::create(unsigned int translationTableFlags, G
     return pageTableMngr;
 }
 void MockGmmPageTableMngr::setCsrHandle(void *csrHandle) {
-    passedCsrHandle = csrHandle;
+    GmmPageTableMngr::setCsrHandle(csrHandle);
     setCsrHanleCalled++;
 }
 } // namespace NEO

unit_tests/mocks/mock_gmm_page_table_mngr.h

@@ -16,16 +16,20 @@
 #pragma clang diagnostic ignored "-Winconsistent-missing-override"
 #endif
 
+void dummySetCsrHandle(GMM_PAGETABLE_MGR *, HANDLE);
+
 namespace NEO {
 class MockGmmPageTableMngr : public GmmPageTableMngr {
   public:
-    MockGmmPageTableMngr() = default;
+    using GmmPageTableMngr::csrHandle;
+    MockGmmPageTableMngr() : MockGmmPageTableMngr(0u, nullptr){};
 
     MockGmmPageTableMngr(unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb)
         : translationTableFlags(translationTableFlags) {
         if (translationTableCb) {
             this->translationTableCb = *translationTableCb;
         }
+        gmmSetCsrHandleFunc = dummySetCsrHandle;
     };
 
     MOCK_METHOD2(initContextAuxTableRegister, GMM_STATUS(HANDLE initialBBHandle, GMM_ENGINE_TYPE engineType));
@@ -35,7 +39,6 @@ class MockGmmPageTableMngr : public GmmPageTableMngr {
     void setCsrHandle(void *csrHandle) override;
 
     uint32_t setCsrHanleCalled = 0;
-    void *passedCsrHandle = nullptr;
 
     unsigned int translationTableFlags = 0;
     GMM_TRANSLATIONTABLE_CALLBACKS translationTableCb = {};

unit_tests/os_interface/linux/drm_command_stream_tests.cpp

@@ -1397,7 +1397,9 @@ HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenDrmCommandStreamReceiverWhenInitia
     auto &rootDeviceEnvironment = executionEnvironment.rootDeviceEnvironments[1];
 
     MockGmmPageTableMngr *mockMngr = static_cast<MockGmmPageTableMngr *>(rootDeviceEnvironment->pageTableManager.get());
-    EXPECT_CALL(*mockMngr, initContextAuxTableRegister(::testing::_, ::testing::_)).Times(1);
+    auto csrHandle = reinterpret_cast<void *>(0x1234);
+    mockMngr->setCsrHandle(csrHandle);
+    EXPECT_CALL(*mockMngr, initContextAuxTableRegister(csrHandle, ::testing::_)).Times(1);
 
     EXPECT_FALSE(rootDeviceEnvironment->pageTableManager->initialized);
     LinearStream linearStream = {};

unit_tests/os_interface/windows/device_command_stream_tests.cpp

@@ -872,7 +872,7 @@ HWTEST_P(WddmCsrCompressionParameterizedTest, givenEnabledCompressionWhenInitial
 
     auto mockMngr = reinterpret_cast<MockGmmPageTableMngr *>(executionEnvironment->rootDeviceEnvironments[index]->pageTableManager.get());
     EXPECT_EQ(1u, mockMngr->setCsrHanleCalled);
-    EXPECT_EQ(&mockWddmCsr, mockMngr->passedCsrHandle);
+    EXPECT_EQ(&mockWddmCsr, mockMngr->csrHandle);
 
     GMM_TRANSLATIONTABLE_CALLBACKS expectedTTCallbacks = {};
     unsigned int expectedFlags = TT_TYPE::AUXTT;