Pass RootDeviceEnvironment to Drm

Related-To: NEO-4207
Change-Id: Ic59abf9221702333efea69213391b9646ae0864e
Signed-off-by: Jablonski, Mateusz <mateusz.jablonski@intel.com>
This commit is contained in:
Jablonski, Mateusz
2020-01-29 19:10:49 +01:00
committed by sys_ocldev
parent 780925aab4
commit adc3a97503
14 changed files with 74 additions and 50 deletions

View File

@@ -29,6 +29,7 @@ namespace NEO {
class DeviceFactory;
struct HardwareInfo;
struct RootDeviceEnvironment;
struct DeviceDescriptor { // NOLINT(clang-analyzer-optin.performance.Padding)
unsigned short deviceId;
@@ -102,13 +103,14 @@ class Drm {
int deviceId = 0;
int revisionId = 0;
GTTYPE eGtType = GTTYPE_UNDEFINED;
Drm(int fd) : fd(fd) {}
RootDeviceEnvironment &rootDeviceEnvironment;
Drm(int fd, RootDeviceEnvironment &rootDeviceEnvironment) : fd(fd), rootDeviceEnvironment(rootDeviceEnvironment) {}
std::unique_ptr<EngineInfo> engineInfo;
std::unique_ptr<MemoryInfo> memoryInfo;
static int getDeviceFd(const int devType);
static int openDevice();
static Drm *create(int32_t deviceOrdinal);
static Drm *create(int32_t deviceOrdinal, RootDeviceEnvironment &rootDeviceEnvironment);
static void closeDevice(int32_t deviceOrdinal);
std::string getSysFsPciPath(int deviceID);

View File

@@ -15,7 +15,7 @@ Drm *Drm::get(int32_t deviceOrdinal) {
return nullptr;
}
Drm *Drm::create(int32_t deviceOrdinal) {
Drm *Drm::create(int32_t deviceOrdinal, RootDeviceEnvironment &rootDeviceEnvironment) {
return nullptr;
}

View File

@@ -41,7 +41,7 @@ class DrmNullDevice : public Drm {
}
protected:
DrmNullDevice(int fd) : Drm(fd), gpuTimestamp(0){};
DrmNullDevice(int fd, RootDeviceEnvironment &rootDeviceEnvironment) : Drm(fd, rootDeviceEnvironment), gpuTimestamp(0){};
uint64_t gpuTimestamp;
};