Fix to proper init gmm page table on linux

Signed-off-by: Katarzyna Cencelewska <[email protected]>

Author: kcencele

opencl/source/os_interface/linux/drm_command_stream.inl

@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/direct_submission/linux/drm_direct_submission.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 #include "shared/source/helpers/aligned_memory.h"
@@ -211,9 +212,19 @@ DrmMemoryManager *DrmCommandStreamReceiver<GfxFamily>::getMemoryManager() const
 
 template <typename GfxFamily>
 GmmPageTableMngr *DrmCommandStreamReceiver<GfxFamily>::createPageTableManager() {
-    GmmPageTableMngr *gmmPageTableMngr = GmmPageTableMngr::create(this->executionEnvironment.rootDeviceEnvironments[this->rootDeviceIndex]->getGmmClientContext(), TT_TYPE::AUXTT, nullptr);
+    auto rootDeviceEnvironment = this->executionEnvironment.rootDeviceEnvironments[this->rootDeviceIndex].get();
+    auto gmmClientContext = rootDeviceEnvironment->getGmmClientContext();
+
+    GMM_DEVICE_INFO deviceInfo{};
+    GMM_DEVICE_CALLBACKS_INT deviceCallbacks{};
+    deviceInfo.pDeviceCb = &deviceCallbacks;
+    gmmClientContext->setGmmDeviceInfo(&deviceInfo);
+
+    auto gmmPageTableMngr = GmmPageTableMngr::create(gmmClientContext, TT_TYPE::AUXTT, nullptr);
     gmmPageTableMngr->setCsrHandle(this);
-    this->executionEnvironment.rootDeviceEnvironments[this->rootDeviceIndex]->pageTableManager.reset(gmmPageTableMngr);
+
+    rootDeviceEnvironment->pageTableManager.reset(gmmPageTableMngr);
+
     return gmmPageTableMngr;
 }
 

shared/source/gmm_helper/client_context/gmm_client_context.cpp

@@ -75,4 +75,8 @@ uint8_t GmmClientContext::getMediaSurfaceStateCompressionFormat(GMM_RESOURCE_FOR
     return clientContext->GetMediaSurfaceStateCompressionFormat(format);
 }
 
+void GmmClientContext::setGmmDeviceInfo(GMM_DEVICE_INFO *deviceInfo) {
+    clientContext->GmmSetDeviceInfo(deviceInfo);
+}
+
 } // namespace NEO

shared/source/gmm_helper/client_context/gmm_client_context.h

@@ -42,6 +42,8 @@ class GmmClientContext {
         this->handleAllocator = std::move(allocator);
     }
 
+    MOCKABLE_VIRTUAL void setGmmDeviceInfo(GMM_DEVICE_INFO *deviceInfo);
+
     GmmHandleAllocator *getHandleAllocator() {
         return handleAllocator.get();
     }

shared/source/os_interface/linux/page_table_manager_functions.cpp

@@ -14,6 +14,7 @@
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableFlags);
+    DEBUG_BREAK_IF(pageTableManager == nullptr);
 }
 
 void GmmPageTableMngr::setCsrHandle(void *csrHandle) {}

shared/test/common/mocks/mock_gmm_client_context_base.cpp

@@ -7,6 +7,8 @@
 
 #include "shared/test/common/mocks/mock_gmm_client_context_base.h"
 
+#include "gtest/gtest.h"
+
 namespace NEO {
 
 GMM_RESOURCE_INFO *MockGmmClientContextBase::createResInfoObject(GMM_RESCREATE_PARAMS *pCreateParams) {
@@ -33,4 +35,10 @@ uint8_t MockGmmClientContextBase::getMediaSurfaceStateCompressionFormat(GMM_RESO
     return compressionFormatToReturn;
 }
 
+void MockGmmClientContextBase::setGmmDeviceInfo(GMM_DEVICE_INFO *deviceInfo) {
+    EXPECT_NE(deviceInfo, nullptr);
+
+    GMM_DEVICE_CALLBACKS_INT emptyStruct{};
+    EXPECT_EQ(0, memcmp(deviceInfo->pDeviceCb, &emptyStruct, sizeof(GMM_DEVICE_CALLBACKS_INT)));
+}
 } // namespace NEO

shared/test/common/mocks/mock_gmm_client_context_base.h

@@ -17,6 +17,7 @@ class MockGmmClientContextBase : public GmmClientContext {
     void destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo) override;
     uint8_t getSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format) override;
     uint8_t getMediaSurfaceStateCompressionFormat(GMM_RESOURCE_FORMAT format) override;
+    void setGmmDeviceInfo(GMM_DEVICE_INFO *deviceInfo) override;
 
     GMM_RESOURCE_FORMAT capturedFormat = GMM_FORMAT_INVALID;
     uint8_t compressionFormatToReturn = 1;