radv: Initial implementation of VK_EXT_queue_global_priority

index e57a419..d9f9a2b 100644
@@ -651,7 +651,7 @@ void radv_GetPhysicalDeviceMemoryProperties(
 	};
 }
 
-static void
+static int
 radv_queue_init(struct radv_device *device, struct radv_queue *queue,
 		int queue_family_index, int idx)
 {

@@ -659,11 +659,19 @@ radv_queue_init(struct radv_device *device, struct radv_queue *queue,
 	queue->device = device;
 	queue->queue_family_index = queue_family_index;
 	queue->queue_idx = idx;
+
+	queue->hw_ctx = device->ws->ctx_create(device->ws);
+	if (!queue->hw_ctx)
+		return VK_ERROR_OUT_OF_HOST_MEMORY;
+
+	return VK_SUCCESS;
 }
 
 static void
 radv_queue_finish(struct radv_queue *queue)
 {
+	if (queue->hw_ctx)
+		queue->device->ws->ctx_destroy(queue->hw_ctx);
 }
 
 VkResult radv_CreateDevice(

@@ -718,23 +726,21 @@ VkResult radv_CreateDevice(
 			goto fail;
 		}
 
-		device->queue_count[qfi] = queue_create->queueCount;
+		memset(device->queues[qfi], 0, queue_create->queueCount * sizeof(struct radv_queue));
 
-		for (unsigned q = 0; q < queue_create->queueCount; q++)
-			radv_queue_init(device, &device->queues[qfi][q], qfi, q);
-	}
+		device->queue_count[qfi] = queue_create->queueCount;
 
-	device->hw_ctx = device->ws->ctx_create(device->ws);
-	if (!device->hw_ctx) {
-		result = VK_ERROR_OUT_OF_HOST_MEMORY;
-		goto fail;
+		for (unsigned q = 0; q < queue_create->queueCount; q++) {
+			result = radv_queue_init(device, &device->queues[qfi][q], qfi, q);
+			if (result != VK_SUCCESS)
+				goto fail;
+		}
 	}
 
 	result = radv_device_init_meta(device);
-	if (result != VK_SUCCESS) {
-		device->ws->ctx_destroy(device->hw_ctx);
+	if (result != VK_SUCCESS)
 		goto fail;
-	}
+
 	device->allow_fast_clears = env_var_as_boolean("RADV_FAST_CLEARS", false);
 	device->allow_dcc = !env_var_as_boolean("RADV_DCC_DISABLE", false);
 	device->shader_stats_dump = env_var_as_boolean("RADV_SHADER_STATS", false);

@@ -780,7 +786,6 @@ void radv_DestroyDevice(
 {
 	RADV_FROM_HANDLE(radv_device, device, _device);
 
-	device->ws->ctx_destroy(device->hw_ctx);
 	for (unsigned i = 0; i < RADV_MAX_QUEUE_FAMILIES; i++) {
 		for (unsigned q = 0; q < device->queue_count[i]; q++)
 			radv_queue_finish(&device->queues[i][q]);

@@ -878,7 +883,7 @@ VkResult radv_QueueSubmit(
 	RADV_FROM_HANDLE(radv_queue, queue, _queue);
 	RADV_FROM_HANDLE(radv_fence, fence, _fence);
 	struct radeon_winsys_fence *base_fence = fence ? fence->fence : NULL;
-	struct radeon_winsys_ctx *ctx = queue->device->hw_ctx;
+	struct radeon_winsys_ctx *ctx = queue->hw_ctx;
 	int ret;
 
 	for (uint32_t i = 0; i < submitCount; i++) {

@@ -929,7 +934,7 @@ VkResult radv_QueueWaitIdle(
 {
 	RADV_FROM_HANDLE(radv_queue, queue, _queue);
 
-	queue->device->ws->ctx_wait_idle(queue->device->hw_ctx,
+	queue->device->ws->ctx_wait_idle(queue->hw_ctx,
 	                                 radv_queue_family_to_ring(queue->queue_family_index),
 	                                 queue->queue_idx);
 	return VK_SUCCESS;

index f76d38d..d316f71 100644
@@ -456,6 +456,7 @@ enum ring_type radv_queue_family_to_ring(int f);
 struct radv_queue {
 	VK_LOADER_DATA                              _loader_data;
 	struct radv_device *                         device;
+	struct radeon_winsys_ctx                    *hw_ctx;
 	int queue_family_index;
 	int queue_idx;
 };

@@ -467,7 +468,6 @@ struct radv_device {
 
 	struct radv_instance *                       instance;
 	struct radeon_winsys *ws;
-	struct radeon_winsys_ctx *hw_ctx;
 
 	struct radv_meta_state                       meta_state;
 

index 2eb8e45..752efe4 100644
@@ -364,7 +364,7 @@ VkResult radv_QueuePresentKHR(
 
 		RADV_FROM_HANDLE(radv_fence, fence, swapchain->fences[0]);
 		struct radeon_winsys_fence *base_fence = fence->fence;
-		struct radeon_winsys_ctx *ctx = queue->device->hw_ctx;
+		struct radeon_winsys_ctx *ctx = queue->hw_ctx;
 		queue->device->ws->cs_submit(ctx, queue->queue_idx,
 					     &queue->device->empty_cs[queue->queue_family_index],
 					     1,

72 lines not on this page · raw message

index d9f9a2b..9880a5d 100644
@@ -651,16 +651,41 @@ void radv_GetPhysicalDeviceMemoryProperties(
 	};
 }
 
+static enum ctx_priority
+radv_get_queue_global_priority(VkQueueGlobalPriorityEXT *pObj)
+{
+	switch(pObj->priority) {
+	case VK_QUEUE_GLOBAL_PRIORITY_HIGH:
+		return CTX_PRIORITY_HIGH;
+	default:
+		return CTX_PRIORITY_NORMAL;
+	}
+}
+
 static int
 radv_queue_init(struct radv_device *device, struct radv_queue *queue,
-		int queue_family_index, int idx)
+		int queue_family_index, int idx, const VkDeviceQueueCreateInfo *create_info)
 {
 	queue->_loader_data.loaderMagic = ICD_LOADER_MAGIC;
 	queue->device = device;
 	queue->queue_family_index = queue_family_index;
 	queue->queue_idx = idx;
+	queue->priority = CTX_PRIORITY_NORMAL;
+
+	radv_foreach_ext_obj(create_info, next_obj) {
+		switch (next_obj->sType) {
+		case VK_STRUCTURE_TYPE_QUEUE_GLOBAL_PRIORITY_EXT:
+			queue->priority = radv_get_queue_global_priority(
+									(VkQueueGlobalPriorityEXT*)next_obj);
+			break;
+		default:
+			radv_finishme("Unsupported queue extension VkStructureType %d\n",
+							next_obj->sType);
+			break;
+		}
+	}
 
-	queue->hw_ctx = device->ws->ctx_create(device->ws);
+	queue->hw_ctx = device->ws->ctx_create(device->ws, queue->priority);
 	if (!queue->hw_ctx)
 		return VK_ERROR_OUT_OF_HOST_MEMORY;
 

@@ -731,7 +756,7 @@ VkResult radv_CreateDevice(
 		device->queue_count[qfi] = queue_create->queueCount;
 
 		for (unsigned q = 0; q < queue_create->queueCount; q++) {
-			result = radv_queue_init(device, &device->queues[qfi][q], qfi, q);
+			result = radv_queue_init(device, &device->queues[qfi][q], qfi, q, queue_create);
 			if (result != VK_SUCCESS)
 				goto fail;
 		}

index d316f71..d79ef3a 100644
@@ -66,6 +66,7 @@ typedef uint32_t xcb_window_t;
 
 #include <vulkan/vulkan.h>
 #include <vulkan/vulkan_intel.h>
+#include <vulkan/vk_ext_queue_global_priority.h>
 #include <vulkan/vk_icd.h>
 
 #include "radv_entrypoints.h"

@@ -457,6 +458,7 @@ struct radv_queue {
 	VK_LOADER_DATA                              _loader_data;
 	struct radv_device *                         device;
 	struct radeon_winsys_ctx                    *hw_ctx;
+	enum ctx_priority                            priority;
 	int queue_family_index;
 	int queue_idx;
 };

@@ -1325,4 +1327,14 @@ RADV_DEFINE_NONDISP_HANDLE_CASTS(radv_shader_module, VkShaderModule)
 		return (const __VkType *) __radv_obj;			\
 	}
 
+/**
+ * Used to iterate over Vk structs that support extension types
+ *
+ * Iterate over the __obj->pNext list, keeping the current object in __varname
+ */
+#define radv_foreach_ext_obj(__obj, __varname) \
+		/*Note: Any type with sType/pNext works here*/ \
+		for ( VkSubmitInfo *__varname = (VkSubmitInfo*)__obj->pNext;\
+				__varname != NULL;\
+				__varname = (VkSubmitInfo*)__varname->pNext)
 #endif /* RADV_PRIVATE_H */

index 4b738b8..3218c87 100644
@@ -64,6 +64,11 @@ enum ring_type {
 	RING_LAST,
 };
 
+enum ctx_priority {
+	CTX_PRIORITY_HIGH = 0,
+	CTX_PRIORITY_NORMAL
+};
+
 struct radeon_winsys_cs {
 	unsigned cdw;  /* Number of used dwords. */
 	unsigned max_dw; /* Maximum number of dwords. */

@@ -284,7 +289,8 @@ struct radeon_winsys {
 
 	void (*buffer_set_metadata)(struct radeon_winsys_bo *bo,
 				    struct radeon_bo_metadata *md);
-	struct radeon_winsys_ctx *(*ctx_create)(struct radeon_winsys *ws);
+	struct radeon_winsys_ctx *(*ctx_create)(struct radeon_winsys *ws,
+											enum ctx_priority priority);
 	void (*ctx_destroy)(struct radeon_winsys_ctx *ctx);
 
 	bool (*ctx_wait_idle)(struct radeon_winsys_ctx *ctx,

index b24aa99..585ccf4 100644
@@ -775,15 +775,31 @@ static int radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx,
 	return ret;
 }
 
-static struct radeon_winsys_ctx *radv_amdgpu_ctx_create(struct radeon_winsys *_ws)
+static uint32_t radv_to_amdgpu_priority(enum ctx_priority priority radv_priority)
+{
+	switch (radv_priority) {
+		case AMDGPU_CTX_PRIORITY_HIGH:
+			return AMDGPU_CTX_PRIORITY_HIGH;
+		case AMDGPU_CTX_PRIORITY_NORMAL:
+			return AMDGPU_CTX_PRIORITY_NORMAL;
+		default:
+			radv_loge("Invalid radv priority %d\n, defualting to normal", radv_priority);
+			return AMDGPU_CTX_PRIORITY_NORMAL;
+	}
+}
+
+static struct radeon_winsys_ctx *radv_amdgpu_ctx_create(struct radeon_winsys *_ws,
+														enum ctx_priority priority)
 {
 	struct radv_amdgpu_winsys *ws = radv_amdgpu_winsys(_ws);
 	struct radv_amdgpu_ctx *ctx = CALLOC_STRUCT(radv_amdgpu_ctx);
+	uint32_t amdgpu_priority = radv_to_amdgpu_priority(priority);
 	int r;
 
 	if (!ctx)
 		return NULL;
-	r = amdgpu_cs_ctx_create(ws->dev, &ctx->ctx);
+
+	r = amdgpu_cs_ctx_create2(ws->dev, amdgpu_priority, &ctx->ctx);
 	if (r) {
 		fprintf(stderr, "amdgpu: radv_amdgpu_cs_ctx_create failed. (%i)\n", r);
 		goto error_create;