diff --git a/src/amd/vulkan/meta/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c index 38a9d11e0f0bc..ff9884bb5e338 100644 --- a/src/amd/vulkan/meta/radv_meta_buffer.c +++ b/src/amd/vulkan/meta/radv_meta_buffer.c @@ -1,4 +1,5 @@ #include "nir/nir_builder.h" +#include "radv_debug.h" #include "radv_meta.h" #include "radv_sdma.h" diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h index ba8a36659244c..5dd9a9f20e84c 100644 --- a/src/amd/vulkan/radv_debug.h +++ b/src/amd/vulkan/radv_debug.h @@ -111,4 +111,11 @@ void radv_check_trap_handler(struct radv_queue *queue); bool radv_vm_fault_occurred(struct radv_device *device, struct radv_winsys_gpuvm_fault_info *fault_info); + +ALWAYS_INLINE static bool +radv_device_fault_detection_enabled(const struct radv_device *device) +{ + return device->instance->debug_flags & RADV_DEBUG_HANG; +} + #endif diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index f6cffbd137ee4..8d1abb1ddf22b 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -90,12 +90,6 @@ radv_spm_trace_enabled(struct radv_instance *instance) debug_get_bool_option("RADV_THREAD_TRACE_CACHE_COUNTERS", true); } -bool -radv_device_fault_detection_enabled(const struct radv_device *device) -{ - return device->instance->debug_flags & RADV_DEBUG_HANG; -} - VKAPI_ATTR VkResult VKAPI_CALL radv_GetMemoryHostPointerPropertiesEXT(VkDevice _device, VkExternalMemoryHandleTypeFlagBits handleType, const void *pHostPointer, diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 549f1bc051f0c..be2a9b517ed4b 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -3824,8 +3824,6 @@ radv_uses_image_float32_atomics(const struct radv_device *device) device->vk.enabled_features.sparseImageFloat32AtomicMinMax; } -bool radv_device_fault_detection_enabled(const struct radv_device *device); - struct radv_compute_pipeline_metadata { uint32_t shader_va; uint32_t rsrc1; diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 6b46c5205916c..279a7e71de0c1 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -28,6 +28,7 @@ /* command buffer handling for AMD GCN */ #include "radv_cs.h" +#include "radv_debug.h" #include "radv_private.h" #include "radv_shader.h" #include "sid.h"