Move ownership of Drm to OsInterface

Related-To: NEO-4208
Change-Id: Iaf5255500b5629739065303e4e4f8a724458dbce
Signed-off-by: Jablonski, Mateusz <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

core/execution_environment/execution_environment.cpp

@@ -25,6 +25,9 @@ ExecutionEnvironment::~ExecutionEnvironment() {
     debugger.reset();
     compilerInterface.reset();
     builtins.reset();
+    if (memoryManager) {
+        memoryManager->commonCleanup();
+    }
     rootDeviceEnvironments.clear();
 }
 

core/memory_manager/memory_manager.h

@@ -163,6 +163,7 @@ class MemoryManager {
     GfxPartition *getGfxPartition(uint32_t rootDeviceIndex) { return gfxPartitions.at(rootDeviceIndex).get(); }
 
     static uint32_t maxOsContextCount;
+    virtual void commonCleanup(){};
 
   protected:
     struct AllocationData {

core/os_interface/linux/device_factory_linux.cpp

@@ -55,11 +55,5 @@ bool DeviceFactory::getDevices(size_t &numDevices, ExecutionEnvironment &executi
 }
 
 void DeviceFactory::releaseDevices() {
-    if (DeviceFactory::numDevices > 0) {
-        for (unsigned int i = 0; i < DeviceFactory::numDevices; ++i) {
-            Drm::closeDevice(i);
-        }
-    }
-    DeviceFactory::numDevices = 0;
 }
 } // namespace NEO

core/os_interface/linux/drm_buffer_object.h

@@ -52,7 +52,7 @@ class BufferObject {
     uint32_t peekRootDeviceIndex() { return rootDeviceIndex; }
 
   protected:
-    Drm *drm;
+    Drm *drm = nullptr;
 
     std::atomic<uint32_t> refCount;
 

core/os_interface/linux/drm_memory_manager.cpp

@@ -60,15 +60,17 @@ DrmMemoryManager::DrmMemoryManager(gemCloseWorkerMode mode,
 }
 
 DrmMemoryManager::~DrmMemoryManager() {
+    if (memoryForPinBB) {
+        MemoryManager::alignedFreeWrapper(memoryForPinBB);
+    }
+}
+
+void DrmMemoryManager::commonCleanup() {
     if (gemCloseWorker) {
         gemCloseWorker->close(false);
     }
     if (pinBB) {
         DrmMemoryManager::unreference(pinBB, true);
-        pinBB = nullptr;
-    }
-    if (memoryForPinBB) {
-        MemoryManager::alignedFreeWrapper(memoryForPinBB);
     }
 }
 

core/os_interface/linux/drm_memory_manager.h

@@ -42,6 +42,7 @@ class DrmMemoryManager : public MemoryManager {
 
     AllocationStatus populateOsHandles(OsHandleStorage &handleStorage, uint32_t rootDeviceIndex) override;
     void cleanOsHandles(OsHandleStorage &handleStorage, uint32_t rootDeviceIndex) override;
+    void commonCleanup() override;
 
     // drm/i915 ioctl wrappers
     MOCKABLE_VIRTUAL uint32_t unreference(BufferObject *bo, bool synchronousDestroy);

core/os_interface/linux/drm_neo.h

@@ -45,8 +45,6 @@ class Drm {
     friend DeviceFactory;
 
   public:
-    static Drm *get(int32_t deviceOrdinal);
-
     virtual ~Drm();
 
     virtual int ioctl(unsigned long request, void *arg);
@@ -94,6 +92,8 @@ class Drm {
 
     static std::unique_ptr<HwDeviceId> discoverDevices();
 
+    static Drm *create(std::unique_ptr<HwDeviceId> hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment);
+
   protected:
     int getQueueSliceCount(drm_i915_gem_context_param_sseu *sseu);
     bool sliceCountChangeSupported = false;
@@ -109,9 +109,6 @@ class Drm {
     std::unique_ptr<EngineInfo> engineInfo;
     std::unique_ptr<MemoryInfo> memoryInfo;
 
-    static Drm *create(std::unique_ptr<HwDeviceId> hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment);
-    static void closeDevice(int32_t deviceOrdinal);
-
     std::string getSysFsPciPath(int deviceID);
     void *query(uint32_t queryId);
 

core/os_interface/linux/drm_neo_create.cpp

@@ -11,15 +11,7 @@ namespace NEO {
 
 Drm::~Drm() = default;
 
-Drm *Drm::get(int32_t deviceOrdinal) {
-    return nullptr;
-}
-
 Drm *Drm::create(std::unique_ptr<HwDeviceId> hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment) {
     return nullptr;
 }
-
-void Drm::closeDevice(int32_t deviceOrdinal) {
-    return;
-}
 } // namespace NEO

core/os_interface/linux/os_interface.cpp

@@ -7,10 +7,18 @@
 
 #include "core/os_interface/linux/os_interface.h"
 
+#include "core/os_interface/linux/drm_neo.h"
+
 namespace NEO {
 
 bool OSInterface::osEnabled64kbPages = false;
 
+OSInterface::OSInterfaceImpl::OSInterfaceImpl() = default;
+OSInterface::OSInterfaceImpl::~OSInterfaceImpl() = default;
+void OSInterface::OSInterfaceImpl::setDrm(Drm *drm) {
+    this->drm.reset(drm);
+}
+
 OSInterface::OSInterface() {
     osInterfaceImpl = new OSInterfaceImpl();
 }

core/os_interface/linux/os_interface.h

@@ -8,22 +8,21 @@
 #pragma once
 #include "core/os_interface/os_interface.h"
 
+#include <memory>
+
 namespace NEO {
 class Drm;
 
 class OSInterface::OSInterfaceImpl {
   public:
-    OSInterfaceImpl() {
-        drm = nullptr;
-    }
+    OSInterfaceImpl();
+    ~OSInterfaceImpl();
     Drm *getDrm() const {
-        return drm;
-    }
-    void setDrm(Drm *drm) {
-        this->drm = drm;
+        return drm.get();
     }
+    void setDrm(Drm *drm);
 
   protected:
-    Drm *drm;
+    std::unique_ptr<Drm> drm;
 };
 } // namespace NEO