anv: Partialy import drm-uapi/gpu_scheduler.h and use it
To replace the hard-coded values. Not fully importing gpu_scheduler.h because it includes several Linux specific headers that will make the life of anyone porting Xe to other Unix harder. Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22112>
This commit is contained in:

committed by
Marge Bot

parent
073fc34e4b
commit
972d2a89d9
44
include/drm-uapi/gpu_scheduler.h
Normal file
44
include/drm-uapi/gpu_scheduler.h
Normal file
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright 2015 Advanced Micro Devices, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _DRM_GPU_SCHEDULER_H_
|
||||
#define _DRM_GPU_SCHEDULER_H_
|
||||
|
||||
/* Only leaving the important enum definition to avoid pull in several Linux
|
||||
* specific headers
|
||||
*/
|
||||
|
||||
/* These are often used as an (initial) index
|
||||
* to an array, and as such should start at 0.
|
||||
*/
|
||||
enum drm_sched_priority {
|
||||
DRM_SCHED_PRIORITY_MIN,
|
||||
DRM_SCHED_PRIORITY_NORMAL,
|
||||
DRM_SCHED_PRIORITY_HIGH,
|
||||
DRM_SCHED_PRIORITY_KERNEL,
|
||||
|
||||
DRM_SCHED_PRIORITY_COUNT,
|
||||
DRM_SCHED_PRIORITY_UNSET = -2
|
||||
};
|
||||
|
||||
#endif
|
@@ -58,20 +58,19 @@ anv_xe_physical_device_get_parameters(struct anv_physical_device *device)
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
/* TODO: include gpu_scheduler.h and spsc_queue.h and replace hard-coded values */
|
||||
uint64_t
|
||||
anv_vk_priority_to_xe(VkQueueGlobalPriorityKHR vk_priority)
|
||||
enum drm_sched_priority
|
||||
anv_vk_priority_to_drm_sched_priority(VkQueueGlobalPriorityKHR vk_priority)
|
||||
{
|
||||
switch (vk_priority) {
|
||||
case VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR:
|
||||
return 0;
|
||||
return DRM_SCHED_PRIORITY_MIN;
|
||||
case VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR:
|
||||
return 1;
|
||||
return DRM_SCHED_PRIORITY_NORMAL;
|
||||
case VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR:
|
||||
return 2;
|
||||
return DRM_SCHED_PRIORITY_HIGH;
|
||||
default:
|
||||
unreachable("Invalid priority");
|
||||
return 0;
|
||||
return DRM_SCHED_PRIORITY_MIN;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,7 +107,7 @@ anv_xe_physical_device_max_priority_update(struct anv_physical_device *device)
|
||||
struct drm_xe_engine_set_property engine_property = {
|
||||
.engine_id = create_engine.engine_id,
|
||||
.property = XE_ENGINE_SET_PROPERTY_PRIORITY,
|
||||
engine_property.value = anv_vk_priority_to_xe(priorities[i]),
|
||||
engine_property.value = anv_vk_priority_to_drm_sched_priority(priorities[i]),
|
||||
};
|
||||
if (intel_ioctl(device->local_fd, DRM_IOCTL_XE_ENGINE_SET_PROPERTY,
|
||||
&engine_property))
|
||||
|
@@ -27,6 +27,8 @@
|
||||
#include "vulkan/vulkan_core.h"
|
||||
#include "vk_device.h"
|
||||
|
||||
#include "drm-uapi/gpu_scheduler.h"
|
||||
|
||||
struct anv_device;
|
||||
struct anv_physical_device;
|
||||
|
||||
@@ -38,4 +40,5 @@ VkResult
|
||||
anv_xe_physical_device_get_parameters(struct anv_physical_device *device);
|
||||
void
|
||||
anv_xe_physical_device_max_priority_update(struct anv_physical_device *device);
|
||||
uint64_t anv_vk_priority_to_xe(VkQueueGlobalPriorityKHR vk_priority);
|
||||
enum drm_sched_priority
|
||||
anv_vk_priority_to_drm_sched_priority(VkQueueGlobalPriorityKHR vk_priority);
|
||||
|
@@ -97,7 +97,7 @@ anv_xe_create_engine(struct anv_device *device,
|
||||
struct drm_xe_engine_set_property engine_property = {
|
||||
.engine_id = create.engine_id,
|
||||
.property = XE_ENGINE_SET_PROPERTY_PRIORITY,
|
||||
.value = anv_vk_priority_to_xe(priority),
|
||||
.value = anv_vk_priority_to_drm_sched_priority(priority),
|
||||
};
|
||||
ret = intel_ioctl(device->fd, DRM_IOCTL_XE_ENGINE_SET_PROPERTY,
|
||||
&engine_property);
|
||||
|
Reference in New Issue
Block a user