intel/dev,perf: Use a single timescale function

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Acked-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13996>
This commit is contained in:
Lionel Landwerlin
2021-11-23 00:44:06 +02:00
committed by Marge Bot
parent 02a4d622ed
commit d3724de894
4 changed files with 11 additions and 23 deletions
+5 -6
View File
@@ -223,8 +223,8 @@ std::vector<PerfRecord> IntelDriver::parse_perf_records(const std::vector<uint8_
uint64_t gpu_timestamp = gpu_timestamp_udw + gpu_timestamp_ldw;
auto duration = intel_perf_scale_gpu_timestamp(&perf->devinfo,
gpu_timestamp - prev_gpu_timestamp);
auto duration = intel_device_info_timebase_scale(&perf->devinfo,
gpu_timestamp - prev_gpu_timestamp);
// Skip perf-records that are too short by checking
// the distance between last report and this one
@@ -318,8 +318,7 @@ uint64_t IntelDriver::gpu_next()
// Consume first record
records.erase(std::begin(records), std::begin(records) + 1);
return intel_perf_scale_gpu_timestamp(&perf->devinfo,
gpu_timestamp);
return intel_device_info_timebase_scale(&perf->devinfo, gpu_timestamp);
}
uint64_t IntelDriver::next()
@@ -336,8 +335,8 @@ uint32_t IntelDriver::gpu_clock_id() const
uint64_t IntelDriver::gpu_timestamp() const
{
return intel_perf_scale_gpu_timestamp(&perf->devinfo,
read_gpu_timestamp(drm_device.fd));
return intel_device_info_timebase_scale(&perf->devinfo,
read_gpu_timestamp(drm_device.fd));
}
} // namespace pps