Revert "Unify query ioctls"

This reverts commit 571199d048.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-05-31 20:11:40 +02:00
committed by Compute-Runtime-Automation
parent 65ca31d817
commit ce7de9d66e
11 changed files with 129 additions and 83 deletions

View File

@@ -142,10 +142,6 @@ std::string getIoctlString(DrmIoctl ioctlRequest) {
return "DRM_IOCTL_I915_GEM_VM_CREATE";
case DrmIoctl::GemVmDestroy:
return "DRM_IOCTL_I915_GEM_VM_DESTROY";
case DrmIoctl::QueryEngineInfo:
return "DRM_I915_QUERY_ENGINE_INFO";
case DrmIoctl::QueryMemoryRegions:
return "DRM_I915_QUERY_MEMORY_REGIONS";
}
UNRECOVERABLE_IF(true);
return "";
@@ -981,7 +977,7 @@ bool Drm::querySystemInfo() {
}
std::vector<uint8_t> Drm::getMemoryRegions() {
return this->query(ioctlHelper->getIoctlRequestValue(DrmIoctl::QueryMemoryRegions), 0);
return this->query(ioctlHelper->getMemRegionsIoctlVal(), 0);
}
bool Drm::queryMemoryInfo() {
@@ -995,7 +991,7 @@ bool Drm::queryMemoryInfo() {
}
bool Drm::queryEngineInfo(bool isSysmanEnabled) {
auto enginesQuery = this->query(ioctlHelper->getIoctlRequestValue(DrmIoctl::QueryEngineInfo), 0);
auto enginesQuery = this->query(ioctlHelper->getEngineInfoIoctlVal(), 0);
if (enginesQuery.empty()) {
return false;
}