diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 251f7ddc670..bf12b7cdb70 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -300,15 +300,6 @@ radv_queue_ring(const struct radv_queue *queue) #define RADV_FROM_HANDLE(__radv_type, __name, __handle) VK_FROM_HANDLE(__radv_type, __name, __handle) -static inline uint64_t -radv_get_tdr_timeout_for_ip(enum amd_ip_type ip_type) -{ - const uint64_t compute_tdr_duration_ns = 60000000000ull; /* 1 minute (default in kernel) */ - const uint64_t other_tdr_duration_ns = 10000000000ull; /* 10 seconds (default in kernel) */ - - return ip_type == AMD_IP_COMPUTE ? compute_tdr_duration_ns : other_tdr_duration_ns; -} - #ifdef __cplusplus } #endif diff --git a/src/amd/vulkan/radv_query.h b/src/amd/vulkan/radv_query.h index 48e6f9a80a8..a7023cd82c4 100644 --- a/src/amd/vulkan/radv_query.h +++ b/src/amd/vulkan/radv_query.h @@ -28,6 +28,8 @@ #ifndef RADV_QUERY_H #define RADV_QUERY_H +#include "amd_family.h" + #include "vk_query_pool.h" struct radv_cmd_buffer; @@ -45,6 +47,15 @@ struct radv_query_pool { VK_DEFINE_NONDISP_HANDLE_CASTS(radv_query_pool, vk.base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL) +static inline uint64_t +radv_get_tdr_timeout_for_ip(enum amd_ip_type ip_type) +{ + const uint64_t compute_tdr_duration_ns = 60000000000ull; /* 1 minute (default in kernel) */ + const uint64_t other_tdr_duration_ns = 10000000000ull; /* 10 seconds (default in kernel) */ + + return ip_type == AMD_IP_COMPUTE ? compute_tdr_duration_ns : other_tdr_duration_ns; +} + void radv_write_timestamp(struct radv_cmd_buffer *cmd_buffer, uint64_t va, VkPipelineStageFlags2 stage); #endif /* RADV_QUERY_H */