Module: Mesa Branch: main Commit: dddab9fa778d85f9b2f11eeec2b635b02b46e54f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dddab9fa778d85f9b2f11eeec2b635b02b46e54f
Author: Shuicheng Lin <[email protected]> Date: Fri Nov 17 13:21:33 2023 +0000 intel/xe: Correct DRM_XE_EXEC_QUEUE_SET_PROPERTY's ioctl DRM_XE_EXEC_QUEUE_SET_PROPERTY is the offset, while DRM_IOCTL_XE_EXEC_QUEUE_SET_PROPERTY is the real number. Signed-off-by: Shuicheng Lin <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Reviewed-by: José Roberto de Souza <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26253> --- src/gallium/drivers/iris/xe/iris_batch.c | 2 +- src/intel/vulkan/xe/anv_queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/xe/iris_batch.c b/src/gallium/drivers/iris/xe/iris_batch.c index 5f29aa27c4e..c5a8afdb5b5 100644 --- a/src/gallium/drivers/iris/xe/iris_batch.c +++ b/src/gallium/drivers/iris/xe/iris_batch.c @@ -90,7 +90,7 @@ iris_xe_init_batch(struct iris_bufmgr *bufmgr, goto error_create_exec_queue; exec_queue_property.exec_queue_id = create.exec_queue_id; - intel_ioctl(iris_bufmgr_get_fd(bufmgr), DRM_XE_EXEC_QUEUE_SET_PROPERTY, + intel_ioctl(iris_bufmgr_get_fd(bufmgr), DRM_IOCTL_XE_EXEC_QUEUE_SET_PROPERTY, &exec_queue_property); /* TODO: handle "protected" context/exec_queue */ diff --git a/src/intel/vulkan/xe/anv_queue.c b/src/intel/vulkan/xe/anv_queue.c index 2c51b22b721..b4aefa29cd8 100644 --- a/src/intel/vulkan/xe/anv_queue.c +++ b/src/intel/vulkan/xe/anv_queue.c @@ -121,7 +121,7 @@ create_engine(struct anv_device *device, .property = XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY, .value = anv_vk_priority_to_drm_sched_priority(priority), }; - ret = intel_ioctl(device->fd, DRM_XE_EXEC_QUEUE_SET_PROPERTY, + ret = intel_ioctl(device->fd, DRM_IOCTL_XE_EXEC_QUEUE_SET_PROPERTY, &exec_queue_property); if (ret && priority > VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR) goto priority_error;
