From 7f5fae4c2fbbc3798d18a8e0cbf730f5cbe4680c Mon Sep 17 00:00:00 2001 From: "Milczarek, Slawomir" Date: Fri, 27 Jan 2023 14:09:11 +0000 Subject: [PATCH] Enable recoverable page faults by default on faultable hardware Related-To: NEO-6355 Signed-off-by: Milczarek, Slawomir --- shared/source/os_interface/linux/drm_neo.cpp | 2 +- shared/source/os_interface/linux/drm_neo.h | 2 +- shared/test/common/libult/linux/drm_mock.h | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index c0ffe69dab..ec09d49865 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -1181,7 +1181,7 @@ bool Drm::hasPageFaultSupport() const { return !!DebugManager.flags.EnableRecoverablePageFaults.get(); } - return false; + return pageFaultSupported; } unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, aub_stream::EngineType engineType, bool engineInstancedDevice) { diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h index 328d45b54f..798093a23a 100644 --- a/shared/source/os_interface/linux/drm_neo.h +++ b/shared/source/os_interface/linux/drm_neo.h @@ -165,7 +165,7 @@ class Drm : public DriverModel { MOCKABLE_VIRTUAL bool registerResourceClasses(); MOCKABLE_VIRTUAL void queryPageFaultSupport(); - MOCKABLE_VIRTUAL bool hasPageFaultSupport() const; + bool hasPageFaultSupport() const; MOCKABLE_VIRTUAL uint32_t registerResource(DrmResourceClass classType, const void *data, size_t size); MOCKABLE_VIRTUAL void unregisterResource(uint32_t handle); diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h index cc9ec1e8f2..866708d6a8 100644 --- a/shared/test/common/libult/linux/drm_mock.h +++ b/shared/test/common/libult/linux/drm_mock.h @@ -114,14 +114,6 @@ class DrmMock : public Drm { queryPageFaultSupportCalled = true; } - bool hasPageFaultSupport() const override { - if (DebugManager.flags.EnableRecoverablePageFaults.get() != -1) { - return !!DebugManager.flags.EnableRecoverablePageFaults.get(); - } - - return pageFaultSupported; - } - uint32_t createDrmContext(uint32_t drmVmId, bool isDirectSubmissionRequested, bool isCooperativeContextRequested) override { capturedCooperativeContextRequest = isCooperativeContextRequested; if (callBaseCreateDrmContext) {