mirror of https://github.com/armbian/build.git
669 lines
20 KiB
Diff
669 lines
20 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Iouri Tarassov <iourit@linux.microsoft.com>
|
|
Date: Tue, 1 Feb 2022 17:03:47 -0800
|
|
Subject: drivers: hv: dxgkrnl: Creation of dxgcontext objects
|
|
|
|
Implement ioctls for creation/destruction of dxgcontext
|
|
objects:
|
|
- the LX_DXCREATECONTEXTVIRTUAL ioctl
|
|
- the LX_DXDESTROYCONTEXT ioctl.
|
|
|
|
A dxgcontext object represents a compute device execution thread.
|
|
Ccompute device DMA buffers and synchronization operations are
|
|
submitted for execution to a dxgcontext. dxgcontexts objects
|
|
belong to a dxgdevice object.
|
|
|
|
Signed-off-by: Iouri Tarassov <iourit@linux.microsoft.com>
|
|
[kms: Forward port to v6.1]
|
|
Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
|
---
|
|
drivers/hv/dxgkrnl/dxgadapter.c | 103 ++++++
|
|
drivers/hv/dxgkrnl/dxgkrnl.h | 38 +++
|
|
drivers/hv/dxgkrnl/dxgprocess.c | 4 +
|
|
drivers/hv/dxgkrnl/dxgvmbus.c | 101 +++++-
|
|
drivers/hv/dxgkrnl/dxgvmbus.h | 18 +
|
|
drivers/hv/dxgkrnl/ioctl.c | 168 +++++++++-
|
|
drivers/hv/dxgkrnl/misc.h | 1 +
|
|
include/uapi/misc/d3dkmthk.h | 47 +++
|
|
8 files changed, 477 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
|
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
|
@@ -206,7 +206,9 @@ struct dxgdevice *dxgdevice_create(struct dxgadapter *adapter,
|
|
device->adapter = adapter;
|
|
device->process = process;
|
|
kref_get(&adapter->adapter_kref);
|
|
+ INIT_LIST_HEAD(&device->context_list_head);
|
|
init_rwsem(&device->device_lock);
|
|
+ init_rwsem(&device->context_list_lock);
|
|
INIT_LIST_HEAD(&device->pqueue_list_head);
|
|
device->object_state = DXGOBJECTSTATE_CREATED;
|
|
device->execution_state = _D3DKMT_DEVICEEXECUTION_ACTIVE;
|
|
@@ -248,6 +250,20 @@ void dxgdevice_destroy(struct dxgdevice *device)
|
|
|
|
dxgdevice_stop(device);
|
|
|
|
+ {
|
|
+ struct dxgcontext *context;
|
|
+ struct dxgcontext *tmp;
|
|
+
|
|
+ DXG_TRACE("destroying contexts");
|
|
+ dxgdevice_acquire_context_list_lock(device);
|
|
+ list_for_each_entry_safe(context, tmp,
|
|
+ &device->context_list_head,
|
|
+ context_list_entry) {
|
|
+ dxgcontext_destroy(process, context);
|
|
+ }
|
|
+ dxgdevice_release_context_list_lock(device);
|
|
+ }
|
|
+
|
|
/* Guest handles need to be released before the host handles */
|
|
hmgrtable_lock(&process->handle_table, DXGLOCK_EXCL);
|
|
if (device->handle_valid) {
|
|
@@ -302,6 +318,32 @@ bool dxgdevice_is_active(struct dxgdevice *device)
|
|
return device->object_state == DXGOBJECTSTATE_ACTIVE;
|
|
}
|
|
|
|
+void dxgdevice_acquire_context_list_lock(struct dxgdevice *device)
|
|
+{
|
|
+ down_write(&device->context_list_lock);
|
|
+}
|
|
+
|
|
+void dxgdevice_release_context_list_lock(struct dxgdevice *device)
|
|
+{
|
|
+ up_write(&device->context_list_lock);
|
|
+}
|
|
+
|
|
+void dxgdevice_add_context(struct dxgdevice *device, struct dxgcontext *context)
|
|
+{
|
|
+ down_write(&device->context_list_lock);
|
|
+ list_add_tail(&context->context_list_entry, &device->context_list_head);
|
|
+ up_write(&device->context_list_lock);
|
|
+}
|
|
+
|
|
+void dxgdevice_remove_context(struct dxgdevice *device,
|
|
+ struct dxgcontext *context)
|
|
+{
|
|
+ if (context->context_list_entry.next) {
|
|
+ list_del(&context->context_list_entry);
|
|
+ context->context_list_entry.next = NULL;
|
|
+ }
|
|
+}
|
|
+
|
|
void dxgdevice_release(struct kref *refcount)
|
|
{
|
|
struct dxgdevice *device;
|
|
@@ -310,6 +352,67 @@ void dxgdevice_release(struct kref *refcount)
|
|
kfree(device);
|
|
}
|
|
|
|
+struct dxgcontext *dxgcontext_create(struct dxgdevice *device)
|
|
+{
|
|
+ struct dxgcontext *context;
|
|
+
|
|
+ context = kzalloc(sizeof(struct dxgcontext), GFP_KERNEL);
|
|
+ if (context) {
|
|
+ kref_init(&context->context_kref);
|
|
+ context->device = device;
|
|
+ context->process = device->process;
|
|
+ context->device_handle = device->handle;
|
|
+ kref_get(&device->device_kref);
|
|
+ INIT_LIST_HEAD(&context->hwqueue_list_head);
|
|
+ init_rwsem(&context->hwqueue_list_lock);
|
|
+ dxgdevice_add_context(device, context);
|
|
+ context->object_state = DXGOBJECTSTATE_ACTIVE;
|
|
+ }
|
|
+ return context;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Called when the device context list lock is held
|
|
+ */
|
|
+void dxgcontext_destroy(struct dxgprocess *process, struct dxgcontext *context)
|
|
+{
|
|
+ DXG_TRACE("Destroying context %p", context);
|
|
+ context->object_state = DXGOBJECTSTATE_DESTROYED;
|
|
+ if (context->device) {
|
|
+ if (context->handle.v) {
|
|
+ hmgrtable_free_handle_safe(&process->handle_table,
|
|
+ HMGRENTRY_TYPE_DXGCONTEXT,
|
|
+ context->handle);
|
|
+ }
|
|
+ dxgdevice_remove_context(context->device, context);
|
|
+ kref_put(&context->device->device_kref, dxgdevice_release);
|
|
+ }
|
|
+ kref_put(&context->context_kref, dxgcontext_release);
|
|
+}
|
|
+
|
|
+void dxgcontext_destroy_safe(struct dxgprocess *process,
|
|
+ struct dxgcontext *context)
|
|
+{
|
|
+ struct dxgdevice *device = context->device;
|
|
+
|
|
+ dxgdevice_acquire_context_list_lock(device);
|
|
+ dxgcontext_destroy(process, context);
|
|
+ dxgdevice_release_context_list_lock(device);
|
|
+}
|
|
+
|
|
+bool dxgcontext_is_active(struct dxgcontext *context)
|
|
+{
|
|
+ return context->object_state == DXGOBJECTSTATE_ACTIVE;
|
|
+}
|
|
+
|
|
+void dxgcontext_release(struct kref *refcount)
|
|
+{
|
|
+ struct dxgcontext *context;
|
|
+
|
|
+ context = container_of(refcount, struct dxgcontext, context_kref);
|
|
+ kfree(context);
|
|
+}
|
|
+
|
|
struct dxgprocess_adapter *dxgprocess_adapter_create(struct dxgprocess *process,
|
|
struct dxgadapter *adapter)
|
|
{
|
|
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
|
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
|
@@ -35,6 +35,7 @@
|
|
struct dxgprocess;
|
|
struct dxgadapter;
|
|
struct dxgdevice;
|
|
+struct dxgcontext;
|
|
|
|
/*
|
|
* Driver private data.
|
|
@@ -298,6 +299,7 @@ void dxgadapter_remove_process(struct dxgprocess_adapter *process_info);
|
|
/*
|
|
* The object represent the device object.
|
|
* The following objects take reference on the device
|
|
+ * - dxgcontext
|
|
* - device handle (struct d3dkmthandle)
|
|
*/
|
|
struct dxgdevice {
|
|
@@ -311,6 +313,8 @@ struct dxgdevice {
|
|
struct kref device_kref;
|
|
/* Protects destcruction of the device object */
|
|
struct rw_semaphore device_lock;
|
|
+ struct rw_semaphore context_list_lock;
|
|
+ struct list_head context_list_head;
|
|
/* List of paging queues. Protected by process handle table lock. */
|
|
struct list_head pqueue_list_head;
|
|
struct d3dkmthandle handle;
|
|
@@ -325,7 +329,33 @@ void dxgdevice_mark_destroyed(struct dxgdevice *device);
|
|
int dxgdevice_acquire_lock_shared(struct dxgdevice *dev);
|
|
void dxgdevice_release_lock_shared(struct dxgdevice *dev);
|
|
void dxgdevice_release(struct kref *refcount);
|
|
+void dxgdevice_add_context(struct dxgdevice *dev, struct dxgcontext *ctx);
|
|
+void dxgdevice_remove_context(struct dxgdevice *dev, struct dxgcontext *ctx);
|
|
bool dxgdevice_is_active(struct dxgdevice *dev);
|
|
+void dxgdevice_acquire_context_list_lock(struct dxgdevice *dev);
|
|
+void dxgdevice_release_context_list_lock(struct dxgdevice *dev);
|
|
+
|
|
+/*
|
|
+ * The object represent the execution context of a device.
|
|
+ */
|
|
+struct dxgcontext {
|
|
+ enum dxgobjectstate object_state;
|
|
+ struct dxgdevice *device;
|
|
+ struct dxgprocess *process;
|
|
+ /* entry in the device context list */
|
|
+ struct list_head context_list_entry;
|
|
+ struct list_head hwqueue_list_head;
|
|
+ struct rw_semaphore hwqueue_list_lock;
|
|
+ struct kref context_kref;
|
|
+ struct d3dkmthandle handle;
|
|
+ struct d3dkmthandle device_handle;
|
|
+};
|
|
+
|
|
+struct dxgcontext *dxgcontext_create(struct dxgdevice *dev);
|
|
+void dxgcontext_destroy(struct dxgprocess *pr, struct dxgcontext *ctx);
|
|
+void dxgcontext_destroy_safe(struct dxgprocess *pr, struct dxgcontext *ctx);
|
|
+void dxgcontext_release(struct kref *refcount);
|
|
+bool dxgcontext_is_active(struct dxgcontext *ctx);
|
|
|
|
long dxgk_compat_ioctl(struct file *f, unsigned int p1, unsigned long p2);
|
|
long dxgk_unlocked_ioctl(struct file *f, unsigned int p1, unsigned long p2);
|
|
@@ -371,6 +401,14 @@ int dxgvmb_send_destroy_device(struct dxgadapter *adapter,
|
|
struct d3dkmthandle h);
|
|
int dxgvmb_send_flush_device(struct dxgdevice *device,
|
|
enum dxgdevice_flushschedulerreason reason);
|
|
+struct d3dkmthandle
|
|
+dxgvmb_send_create_context(struct dxgadapter *adapter,
|
|
+ struct dxgprocess *process,
|
|
+ struct d3dkmt_createcontextvirtual
|
|
+ *args);
|
|
+int dxgvmb_send_destroy_context(struct dxgadapter *adapter,
|
|
+ struct dxgprocess *process,
|
|
+ struct d3dkmthandle h);
|
|
int dxgvmb_send_query_adapter_info(struct dxgprocess *process,
|
|
struct dxgadapter *adapter,
|
|
struct d3dkmt_queryadapterinfo *args);
|
|
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
|
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
|
@@ -257,6 +257,10 @@ struct dxgdevice *dxgprocess_device_by_object_handle(struct dxgprocess *process,
|
|
case HMGRENTRY_TYPE_DXGDEVICE:
|
|
device = obj;
|
|
break;
|
|
+ case HMGRENTRY_TYPE_DXGCONTEXT:
|
|
+ device_handle =
|
|
+ ((struct dxgcontext *)obj)->device_handle;
|
|
+ break;
|
|
default:
|
|
DXG_ERR("invalid handle type: %d", t);
|
|
break;
|
|
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
|
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
|
@@ -731,7 +731,7 @@ int dxgvmb_send_flush_device(struct dxgdevice *device,
|
|
enum dxgdevice_flushschedulerreason reason)
|
|
{
|
|
int ret;
|
|
- struct dxgkvmb_command_flushdevice *command;
|
|
+ struct dxgkvmb_command_flushdevice *command = NULL;
|
|
struct dxgvmbusmsg msg = {.hdr = NULL};
|
|
struct dxgprocess *process = device->process;
|
|
|
|
@@ -745,6 +745,105 @@ int dxgvmb_send_flush_device(struct dxgdevice *device,
|
|
command->device = device->handle;
|
|
command->reason = reason;
|
|
|
|
+ ret = dxgvmb_send_sync_msg_ntstatus(msg.channel, msg.hdr, msg.size);
|
|
+
|
|
+cleanup:
|
|
+ free_message(&msg, process);
|
|
+ if (ret)
|
|
+ DXG_TRACE("err: %d", ret);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+struct d3dkmthandle
|
|
+dxgvmb_send_create_context(struct dxgadapter *adapter,
|
|
+ struct dxgprocess *process,
|
|
+ struct d3dkmt_createcontextvirtual *args)
|
|
+{
|
|
+ struct dxgkvmb_command_createcontextvirtual *command = NULL;
|
|
+ u32 cmd_size;
|
|
+ int ret;
|
|
+ struct d3dkmthandle context = {};
|
|
+ struct dxgvmbusmsg msg = {.hdr = NULL};
|
|
+
|
|
+ if (args->priv_drv_data_size > DXG_MAX_VM_BUS_PACKET_SIZE) {
|
|
+ DXG_ERR("PrivateDriverDataSize is invalid");
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+ cmd_size = sizeof(struct dxgkvmb_command_createcontextvirtual) +
|
|
+ args->priv_drv_data_size - 1;
|
|
+
|
|
+ ret = init_message(&msg, adapter, process, cmd_size);
|
|
+ if (ret)
|
|
+ goto cleanup;
|
|
+ command = (void *)msg.msg;
|
|
+
|
|
+ command_vgpu_to_host_init2(&command->hdr,
|
|
+ DXGK_VMBCOMMAND_CREATECONTEXTVIRTUAL,
|
|
+ process->host_handle);
|
|
+ command->device = args->device;
|
|
+ command->node_ordinal = args->node_ordinal;
|
|
+ command->engine_affinity = args->engine_affinity;
|
|
+ command->flags = args->flags;
|
|
+ command->client_hint = args->client_hint;
|
|
+ command->priv_drv_data_size = args->priv_drv_data_size;
|
|
+ if (args->priv_drv_data_size) {
|
|
+ ret = copy_from_user(command->priv_drv_data,
|
|
+ args->priv_drv_data,
|
|
+ args->priv_drv_data_size);
|
|
+ if (ret) {
|
|
+ DXG_ERR("Faled to copy private data");
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+ }
|
|
+ /* Input command is returned back as output */
|
|
+ ret = dxgvmb_send_sync_msg(msg.channel, msg.hdr, msg.size,
|
|
+ command, cmd_size);
|
|
+ if (ret < 0) {
|
|
+ goto cleanup;
|
|
+ } else {
|
|
+ context = command->context;
|
|
+ if (args->priv_drv_data_size) {
|
|
+ ret = copy_to_user(args->priv_drv_data,
|
|
+ command->priv_drv_data,
|
|
+ args->priv_drv_data_size);
|
|
+ if (ret) {
|
|
+ dev_err(DXGDEV,
|
|
+ "Faled to copy private data to user");
|
|
+ ret = -EINVAL;
|
|
+ dxgvmb_send_destroy_context(adapter, process,
|
|
+ context);
|
|
+ context.v = 0;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+cleanup:
|
|
+ free_message(&msg, process);
|
|
+ if (ret)
|
|
+ DXG_TRACE("err: %d", ret);
|
|
+ return context;
|
|
+}
|
|
+
|
|
+int dxgvmb_send_destroy_context(struct dxgadapter *adapter,
|
|
+ struct dxgprocess *process,
|
|
+ struct d3dkmthandle h)
|
|
+{
|
|
+ int ret;
|
|
+ struct dxgkvmb_command_destroycontext *command;
|
|
+ struct dxgvmbusmsg msg = {.hdr = NULL};
|
|
+
|
|
+ ret = init_message(&msg, adapter, process, sizeof(*command));
|
|
+ if (ret)
|
|
+ goto cleanup;
|
|
+ command = (void *)msg.msg;
|
|
+
|
|
+ command_vgpu_to_host_init2(&command->hdr,
|
|
+ DXGK_VMBCOMMAND_DESTROYCONTEXT,
|
|
+ process->host_handle);
|
|
+ command->context = h;
|
|
+
|
|
ret = dxgvmb_send_sync_msg_ntstatus(msg.channel, msg.hdr, msg.size);
|
|
cleanup:
|
|
free_message(&msg, process);
|
|
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
|
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
|
@@ -269,4 +269,22 @@ struct dxgkvmb_command_flushdevice {
|
|
enum dxgdevice_flushschedulerreason reason;
|
|
};
|
|
|
|
+struct dxgkvmb_command_createcontextvirtual {
|
|
+ struct dxgkvmb_command_vgpu_to_host hdr;
|
|
+ struct d3dkmthandle context;
|
|
+ struct d3dkmthandle device;
|
|
+ u32 node_ordinal;
|
|
+ u32 engine_affinity;
|
|
+ struct d3dddi_createcontextflags flags;
|
|
+ enum d3dkmt_clienthint client_hint;
|
|
+ u32 priv_drv_data_size;
|
|
+ u8 priv_drv_data[1];
|
|
+};
|
|
+
|
|
+/* The command returns ntstatus */
|
|
+struct dxgkvmb_command_destroycontext {
|
|
+ struct dxgkvmb_command_vgpu_to_host hdr;
|
|
+ struct d3dkmthandle context;
|
|
+};
|
|
+
|
|
#endif /* _DXGVMBUS_H */
|
|
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/ioctl.c
|
|
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
|
@@ -550,13 +550,177 @@ dxgkio_destroy_device(struct dxgprocess *process, void *__user inargs)
|
|
return ret;
|
|
}
|
|
|
|
+static int
|
|
+dxgkio_create_context_virtual(struct dxgprocess *process, void *__user inargs)
|
|
+{
|
|
+ struct d3dkmt_createcontextvirtual args;
|
|
+ int ret;
|
|
+ struct dxgadapter *adapter = NULL;
|
|
+ struct dxgdevice *device = NULL;
|
|
+ struct dxgcontext *context = NULL;
|
|
+ struct d3dkmthandle host_context_handle = {};
|
|
+ bool device_lock_acquired = false;
|
|
+
|
|
+ ret = copy_from_user(&args, inargs, sizeof(args));
|
|
+ if (ret) {
|
|
+ DXG_ERR("failed to copy input args");
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * The call acquires reference on the device. It is safe to access the
|
|
+ * adapter, because the device holds reference on it.
|
|
+ */
|
|
+ device = dxgprocess_device_by_handle(process, args.device);
|
|
+ if (device == NULL) {
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ ret = dxgdevice_acquire_lock_shared(device);
|
|
+ if (ret < 0)
|
|
+ goto cleanup;
|
|
+
|
|
+ device_lock_acquired = true;
|
|
+
|
|
+ adapter = device->adapter;
|
|
+ ret = dxgadapter_acquire_lock_shared(adapter);
|
|
+ if (ret < 0) {
|
|
+ adapter = NULL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ context = dxgcontext_create(device);
|
|
+ if (context == NULL) {
|
|
+ ret = -ENOMEM;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ host_context_handle = dxgvmb_send_create_context(adapter,
|
|
+ process, &args);
|
|
+ if (host_context_handle.v) {
|
|
+ hmgrtable_lock(&process->handle_table, DXGLOCK_EXCL);
|
|
+ ret = hmgrtable_assign_handle(&process->handle_table, context,
|
|
+ HMGRENTRY_TYPE_DXGCONTEXT,
|
|
+ host_context_handle);
|
|
+ if (ret >= 0)
|
|
+ context->handle = host_context_handle;
|
|
+ hmgrtable_unlock(&process->handle_table, DXGLOCK_EXCL);
|
|
+ if (ret < 0)
|
|
+ goto cleanup;
|
|
+ ret = copy_to_user(&((struct d3dkmt_createcontextvirtual *)
|
|
+ inargs)->context, &host_context_handle,
|
|
+ sizeof(struct d3dkmthandle));
|
|
+ if (ret) {
|
|
+ DXG_ERR("failed to copy context handle");
|
|
+ ret = -EINVAL;
|
|
+ }
|
|
+ } else {
|
|
+ DXG_ERR("invalid host handle");
|
|
+ ret = -EINVAL;
|
|
+ }
|
|
+
|
|
+cleanup:
|
|
+
|
|
+ if (ret < 0) {
|
|
+ if (host_context_handle.v) {
|
|
+ dxgvmb_send_destroy_context(adapter, process,
|
|
+ host_context_handle);
|
|
+ }
|
|
+ if (context)
|
|
+ dxgcontext_destroy_safe(process, context);
|
|
+ }
|
|
+
|
|
+ if (adapter)
|
|
+ dxgadapter_release_lock_shared(adapter);
|
|
+
|
|
+ if (device) {
|
|
+ if (device_lock_acquired)
|
|
+ dxgdevice_release_lock_shared(device);
|
|
+ kref_put(&device->device_kref, dxgdevice_release);
|
|
+ }
|
|
+
|
|
+ DXG_TRACE("ioctl:%s %d", errorstr(ret), ret);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int
|
|
+dxgkio_destroy_context(struct dxgprocess *process, void *__user inargs)
|
|
+{
|
|
+ struct d3dkmt_destroycontext args;
|
|
+ int ret;
|
|
+ struct dxgadapter *adapter = NULL;
|
|
+ struct dxgcontext *context = NULL;
|
|
+ struct dxgdevice *device = NULL;
|
|
+ struct d3dkmthandle device_handle = {};
|
|
+
|
|
+ ret = copy_from_user(&args, inargs, sizeof(args));
|
|
+ if (ret) {
|
|
+ DXG_ERR("failed to copy input args");
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ hmgrtable_lock(&process->handle_table, DXGLOCK_EXCL);
|
|
+ context = hmgrtable_get_object_by_type(&process->handle_table,
|
|
+ HMGRENTRY_TYPE_DXGCONTEXT,
|
|
+ args.context);
|
|
+ if (context) {
|
|
+ hmgrtable_free_handle(&process->handle_table,
|
|
+ HMGRENTRY_TYPE_DXGCONTEXT, args.context);
|
|
+ context->handle.v = 0;
|
|
+ device_handle = context->device_handle;
|
|
+ context->object_state = DXGOBJECTSTATE_DESTROYED;
|
|
+ }
|
|
+ hmgrtable_unlock(&process->handle_table, DXGLOCK_EXCL);
|
|
+
|
|
+ if (context == NULL) {
|
|
+ DXG_ERR("invalid context handle: %x", args.context.v);
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * The call acquires reference on the device. It is safe to access the
|
|
+ * adapter, because the device holds reference on it.
|
|
+ */
|
|
+ device = dxgprocess_device_by_handle(process, device_handle);
|
|
+ if (device == NULL) {
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ adapter = device->adapter;
|
|
+ ret = dxgadapter_acquire_lock_shared(adapter);
|
|
+ if (ret < 0) {
|
|
+ adapter = NULL;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ ret = dxgvmb_send_destroy_context(adapter, process, args.context);
|
|
+
|
|
+ dxgcontext_destroy_safe(process, context);
|
|
+
|
|
+cleanup:
|
|
+
|
|
+ if (adapter)
|
|
+ dxgadapter_release_lock_shared(adapter);
|
|
+
|
|
+ if (device)
|
|
+ kref_put(&device->device_kref, dxgdevice_release);
|
|
+
|
|
+ DXG_TRACE("ioctl:%s %s %d", errorstr(ret), __func__, ret);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static struct ioctl_desc ioctls[] = {
|
|
/* 0x00 */ {},
|
|
/* 0x01 */ {dxgkio_open_adapter_from_luid, LX_DXOPENADAPTERFROMLUID},
|
|
/* 0x02 */ {dxgkio_create_device, LX_DXCREATEDEVICE},
|
|
/* 0x03 */ {},
|
|
-/* 0x04 */ {},
|
|
-/* 0x05 */ {},
|
|
+/* 0x04 */ {dxgkio_create_context_virtual, LX_DXCREATECONTEXTVIRTUAL},
|
|
+/* 0x05 */ {dxgkio_destroy_context, LX_DXDESTROYCONTEXT},
|
|
/* 0x06 */ {},
|
|
/* 0x07 */ {},
|
|
/* 0x08 */ {},
|
|
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/hv/dxgkrnl/misc.h
|
|
+++ b/drivers/hv/dxgkrnl/misc.h
|
|
@@ -29,6 +29,7 @@ extern const struct d3dkmthandle zerohandle;
|
|
* fd_mutex
|
|
* plistmutex (process list mutex)
|
|
* table_lock (handle table lock)
|
|
+ * context_list_lock
|
|
* core_lock (dxgadapter lock)
|
|
* device_lock (dxgdevice lock)
|
|
* process_adapter_mutex
|
|
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
|
index 111111111111..222222222222 100644
|
|
--- a/include/uapi/misc/d3dkmthk.h
|
|
+++ b/include/uapi/misc/d3dkmthk.h
|
|
@@ -154,6 +154,49 @@ struct d3dkmt_destroydevice {
|
|
struct d3dkmthandle device;
|
|
};
|
|
|
|
+enum d3dkmt_clienthint {
|
|
+ _D3DKMT_CLIENTHNT_UNKNOWN = 0,
|
|
+ _D3DKMT_CLIENTHINT_OPENGL = 1,
|
|
+ _D3DKMT_CLIENTHINT_CDD = 2,
|
|
+ _D3DKMT_CLIENTHINT_DX7 = 7,
|
|
+ _D3DKMT_CLIENTHINT_DX8 = 8,
|
|
+ _D3DKMT_CLIENTHINT_DX9 = 9,
|
|
+ _D3DKMT_CLIENTHINT_DX10 = 10,
|
|
+};
|
|
+
|
|
+struct d3dddi_createcontextflags {
|
|
+ union {
|
|
+ struct {
|
|
+ __u32 null_rendering:1;
|
|
+ __u32 initial_data:1;
|
|
+ __u32 disable_gpu_timeout:1;
|
|
+ __u32 synchronization_only:1;
|
|
+ __u32 hw_queue_supported:1;
|
|
+ __u32 reserved:27;
|
|
+ };
|
|
+ __u32 value;
|
|
+ };
|
|
+};
|
|
+
|
|
+struct d3dkmt_destroycontext {
|
|
+ struct d3dkmthandle context;
|
|
+};
|
|
+
|
|
+struct d3dkmt_createcontextvirtual {
|
|
+ struct d3dkmthandle device;
|
|
+ __u32 node_ordinal;
|
|
+ __u32 engine_affinity;
|
|
+ struct d3dddi_createcontextflags flags;
|
|
+#ifdef __KERNEL__
|
|
+ void *priv_drv_data;
|
|
+#else
|
|
+ __u64 priv_drv_data;
|
|
+#endif
|
|
+ __u32 priv_drv_data_size;
|
|
+ enum d3dkmt_clienthint client_hint;
|
|
+ struct d3dkmthandle context;
|
|
+};
|
|
+
|
|
struct d3dkmt_adaptertype {
|
|
union {
|
|
struct {
|
|
@@ -232,6 +275,10 @@ struct d3dkmt_enumadapters3 {
|
|
_IOWR(0x47, 0x01, struct d3dkmt_openadapterfromluid)
|
|
#define LX_DXCREATEDEVICE \
|
|
_IOWR(0x47, 0x02, struct d3dkmt_createdevice)
|
|
+#define LX_DXCREATECONTEXTVIRTUAL \
|
|
+ _IOWR(0x47, 0x04, struct d3dkmt_createcontextvirtual)
|
|
+#define LX_DXDESTROYCONTEXT \
|
|
+ _IOWR(0x47, 0x05, struct d3dkmt_destroycontext)
|
|
#define LX_DXQUERYADAPTERINFO \
|
|
_IOWR(0x47, 0x09, struct d3dkmt_queryadapterinfo)
|
|
#define LX_DXENUMADAPTERS2 \
|
|
--
|
|
Armbian
|
|
|