Revert "I915_EXEC_DATA_PORT_COHERENT support"

This reverts commit 933312e098.

Change-Id: I70a48a80c5d06455570dc2a97b99e1fb5edd7c08
This commit is contained in:
Dunajski, Bartosz
2018-03-09 13:03:48 +01:00
committed by sys_ocldev
parent 656fc9beff
commit 5389d4d859
8 changed files with 2 additions and 103 deletions

View File

@@ -158,8 +158,6 @@ int BufferObject::exec(uint32_t used, size_t startOffset, unsigned int flags, bo
if (drm->peekCoherencyDisablePatchActive() && !requiresCoherency) {
execbuf.flags |= I915_PRIVATE_EXEC_FORCE_NON_COHERENT;
} else if (drm->peekDataPortCoherencyPatchActive() && requiresCoherency) {
execbuf.flags |= I915_EXEC_DATA_PORT_COHERENT;
}
if (lowPriority) {
execbuf.rsvd1 = this->drm->lowPriorityContextId & I915_EXEC_CONTEXT_ID_MASK;

View File

@@ -121,12 +121,6 @@ void Drm::obtainCoherencyDisablePatchActive() {
coherencyDisablePatchActive = (ret == 0) && (value != 0);
}
void Drm::obtainDataPortCoherencyPatchActive() {
int value = 0;
auto ret = getParamIoctl(I915_PARAM_HAS_EXEC_DATA_PORT_COHERENCY, &value);
dataPortCoherencyPatchActive = (ret == 0) && (value != 0);
}
std::string Drm::getSysFsPciPath(int deviceID) {
std::string nullPath;
std::string sysFsPciDirectory = Os::sysFsPciPath;

View File

@@ -39,9 +39,6 @@ namespace OCLRT {
#define I915_CONTEXT_PRIVATE_PARAM_BOOST 0x80000000
#define I915_EXEC_DATA_PORT_COHERENT (1 << 20)
#define I915_PARAM_HAS_EXEC_DATA_PORT_COHERENCY 52
class DeviceFactory;
struct HardwareInfo;
@@ -77,10 +74,8 @@ class Drm {
bool is48BitAddressRangeSupported();
MOCKABLE_VIRTUAL bool hasPreemption();
bool setLowPriority();
bool peekCoherencyDisablePatchActive() const { return coherencyDisablePatchActive; }
bool peekDataPortCoherencyPatchActive() const { return dataPortCoherencyPatchActive; }
bool peekCoherencyDisablePatchActive() { return coherencyDisablePatchActive; }
virtual void obtainCoherencyDisablePatchActive();
MOCKABLE_VIRTUAL void obtainDataPortCoherencyPatchActive();
int getFileDescriptor() const { return fd; }
bool contextCreate();
void contextDestroy();
@@ -95,7 +90,6 @@ class Drm {
int revisionId;
GTTYPE eGtType;
bool coherencyDisablePatchActive = false;
bool dataPortCoherencyPatchActive = false;
Drm(int fd) : lowPriorityContextId(0), fd(fd), deviceId(0), revisionId(0), eGtType(GTTYPE_UNDEFINED) {}
virtual ~Drm();

View File

@@ -132,7 +132,6 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou
pSysInfo->SubSliceCount = static_cast<uint32_t>(subSliceCount);
drm->obtainCoherencyDisablePatchActive();
drm->obtainDataPortCoherencyPatchActive();
pSkuTable->ftrSVM = drm->is48BitAddressRangeSupported();
int maxGpuFreq = 0;