intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 12:23:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dont pass drm to ioctl helper methods - use Ioctl Helper's member instead

Browse Source 
Related-To: NEO-6999
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-06-29 16:49:29 +00:00
committed by Compute-Runtime-Automation
parent 28edaa9a2d
commit e88bad79a6
18 changed files with 232 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shared/source/os_interface/linux/device_time_drm.cpp
View File

@@ -32,10 +32,10 @@ void DeviceTimeDrm::timestampTypeDetect() {
reg.offset = (REG_GLOBAL_TIMESTAMP_LDW | 1);
auto ioctlHelper = pDrm->getIoctlHelper();
err = ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &reg);
err = ioctlHelper->ioctl(DrmIoctl::RegRead, &reg);
if (err) {
reg.offset = REG_GLOBAL_TIMESTAMP_UN;
err = ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &reg);
err = ioctlHelper->ioctl(DrmIoctl::RegRead, &reg);
if (err) {
getGpuTime = &DeviceTimeDrm::getGpuTime32;
} else {
@@ -52,7 +52,7 @@ bool DeviceTimeDrm::getGpuTime32(uint64_t *timestamp) {
reg.offset = REG_GLOBAL_TIMESTAMP_LDW;
auto ioctlHelper = pDrm->getIoctlHelper();
if (ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &reg)) {
if (ioctlHelper->ioctl(DrmIoctl::RegRead, &reg)) {
return false;
}
*timestamp = reg.value >> 32;
@@ -65,7 +65,7 @@ bool DeviceTimeDrm::getGpuTime36(uint64_t *timestamp) {
reg.offset = REG_GLOBAL_TIMESTAMP_LDW | 1;
auto ioctlHelper = pDrm->getIoctlHelper();
if (ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &reg)) {
if (ioctlHelper->ioctl(DrmIoctl::RegRead, &reg)) {
return false;
}
*timestamp = reg.value;
@@ -82,11 +82,11 @@ bool DeviceTimeDrm::getGpuTimeSplitted(uint64_t *timestamp) {
regLo.offset = REG_GLOBAL_TIMESTAMP_LDW;
auto ioctlHelper = pDrm->getIoctlHelper();
err += ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &regHi);
err += ioctlHelper->ioctl(DrmIoctl::RegRead, &regHi);
do {
tmpHi = regHi.value;
err += ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &regLo);
err += ioctlHelper->ioctl(pDrm, DrmIoctl::RegRead, &regHi);
err += ioctlHelper->ioctl(DrmIoctl::RegRead, &regLo);
err += ioctlHelper->ioctl(DrmIoctl::RegRead, &regHi);
} while (err == 0 && regHi.value != tmpHi && --loop);
if (err) {