From 795287c66e0c4d73c649e85f9c41bd9521ee20be Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Fri, 14 Apr 2017 20:00:26 +0300 Subject: [PATCH] radv: report timestampPeriod correctly The kernel returns frequency in kHz, so to convert to nanosecond interval that Vulkan uses the dividend should be 1000000.0 and not 100000.0. This fixes the GPU graph in DOOM and matches the amdgpu-pro blob. Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver" Signed-off-by: Grazvydas Ignotas Reviewed-by: Bas Nieuwenhuizen (cherry picked from commit 1b2fe7ce45a508fa080e6bf93b820e6217beed83) --- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_radeon_winsys.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 6022db09bf9..5e5fedd1466 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -570,7 +570,7 @@ void radv_GetPhysicalDeviceProperties( .storageImageSampleCounts = VK_SAMPLE_COUNT_1_BIT, .maxSampleMaskWords = 1, .timestampComputeAndGraphics = false, - .timestampPeriod = 100000.0 / pdevice->rad_info.clock_crystal_freq, + .timestampPeriod = 1000000.0 / pdevice->rad_info.clock_crystal_freq, .maxClipDistances = 8, .maxCullDistances = 8, .maxCombinedClipAndCullDistances = 8, diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index a0b5092e300..3e633ffa0c6 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -94,7 +94,7 @@ struct radeon_info { uint32_t compute_rings; uint32_t vce_fw_version; uint32_t vce_harvest_config; - uint32_t clock_crystal_freq; + uint32_t clock_crystal_freq; /* in kHz */ /* Kernel info. */ uint32_t drm_major; /* version */