mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
wsl2-arm64/edge: rewrite-kernel-patches, no changes
This commit is contained in:
@@ -23,7 +23,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
4 files changed, 91 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/hyperv/Makefile b/arch/arm64/hyperv/Makefile
|
||||
index 87c31c001da9..4cbeaa36d189 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/hyperv/Makefile
|
||||
+++ b/arch/arm64/hyperv/Makefile
|
||||
@@ -1,2 +1,2 @@
|
||||
@@ -31,7 +31,7 @@ index 87c31c001da9..4cbeaa36d189 100644
|
||||
-obj-y := hv_core.o mshyperv.o
|
||||
+obj-y := hv_core.o mshyperv.o hv_hvc.o
|
||||
diff --git a/arch/arm64/hyperv/hv_core.c b/arch/arm64/hyperv/hv_core.c
|
||||
index b54c34793701..e7010b2a587c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/hyperv/hv_core.c
|
||||
+++ b/arch/arm64/hyperv/hv_core.c
|
||||
@@ -23,16 +23,13 @@
|
||||
@@ -154,7 +154,7 @@ index b54c34793701..e7010b2a587c 100644
|
||||
|
||||
diff --git a/arch/arm64/hyperv/hv_hvc.S b/arch/arm64/hyperv/hv_hvc.S
|
||||
new file mode 100644
|
||||
index 000000000000..c22d34ccd0aa
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/hyperv/hv_hvc.S
|
||||
@@ -0,0 +1,61 @@
|
||||
@@ -220,7 +220,7 @@ index 000000000000..c22d34ccd0aa
|
||||
+ ret
|
||||
+SYM_FUNC_END(hv_do_hvc_fast_get)
|
||||
diff --git a/arch/arm64/include/asm/mshyperv.h b/arch/arm64/include/asm/mshyperv.h
|
||||
index 20070a847304..f87a450e5b6b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/include/asm/mshyperv.h
|
||||
+++ b/arch/arm64/include/asm/mshyperv.h
|
||||
@@ -22,6 +22,10 @@
|
||||
|
||||
@@ -14,10 +14,10 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
|
||||
index 2b00faf98017..caf62f602cf8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/linux/hyperv.h
|
||||
+++ b/include/linux/hyperv.h
|
||||
@@ -1451,6 +1451,22 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size);
|
||||
@@ -1472,6 +1472,22 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size);
|
||||
.guid = GUID_INIT(0xda0a7802, 0xe377, 0x4aac, 0x8e, 0x77, \
|
||||
0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8)
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
10 files changed, 840 insertions(+)
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index dd5de540ec0b..67a87715c001 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -9771,6 +9771,13 @@ F: Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml
|
||||
@@ -67,10 +67,10 @@ index dd5de540ec0b..67a87715c001 100644
|
||||
L: linuxppc-dev@lists.ozlabs.org
|
||||
S: Odd Fixes
|
||||
diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
|
||||
index 00242107d62e..51cce0cc9d5c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/Kconfig
|
||||
+++ b/drivers/hv/Kconfig
|
||||
@@ -54,4 +54,6 @@ config HYPERV_BALLOON
|
||||
@@ -55,4 +55,6 @@ config HYPERV_BALLOON
|
||||
help
|
||||
Select this option to enable Hyper-V Balloon driver.
|
||||
|
||||
@@ -78,7 +78,7 @@ index 00242107d62e..51cce0cc9d5c 100644
|
||||
+
|
||||
endmenu
|
||||
diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile
|
||||
index d76df5c8c2a9..aa1cbdb5d0d2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/Makefile
|
||||
+++ b/drivers/hv/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
@@ -91,7 +91,7 @@ index d76df5c8c2a9..aa1cbdb5d0d2 100644
|
||||
CFLAGS_hv_balloon.o = -I$(src)
|
||||
diff --git a/drivers/hv/dxgkrnl/Kconfig b/drivers/hv/dxgkrnl/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..bcd92bbff939
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/Kconfig
|
||||
@@ -0,0 +1,26 @@
|
||||
@@ -123,7 +123,7 @@ index 000000000000..bcd92bbff939
|
||||
+ communicates with the host using Hyper-V VM bus communication channels.
|
||||
diff --git a/drivers/hv/dxgkrnl/Makefile b/drivers/hv/dxgkrnl/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..76349064b60a
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/Makefile
|
||||
@@ -0,0 +1,5 @@
|
||||
@@ -134,7 +134,7 @@ index 000000000000..76349064b60a
|
||||
+dxgkrnl-y := dxgmodule.o dxgvmbus.o
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
new file mode 100644
|
||||
index 000000000000..f7900840d1ed
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -0,0 +1,155 @@
|
||||
@@ -295,7 +295,7 @@ index 000000000000..f7900840d1ed
|
||||
+#endif
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
new file mode 100644
|
||||
index 000000000000..de02edc4d023
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -0,0 +1,506 @@
|
||||
@@ -807,7 +807,7 @@ index 000000000000..de02edc4d023
|
||||
+MODULE_DESCRIPTION("Microsoft Dxgkrnl virtual compute device Driver");
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
new file mode 100644
|
||||
index 000000000000..deb880e34377
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -0,0 +1,92 @@
|
||||
@@ -905,7 +905,7 @@ index 000000000000..deb880e34377
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
new file mode 100644
|
||||
index 000000000000..6cdca5e03d1f
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -0,0 +1,19 @@
|
||||
@@ -930,7 +930,7 @@ index 000000000000..6cdca5e03d1f
|
||||
+#endif /* _DXGVMBUS_H */
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
new file mode 100644
|
||||
index 000000000000..5d973604400c
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -0,0 +1,27 @@
|
||||
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
7 files changed, 536 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index f7900840d1ed..52b9e82c51e6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -28,6 +28,8 @@
|
||||
@@ -63,7 +63,7 @@ index f7900840d1ed..52b9e82c51e6 100644
|
||||
|
||||
void dxgk_validate_ioctls(void);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index de02edc4d023..e55639dc0adc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -260,6 +260,13 @@ int dxgglobal_init_global_channel(void)
|
||||
@@ -90,7 +90,7 @@ index de02edc4d023..e55639dc0adc 100644
|
||||
pci_unregister_driver(&dxgdrv.pci_drv);
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index deb880e34377..a4365739826a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -40,6 +40,121 @@ struct dxgvmbuspacket {
|
||||
@@ -427,7 +427,7 @@ index deb880e34377..a4365739826a 100644
|
||||
+ return ret;
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 6cdca5e03d1f..b1bdd6039b73 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -16,4 +16,71 @@
|
||||
@@ -504,7 +504,7 @@ index 6cdca5e03d1f..b1bdd6039b73 100644
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
new file mode 100644
|
||||
index 000000000000..23ecd15b0cd7
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -0,0 +1,24 @@
|
||||
@@ -534,7 +534,7 @@ index 000000000000..23ecd15b0cd7
|
||||
+#define pr_fmt(fmt) "dxgk: " fmt
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
new file mode 100644
|
||||
index 000000000000..4c6047c32a20
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -0,0 +1,72 @@
|
||||
@@ -611,7 +611,7 @@ index 000000000000..4c6047c32a20
|
||||
+
|
||||
+#endif /* _MISC_H_ */
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 5d973604400c..2ea04cc02a1f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -14,6 +14,40 @@
|
||||
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 844 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/Makefile b/drivers/hv/dxgkrnl/Makefile
|
||||
index 76349064b60a..2ed07d877c91 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/Makefile
|
||||
+++ b/drivers/hv/dxgkrnl/Makefile
|
||||
@@ -2,4 +2,4 @@
|
||||
@@ -53,7 +53,7 @@ index 76349064b60a..2ed07d877c91 100644
|
||||
+dxgkrnl-y := dxgmodule.o misc.o dxgadapter.o ioctl.o dxgvmbus.o
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
new file mode 100644
|
||||
index 000000000000..07d47699d255
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -0,0 +1,170 @@
|
||||
@@ -228,7 +228,7 @@ index 000000000000..07d47699d255
|
||||
+ up_read(&adapter->core_lock);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 52b9e82c51e6..ba2a7c6001aa 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -47,9 +47,39 @@ extern struct dxgdriver dxgdrv;
|
||||
@@ -355,7 +355,7 @@ index 52b9e82c51e6..ba2a7c6001aa 100644
|
||||
int ntstatus2int(struct ntstatus status);
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index e55639dc0adc..ef80b920f010 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -55,6 +55,156 @@ void dxgglobal_release_channel_lock(void)
|
||||
@@ -626,7 +626,7 @@ index e55639dc0adc..ef80b920f010 100644
|
||||
mutex_unlock(&dxgglobal->device_mutex);
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index a4365739826a..6d4b8d9d8d07 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -77,7 +77,7 @@ struct dxgvmbusmsgres {
|
||||
@@ -919,7 +919,7 @@ index a4365739826a..6d4b8d9d8d07 100644
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index b1bdd6039b73..584cdd3db6c0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -47,6 +47,83 @@ enum dxgkvmb_commandtype_global {
|
||||
@@ -1071,7 +1071,7 @@ index b1bdd6039b73..584cdd3db6c0 100644
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.c b/drivers/hv/dxgkrnl/misc.c
|
||||
new file mode 100644
|
||||
index 000000000000..cb1e0635bebc
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/misc.c
|
||||
@@ -0,0 +1,37 @@
|
||||
@@ -1113,7 +1113,7 @@ index 000000000000..cb1e0635bebc
|
||||
+ return dest;
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index 4c6047c32a20..d292e9a9bb7f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.h
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -14,18 +14,34 @@
|
||||
|
||||
@@ -47,7 +47,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
12 files changed, 1569 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/Makefile b/drivers/hv/dxgkrnl/Makefile
|
||||
index 2ed07d877c91..9d821e83448a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/Makefile
|
||||
+++ b/drivers/hv/dxgkrnl/Makefile
|
||||
@@ -2,4 +2,4 @@
|
||||
@@ -57,7 +57,7 @@ index 2ed07d877c91..9d821e83448a 100644
|
||||
-dxgkrnl-y := dxgmodule.o misc.o dxgadapter.o ioctl.o dxgvmbus.o
|
||||
+dxgkrnl-y := dxgmodule.o hmgr.o misc.o dxgadapter.o ioctl.o dxgvmbus.o dxgprocess.o
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 07d47699d255..fa0d6beca157 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -100,6 +100,7 @@ void dxgadapter_start(struct dxgadapter *adapter)
|
||||
@@ -158,7 +158,7 @@ index 07d47699d255..fa0d6beca157 100644
|
||||
+ dxgprocess_adapter_destroy(adapter_info);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index ba2a7c6001aa..b089d126f801 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -29,8 +29,10 @@
|
||||
@@ -317,7 +317,7 @@ index ba2a7c6001aa..b089d126f801 100644
|
||||
void *command,
|
||||
u32 cmd_size);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index ef80b920f010..17c22001ca6c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -123,6 +123,20 @@ static struct dxgadapter *find_adapter(struct winluid *luid)
|
||||
@@ -450,7 +450,7 @@ index ef80b920f010..17c22001ca6c 100644
|
||||
INIT_LIST_HEAD(&dxgglobal->adapter_list_head);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
new file mode 100644
|
||||
index 000000000000..ab9a01e3c8c8
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -0,0 +1,262 @@
|
||||
@@ -717,7 +717,7 @@ index 000000000000..ab9a01e3c8c8
|
||||
+ hmgrtable_unlock(&process->handle_table, DXGLOCK_EXCL);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 6d4b8d9d8d07..0abf45d0d3f7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -497,6 +497,87 @@ int dxgvmb_send_set_iospace_region(u64 start, u64 len)
|
||||
@@ -896,7 +896,7 @@ index 6d4b8d9d8d07..0abf45d0d3f7 100644
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 584cdd3db6c0..a805a396e083 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -14,7 +14,11 @@
|
||||
@@ -957,7 +957,7 @@ index 584cdd3db6c0..a805a396e083 100644
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/hmgr.c b/drivers/hv/dxgkrnl/hmgr.c
|
||||
new file mode 100644
|
||||
index 000000000000..526b50f46d96
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/hmgr.c
|
||||
@@ -0,0 +1,563 @@
|
||||
@@ -1526,7 +1526,7 @@ index 000000000000..526b50f46d96
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/hmgr.h b/drivers/hv/dxgkrnl/hmgr.h
|
||||
new file mode 100644
|
||||
index 000000000000..23eec301137f
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/hmgr.h
|
||||
@@ -0,0 +1,112 @@
|
||||
@@ -1643,7 +1643,7 @@ index 000000000000..23eec301137f
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 23ecd15b0cd7..60e38d104517 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -22,3 +22,63 @@
|
||||
@@ -1711,7 +1711,7 @@ index 23ecd15b0cd7..60e38d104517 100644
|
||||
+ return dxgk_ioctl(f, p1, p2);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index d292e9a9bb7f..dc849a8ed3f2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.h
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -27,10 +27,11 @@ extern const struct d3dkmthandle zerohandle;
|
||||
@@ -1731,7 +1731,7 @@ index d292e9a9bb7f..dc849a8ed3f2 100644
|
||||
* device_mutex (dxgglobal mutex)
|
||||
*/
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 2ea04cc02a1f..c675d5827ed5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -58,4 +58,107 @@ struct winluid {
|
||||
|
||||
@@ -38,7 +38,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
2 files changed, 484 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 17c22001ca6c..fbe1c58ecb46 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -721,6 +721,9 @@ static struct dxgglobal *dxgglobal_create(void)
|
||||
@@ -52,7 +52,7 @@ index 17c22001ca6c..fbe1c58ecb46 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 60e38d104517..b08ea9430093 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -29,8 +29,472 @@ struct ioctl_desc {
|
||||
|
||||
@@ -27,7 +27,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 604 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index fa0d6beca157..a9a341716eba 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -194,6 +194,122 @@ void dxgadapter_release_lock_shared(struct dxgadapter *adapter)
|
||||
@@ -247,7 +247,7 @@ index fa0d6beca157..a9a341716eba 100644
|
||||
+ mutex_unlock(&device->adapter_info->device_list_mutex);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index b089d126f801..45ac1f25cc5e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -34,6 +34,7 @@
|
||||
@@ -365,7 +365,7 @@ index b089d126f801..45ac1f25cc5e 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index ab9a01e3c8c8..8373f681e822 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -241,6 +241,49 @@ struct dxgadapter *dxgprocess_adapter_by_handle(struct dxgprocess *process,
|
||||
@@ -419,7 +419,7 @@ index ab9a01e3c8c8..8373f681e822 100644
|
||||
{
|
||||
hmgrtable_lock(&process->handle_table, DXGLOCK_SHARED);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 0abf45d0d3f7..73804d11ec49 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -673,6 +673,86 @@ int dxgvmb_send_get_internal_adapter_info(struct dxgadapter *adapter)
|
||||
@@ -510,7 +510,7 @@ index 0abf45d0d3f7..73804d11ec49 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index a805a396e083..4ccf45765954 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -247,4 +247,26 @@ struct dxgkvmb_command_queryadapterinfo_return {
|
||||
@@ -541,7 +541,7 @@ index a805a396e083..4ccf45765954 100644
|
||||
+
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index b08ea9430093..405e8b92913e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -424,10 +424,136 @@ dxgkio_query_adapter_info(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -692,7 +692,7 @@ index b08ea9430093..405e8b92913e 100644
|
||||
/* 0x1b */ {},
|
||||
/* 0x1c */ {},
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index dc849a8ed3f2..e0bd33b365b0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.h
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -27,10 +27,10 @@ extern const struct d3dkmthandle zerohandle;
|
||||
@@ -711,7 +711,7 @@ index dc849a8ed3f2..e0bd33b365b0 100644
|
||||
* adapter_list_lock
|
||||
* device_mutex (dxgglobal mutex)
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index c675d5827ed5..7414f0f5ce8e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -86,6 +86,74 @@ struct d3dkmt_openadapterfromluid {
|
||||
|
||||
@@ -28,7 +28,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 477 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index a9a341716eba..cd103e092ac2 100644
|
||||
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,
|
||||
@@ -164,7 +164,7 @@ index a9a341716eba..cd103e092ac2 100644
|
||||
struct dxgadapter *adapter)
|
||||
{
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 45ac1f25cc5e..a3d8d3c9f37d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -35,6 +35,7 @@
|
||||
@@ -242,7 +242,7 @@ index 45ac1f25cc5e..a3d8d3c9f37d 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index 8373f681e822..ca307beb9a9a 100644
|
||||
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,
|
||||
@@ -257,7 +257,7 @@ index 8373f681e822..ca307beb9a9a 100644
|
||||
DXG_ERR("invalid handle type: %d", t);
|
||||
break;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 73804d11ec49..e66aac7c13cb 100644
|
||||
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,
|
||||
@@ -376,7 +376,7 @@ index 73804d11ec49..e66aac7c13cb 100644
|
||||
cleanup:
|
||||
free_message(&msg, process);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 4ccf45765954..ebcb7b0f62c1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -269,4 +269,22 @@ struct dxgkvmb_command_flushdevice {
|
||||
@@ -403,7 +403,7 @@ index 4ccf45765954..ebcb7b0f62c1 100644
|
||||
+
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 405e8b92913e..5d10ebd2ce6a 100644
|
||||
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)
|
||||
@@ -587,7 +587,7 @@ index 405e8b92913e..5d10ebd2ce6a 100644
|
||||
/* 0x07 */ {},
|
||||
/* 0x08 */ {},
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index e0bd33b365b0..3a9637f0b5e2 100644
|
||||
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;
|
||||
@@ -599,7 +599,7 @@ index e0bd33b365b0..3a9637f0b5e2 100644
|
||||
* device_lock (dxgdevice lock)
|
||||
* process_adapter_mutex
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 7414f0f5ce8e..4ba0070b061f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -154,6 +154,49 @@ struct d3dkmt_destroydevice {
|
||||
|
||||
@@ -43,7 +43,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 2004 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index cd103e092ac2..402caa81a5db 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -207,8 +207,11 @@ struct dxgdevice *dxgdevice_create(struct dxgadapter *adapter,
|
||||
@@ -373,7 +373,7 @@ index cd103e092ac2..402caa81a5db 100644
|
||||
struct dxgadapter *adapter)
|
||||
{
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index a3d8d3c9f37d..fa053fb6ac9c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -36,6 +36,8 @@ struct dxgprocess;
|
||||
@@ -538,7 +538,7 @@ index a3d8d3c9f37d..fa053fb6ac9c 100644
|
||||
void *command,
|
||||
u32 cmd_size);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index fbe1c58ecb46..053ce6f3e083 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -162,6 +162,7 @@ int dxgglobal_create_adapter(struct pci_dev *dev, guid_t *guid,
|
||||
@@ -550,7 +550,7 @@ index fbe1c58ecb46..053ce6f3e083 100644
|
||||
guid_to_luid(guid, &adapter->luid);
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index e66aac7c13cb..14b51a3c6afc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -111,6 +111,41 @@ static int init_message(struct dxgvmbusmsg *msg, struct dxgadapter *adapter,
|
||||
@@ -1217,7 +1217,7 @@ index e66aac7c13cb..14b51a3c6afc 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index ebcb7b0f62c1..4b7466d1b9f2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -173,6 +173,14 @@ struct dxgkvmb_command_setiospaceregion {
|
||||
@@ -1358,7 +1358,7 @@ index ebcb7b0f62c1..4b7466d1b9f2 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmthandle context;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 5d10ebd2ce6a..0eaa577d7ed4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -714,6 +714,633 @@ dxgkio_destroy_context(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -2014,7 +2014,7 @@ index 5d10ebd2ce6a..0eaa577d7ed4 100644
|
||||
/* 0x15 */ {dxgkio_close_adapter, LX_DXCLOSEADAPTER},
|
||||
/* 0x16 */ {},
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index 3a9637f0b5e2..a51b29a6a68f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.h
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -30,6 +30,9 @@ extern const struct d3dkmthandle zerohandle;
|
||||
@@ -2028,7 +2028,7 @@ index 3a9637f0b5e2..a51b29a6a68f 100644
|
||||
* device_lock (dxgdevice lock)
|
||||
* process_adapter_mutex
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 4ba0070b061f..cf670b9c4dc2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -58,6 +58,7 @@ struct winluid {
|
||||
|
||||
@@ -43,7 +43,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 729 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 402caa81a5db..d2f2b96527e6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -160,6 +160,24 @@ void dxgadapter_remove_process(struct dxgprocess_adapter *process_info)
|
||||
@@ -277,7 +277,7 @@ index 402caa81a5db..d2f2b96527e6 100644
|
||||
+ kfree(syncobj);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index fa053fb6ac9c..1b9410c9152b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -38,6 +38,7 @@ struct dxgdevice;
|
||||
@@ -424,7 +424,7 @@ index fa053fb6ac9c..1b9410c9152b 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 053ce6f3e083..9bc8931c5043 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -162,6 +162,7 @@ int dxgglobal_create_adapter(struct pci_dev *dev, guid_t *guid,
|
||||
@@ -436,7 +436,7 @@ index 053ce6f3e083..9bc8931c5043 100644
|
||||
adapter->pci_dev = dev;
|
||||
guid_to_luid(guid, &adapter->luid);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index ca307beb9a9a..a41985ef438d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -59,6 +59,7 @@ void dxgprocess_destroy(struct dxgprocess *process)
|
||||
@@ -470,7 +470,7 @@ index ca307beb9a9a..a41985ef438d 100644
|
||||
hmgrtable_destroy(&process->local_handle_table);
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 14b51a3c6afc..d323afc85249 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -495,6 +495,88 @@ dxgvmb_send_sync_msg_ntstatus(struct dxgvmbuschannel *channel,
|
||||
@@ -708,7 +708,7 @@ index 14b51a3c6afc..d323afc85249 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 4b7466d1b9f2..bbf5f31cdf81 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -410,4 +410,24 @@ struct dxgkvmb_command_destroycontext {
|
||||
@@ -737,7 +737,7 @@ index 4b7466d1b9f2..bbf5f31cdf81 100644
|
||||
+
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 0eaa577d7ed4..4bba1e209f33 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -1341,6 +1341,132 @@ dxgkio_destroy_allocation(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -892,7 +892,7 @@ index 0eaa577d7ed4..4bba1e209f33 100644
|
||||
/* 0x1f */ {},
|
||||
/* 0x20 */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index cf670b9c4dc2..4e1069f41d76 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -256,6 +256,97 @@ enum d3dkmdt_standardallocationtype {
|
||||
|
||||
@@ -48,7 +48,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 1311 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index d2f2b96527e6..04d827a15c54 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -249,7 +249,7 @@ void dxgdevice_stop(struct dxgdevice *device)
|
||||
@@ -155,7 +155,7 @@ index d2f2b96527e6..04d827a15c54 100644
|
||||
kfree(syncobj);
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 1b9410c9152b..8431523f42de 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -101,6 +101,29 @@ int dxgvmbuschannel_init(struct dxgvmbuschannel *ch, struct hv_device *hdev);
|
||||
@@ -270,7 +270,7 @@ index 1b9410c9152b..8431523f42de 100644
|
||||
|
||||
#ifdef DEBUG
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 9bc8931c5043..5a5ca8791d27 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -123,6 +123,102 @@ static struct dxgadapter *find_adapter(struct winluid *luid)
|
||||
@@ -395,7 +395,7 @@ index 9bc8931c5043..5a5ca8791d27 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index d323afc85249..6b2dea24a509 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -281,6 +281,22 @@ static void command_vm_to_host_init1(struct dxgkvmb_command_vm_to_host *command,
|
||||
@@ -646,7 +646,7 @@ index d323afc85249..6b2dea24a509 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index bbf5f31cdf81..89fecbcefbc8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -165,6 +165,13 @@ struct dxgkvmb_command_host_to_vm {
|
||||
@@ -710,7 +710,7 @@ index bbf5f31cdf81..89fecbcefbc8 100644
|
||||
+
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 4bba1e209f33..0025e1ee2d4d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -759,7 +759,7 @@ get_standard_alloc_priv_data(struct dxgdevice *device,
|
||||
@@ -1481,7 +1481,7 @@ index 4bba1e209f33..0025e1ee2d4d 100644
|
||||
/* 0x3d */ {},
|
||||
/* 0x3e */ {dxgkio_enum_adapters3, LX_DXENUMADAPTERS3},
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index a51b29a6a68f..ee2ebfdd1c13 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.h
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -25,6 +25,8 @@ extern const struct d3dkmthandle zerohandle;
|
||||
@@ -1494,7 +1494,7 @@ index a51b29a6a68f..ee2ebfdd1c13 100644
|
||||
* fd_mutex
|
||||
* plistmutex (process list mutex)
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 4e1069f41d76..39055b0c1069 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -60,6 +60,9 @@ struct winluid {
|
||||
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
7 files changed, 1200 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 04d827a15c54..26fce9aba4f3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -160,6 +160,17 @@ void dxgadapter_remove_process(struct dxgprocess_adapter *process_info)
|
||||
@@ -155,7 +155,7 @@ index 04d827a15c54..26fce9aba4f3 100644
|
||||
kref_put(&resource->resource_kref, dxgresource_release);
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 8431523f42de..0336e1843223 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -38,6 +38,7 @@ struct dxgdevice;
|
||||
@@ -278,7 +278,7 @@ index 8431523f42de..0336e1843223 100644
|
||||
enum d3dkmdt_standardallocationtype t,
|
||||
struct d3dkmdt_gdisurfacedata *data,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 5a5ca8791d27..69e221613af9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -258,6 +258,7 @@ int dxgglobal_create_adapter(struct pci_dev *dev, guid_t *guid,
|
||||
@@ -290,7 +290,7 @@ index 5a5ca8791d27..69e221613af9 100644
|
||||
init_rwsem(&adapter->shared_resource_list_lock);
|
||||
adapter->pci_dev = dev;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 6b2dea24a509..b3a4377c8b0b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -712,6 +712,79 @@ int dxgvmb_send_destroy_process(struct d3dkmthandle process)
|
||||
@@ -435,7 +435,7 @@ index 6b2dea24a509..b3a4377c8b0b 100644
|
||||
enum d3dkmdt_standardallocationtype alloctype,
|
||||
struct d3dkmdt_gdisurfacedata *alloc_data,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 89fecbcefbc8..73d7adac60a1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -172,6 +172,21 @@ struct dxgkvmb_command_signalguestevent {
|
||||
@@ -483,7 +483,7 @@ index 89fecbcefbc8..73d7adac60a1 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
enum d3dkmdt_standardallocationtype alloc_type;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 0025e1ee2d4d..abb64f6c3a59 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -36,8 +36,35 @@ static char *errorstr(int ret)
|
||||
@@ -1347,7 +1347,7 @@ index 0025e1ee2d4d..abb64f6c3a59 100644
|
||||
/* 0x44 */ {},
|
||||
/* 0x45 */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 39055b0c1069..f74564cf7ee9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -682,6 +682,94 @@ enum d3dkmt_deviceexecution_state {
|
||||
|
||||
@@ -32,7 +32,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 1181 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 26fce9aba4f3..f59173f13559 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -171,6 +171,26 @@ void dxgadapter_remove_shared_resource(struct dxgadapter *adapter,
|
||||
@@ -267,7 +267,7 @@ index 26fce9aba4f3..f59173f13559 100644
|
||||
+ kfree(hwqueue);
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 0336e1843223..0330352b9c06 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -40,6 +40,8 @@ struct dxgallocation;
|
||||
@@ -435,7 +435,7 @@ index 0336e1843223..0330352b9c06 100644
|
||||
struct d3dkmthandle object,
|
||||
struct d3dkmthandle *shared_handle);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 69e221613af9..8cbe1095599f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -259,6 +259,7 @@ int dxgglobal_create_adapter(struct pci_dev *dev, guid_t *guid,
|
||||
@@ -447,7 +447,7 @@ index 69e221613af9..8cbe1095599f 100644
|
||||
init_rwsem(&adapter->shared_resource_list_lock);
|
||||
adapter->pci_dev = dev;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index a41985ef438d..4021084ebd78 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -277,6 +277,10 @@ struct dxgdevice *dxgprocess_device_by_object_handle(struct dxgprocess *process,
|
||||
@@ -462,7 +462,7 @@ index a41985ef438d..4021084ebd78 100644
|
||||
DXG_ERR("invalid handle type: %d", t);
|
||||
break;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index b3a4377c8b0b..e83600945de1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -712,6 +712,69 @@ int dxgvmb_send_destroy_process(struct d3dkmthandle process)
|
||||
@@ -701,7 +701,7 @@ index b3a4377c8b0b..e83600945de1 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryadapterinfo *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 73d7adac60a1..2e2fd1ae5ec2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -172,6 +172,21 @@ struct dxgkvmb_command_signalguestevent {
|
||||
@@ -752,7 +752,7 @@ index 73d7adac60a1..2e2fd1ae5ec2 100644
|
||||
+
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index abb64f6c3a59..3cfc1c40e0bb 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -36,6 +36,33 @@ static char *errorstr(int ret)
|
||||
@@ -1426,7 +1426,7 @@ index abb64f6c3a59..3cfc1c40e0bb 100644
|
||||
LX_DXQUERYRESOURCEINFOFROMNTHANDLE},
|
||||
/* 0x42 */ {dxgkio_open_resource_nt, LX_DXOPENRESOURCEFROMNTHANDLE},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index f74564cf7ee9..a78252901c8d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -201,6 +201,16 @@ struct d3dkmt_createcontextvirtual {
|
||||
|
||||
@@ -30,7 +30,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
7 files changed, 418 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index f59173f13559..410f08768bad 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -278,6 +278,7 @@ struct dxgdevice *dxgdevice_create(struct dxgadapter *adapter,
|
||||
@@ -158,7 +158,7 @@ index f59173f13559..410f08768bad 100644
|
||||
struct dxgadapter *adapter)
|
||||
{
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 0330352b9c06..440d1f9b8882 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -104,6 +104,16 @@ int dxgvmbuschannel_init(struct dxgvmbuschannel *ch, struct hv_device *hdev);
|
||||
@@ -214,7 +214,7 @@ index 0330352b9c06..440d1f9b8882 100644
|
||||
struct d3dkmt_createallocation *args,
|
||||
struct d3dkmt_createallocation *__user inargs,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index 4021084ebd78..5de3f8ccb448 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -277,6 +277,10 @@ struct dxgdevice *dxgprocess_device_by_object_handle(struct dxgprocess *process,
|
||||
@@ -229,7 +229,7 @@ index 4021084ebd78..5de3f8ccb448 100644
|
||||
device_handle =
|
||||
((struct dxghwqueue *)obj)->device_handle;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index e83600945de1..c9c00b288ae0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1155,6 +1155,80 @@ int dxgvmb_send_destroy_context(struct dxgadapter *adapter,
|
||||
@@ -314,7 +314,7 @@ index e83600945de1..c9c00b288ae0 100644
|
||||
copy_private_data(struct d3dkmt_createallocation *args,
|
||||
struct dxgkvmb_command_createallocation *command,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 2e2fd1ae5ec2..aba075d374c9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -462,6 +462,23 @@ struct dxgkvmb_command_destroycontext {
|
||||
@@ -342,7 +342,7 @@ index 2e2fd1ae5ec2..aba075d374c9 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmt_createsynchronizationobject2 args;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 3cfc1c40e0bb..a2d236f5eff5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -329,7 +329,7 @@ static int dxgsharedresource_seal(struct dxgsharedresource *shared_resource)
|
||||
@@ -584,7 +584,7 @@ index 3cfc1c40e0bb..a2d236f5eff5 100644
|
||||
/* 0x1e */ {},
|
||||
/* 0x1f */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index a78252901c8d..6ec70852de6e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -211,6 +211,29 @@ struct d3dddi_createhwqueueflags {
|
||||
|
||||
@@ -27,7 +27,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 316 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 440d1f9b8882..ab97bc53b124 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -796,6 +796,9 @@ int dxgvmb_send_create_allocation(struct dxgprocess *pr, struct dxgdevice *dev,
|
||||
@@ -51,7 +51,7 @@ index 440d1f9b8882..ab97bc53b124 100644
|
||||
struct dxgvmbuschannel *channel,
|
||||
struct d3dkmt_opensyncobjectfromnthandle2
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index c9c00b288ae0..7cb04fec217e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1901,6 +1901,61 @@ int dxgvmb_send_get_stdalloc_data(struct dxgdevice *device,
|
||||
@@ -179,7 +179,7 @@ index c9c00b288ae0..7cb04fec217e 100644
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index aba075d374c9..acfdbde09e82 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -314,6 +314,20 @@ struct dxgkvmb_command_flushdevice {
|
||||
@@ -204,7 +204,7 @@ index aba075d374c9..acfdbde09e82 100644
|
||||
u32 flags;
|
||||
u32 priv_drv_data_size;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index a2d236f5eff5..9128694c8e78 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -1902,6 +1902,129 @@ dxgkio_destroy_allocation(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -356,7 +356,7 @@ index a2d236f5eff5..9128694c8e78 100644
|
||||
LX_DXSUBMITSIGNALSYNCOBJECTSTOHWQUEUE},
|
||||
/* 0x36 */ {dxgkio_submit_wait_to_hwqueue,
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 6ec70852de6e..9238115d165d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -58,6 +58,8 @@ struct winluid {
|
||||
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 120 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index ab97bc53b124..a39d11d76e41 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -872,6 +872,8 @@ int dxgvmb_send_get_stdalloc_data(struct dxgdevice *device,
|
||||
@@ -39,7 +39,7 @@ index ab97bc53b124..a39d11d76e41 100644
|
||||
void signal_host_cpu_event(struct dxghostevent *eventhdr);
|
||||
int ntstatus2int(struct ntstatus status);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 7cb04fec217e..67a16de622e0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -881,6 +881,50 @@ int dxgvmb_send_destroy_sync_object(struct dxgprocess *process,
|
||||
@@ -143,7 +143,7 @@ index 7cb04fec217e..67a16de622e0 100644
|
||||
|
||||
cleanup:
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index acfdbde09e82..c1f693917d99 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -574,4 +574,22 @@ struct dxgkvmb_command_destroyhwqueue {
|
||||
@@ -170,7 +170,7 @@ index acfdbde09e82..c1f693917d99 100644
|
||||
+
|
||||
#endif /* _DXGVMBUS_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 9128694c8e78..ac052836ce27 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -2460,6 +2460,7 @@ dxgkio_open_sync_object_nt(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -241,7 +241,7 @@ index 9128694c8e78..ac052836ce27 100644
|
||||
};
|
||||
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 9238115d165d..895861505e6e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -952,6 +952,13 @@ struct d3dkmt_enumadapters3 {
|
||||
|
||||
@@ -35,7 +35,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
6 files changed, 261 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index a39d11d76e41..b131c3b43838 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -268,12 +268,18 @@ void dxgsyncobject_destroy(struct dxgprocess *process,
|
||||
@@ -77,7 +77,7 @@ index a39d11d76e41..b131c3b43838 100644
|
||||
struct d3dkmthandle object,
|
||||
struct d3dkmthandle *shared_handle);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 8cbe1095599f..5c364a46b65f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -827,7 +827,6 @@ static struct dxgglobal *dxgglobal_create(void)
|
||||
@@ -89,7 +89,7 @@ index 8cbe1095599f..5c364a46b65f 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 67a16de622e0..ed800dc09180 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -281,6 +281,24 @@ static void command_vm_to_host_init1(struct dxgkvmb_command_vm_to_host *command,
|
||||
@@ -196,7 +196,7 @@ index 67a16de622e0..ed800dc09180 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmthandle device,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index c1f693917d99..6ca1068b0d4c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -172,6 +172,22 @@ struct dxgkvmb_command_signalguestevent {
|
||||
@@ -240,7 +240,7 @@ index c1f693917d99..6ca1068b0d4c 100644
|
||||
struct dxgkvmb_command_vm_to_host hdr;
|
||||
struct d3dkmthandle device_handle;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index ac052836ce27..26d410fd6e99 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3142,6 +3142,70 @@ dxgkio_wait_sync_object_gpu(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -324,7 +324,7 @@ index ac052836ce27..26d410fd6e99 100644
|
||||
/* 0x10 */ {dxgkio_create_sync_object, LX_DXCREATESYNCHRONIZATIONOBJECT},
|
||||
/* 0x11 */ {dxgkio_signal_sync_object, LX_DXSIGNALSYNCHRONIZATIONOBJECT},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 895861505e6e..8a013b07e88a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -236,6 +236,95 @@ struct d3dddi_destroypagingqueue {
|
||||
|
||||
@@ -38,7 +38,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
6 files changed, 339 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 410f08768bad..23f00db7637e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -885,6 +885,15 @@ void dxgallocation_stop(struct dxgallocation *alloc)
|
||||
@@ -67,7 +67,7 @@ index 410f08768bad..23f00db7637e 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index b131c3b43838..1d6b552f1c1a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -708,6 +708,8 @@ struct dxgallocation {
|
||||
@@ -106,7 +106,7 @@ index b131c3b43838..1d6b552f1c1a 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_createhwqueue *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index ed800dc09180..a80f84d9065a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -2354,6 +2354,113 @@ int dxgvmb_send_wait_sync_object_gpu(struct dxgprocess *process,
|
||||
@@ -224,7 +224,7 @@ index ed800dc09180..a80f84d9065a 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_createhwqueue *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 6ca1068b0d4c..447bb1ba391b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -570,6 +570,25 @@ struct dxgkvmb_command_waitforsyncobjectfromgpu {
|
||||
@@ -254,7 +254,7 @@ index 6ca1068b0d4c..447bb1ba391b 100644
|
||||
struct dxgkvmb_command_createhwqueue {
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 26d410fd6e99..37e218443310 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3142,6 +3142,162 @@ dxgkio_wait_sync_object_gpu(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -439,7 +439,7 @@ index 26d410fd6e99..37e218443310 100644
|
||||
/* 0x39 */ {},
|
||||
/* 0x3a */ {dxgkio_wait_sync_object_cpu,
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 8a013b07e88a..b498f09e694d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -668,6 +668,32 @@ struct d3dkmt_submitcommandtohwqueue {
|
||||
|
||||
@@ -35,7 +35,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 708 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 1d6b552f1c1a..7fefe4617488 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -851,6 +851,23 @@ int dxgvmb_send_lock2(struct dxgprocess *process,
|
||||
@@ -74,7 +74,7 @@ index 1d6b552f1c1a..7fefe4617488 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_getdevicestate *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index a80f84d9065a..dd2c97fee27b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1829,6 +1829,79 @@ int dxgvmb_send_destroy_allocation(struct dxgprocess *process,
|
||||
@@ -392,7 +392,7 @@ index a80f84d9065a..dd2c97fee27b 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_createhwqueue *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 447bb1ba391b..dbb01b9ab066 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -308,6 +308,29 @@ struct dxgkvmb_command_queryadapterinfo_return {
|
||||
@@ -467,7 +467,7 @@ index 447bb1ba391b..dbb01b9ab066 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmt_getdevicestate args;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 37e218443310..b626e2518ff2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3214,7 +3214,7 @@ dxgkio_lock2(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -731,7 +731,7 @@ index 37e218443310..b626e2518ff2 100644
|
||||
/* 0x3e */ {dxgkio_enum_adapters3, LX_DXENUMADAPTERS3},
|
||||
/* 0x3f */ {dxgkio_share_objects, LX_DXSHAREOBJECTS},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index b498f09e694d..af381101fd90 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -668,6 +668,63 @@ struct d3dkmt_submitcommandtohwqueue {
|
||||
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
6 files changed, 86 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 23f00db7637e..6f763e326a65 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -942,7 +942,7 @@ else
|
||||
@@ -35,7 +35,7 @@ index 23f00db7637e..6f763e326a65 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 7fefe4617488..ced9dd294f5f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -882,6 +882,9 @@ int dxgvmb_send_query_adapter_info(struct dxgprocess *process,
|
||||
@@ -49,7 +49,7 @@ index 7fefe4617488..ced9dd294f5f 100644
|
||||
struct dxgvmbuschannel *channel,
|
||||
struct d3dkmt_opensyncobjectfromnthandle2
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index dd2c97fee27b..928fad5f133b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1829,6 +1829,29 @@ int dxgvmb_send_destroy_allocation(struct dxgprocess *process,
|
||||
@@ -83,7 +83,7 @@ index dd2c97fee27b..928fad5f133b 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryallocationresidency
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index dbb01b9ab066..d232eb234e2c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -367,6 +367,11 @@ struct dxgkvmb_command_submitcommandtohwqueue {
|
||||
@@ -99,7 +99,7 @@ index dbb01b9ab066..d232eb234e2c 100644
|
||||
u32 flags;
|
||||
u32 priv_drv_data_size;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index b626e2518ff2..8b7d00e4c881 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3500,6 +3500,53 @@ dxgkio_change_vidmem_reservation(struct dxgprocess *process, void *__user inargs
|
||||
@@ -166,7 +166,7 @@ index b626e2518ff2..8b7d00e4c881 100644
|
||||
/* 0x21 */ {},
|
||||
/* 0x22 */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index af381101fd90..873feb951129 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -936,6 +936,10 @@ struct d3dkmt_queryadapterinfo {
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 145 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index ced9dd294f5f..b6a7288a4177 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -894,6 +894,11 @@ int dxgvmb_send_query_alloc_residency(struct dxgprocess *process,
|
||||
@@ -34,7 +34,7 @@ index ced9dd294f5f..b6a7288a4177 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_getdevicestate *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 928fad5f133b..48ff49456057 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1925,6 +1925,70 @@ int dxgvmb_send_query_alloc_residency(struct dxgprocess *process,
|
||||
@@ -109,7 +109,7 @@ index 928fad5f133b..48ff49456057 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_getdevicestate *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index d232eb234e2c..a1549983d50f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -664,6 +664,20 @@ struct dxgkvmb_command_queryallocationresidency_return {
|
||||
@@ -134,7 +134,7 @@ index d232eb234e2c..a1549983d50f 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmt_getdevicestate args;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 8b7d00e4c881..e692b127e219 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3547,6 +3547,54 @@ dxgkio_flush_heap_transitions(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -202,7 +202,7 @@ index 8b7d00e4c881..e692b127e219 100644
|
||||
/* 0x0c */ {},
|
||||
/* 0x0d */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 873feb951129..b7d8b1d91cfc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -897,6 +897,17 @@ enum d3dkmt_memory_segment_group {
|
||||
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 167 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index b6a7288a4177..dafc721ed6cf 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -894,6 +894,9 @@ int dxgvmb_send_query_alloc_residency(struct dxgprocess *process,
|
||||
@@ -36,7 +36,7 @@ index b6a7288a4177..dafc721ed6cf 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryvideomemoryinfo *args,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 48ff49456057..8bdd49bc7aa6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1925,6 +1925,70 @@ int dxgvmb_send_query_alloc_residency(struct dxgprocess *process,
|
||||
@@ -159,7 +159,7 @@ index 48ff49456057..8bdd49bc7aa6 100644
|
||||
}
|
||||
+
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index a1549983d50f..e1c2ed7b1580 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -664,6 +664,18 @@ struct dxgkvmb_command_queryallocationresidency_return {
|
||||
@@ -182,7 +182,7 @@ index a1549983d50f..e1c2ed7b1580 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmthandle adapter;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index e692b127e219..78de76abce2d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3547,6 +3547,46 @@ dxgkio_flush_heap_transitions(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -242,7 +242,7 @@ index e692b127e219..78de76abce2d 100644
|
||||
/* 0x0f */ {dxgkio_submit_command, LX_DXSUBMITCOMMAND},
|
||||
/* 0x10 */ {dxgkio_create_sync_object, LX_DXCREATESYNCHRONIZATIONOBJECT},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index b7d8b1d91cfc..749edf28bd43 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -236,6 +236,45 @@ struct d3dddi_destroypagingqueue {
|
||||
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 82 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index dafc721ed6cf..b454c7430f06 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -856,6 +856,9 @@ int dxgvmb_send_update_alloc_property(struct dxgprocess *process,
|
||||
@@ -38,7 +38,7 @@ index dafc721ed6cf..b454c7430f06 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_setallocationpriority *a);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 8bdd49bc7aa6..f7264b12a477 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -2730,6 +2730,31 @@ int dxgvmb_send_update_alloc_property(struct dxgprocess *process,
|
||||
@@ -74,7 +74,7 @@ index 8bdd49bc7aa6..f7264b12a477 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_setallocationpriority *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index e1c2ed7b1580..a66e11097bb2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -627,6 +627,11 @@ struct dxgkvmb_command_updateallocationproperty_return {
|
||||
@@ -90,7 +90,7 @@ index e1c2ed7b1580..a66e11097bb2 100644
|
||||
struct dxgkvmb_command_changevideomemoryreservation {
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 78de76abce2d..ce4af610ada7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3341,6 +3341,42 @@ dxgkio_update_alloc_property(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -146,7 +146,7 @@ index 78de76abce2d..ce4af610ada7 100644
|
||||
/* 0x28 */ {},
|
||||
/* 0x29 */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 749edf28bd43..ce5a638a886d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -790,6 +790,16 @@ struct d3dkmt_unlock2 {
|
||||
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 277 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index b454c7430f06..a55873bdd9a6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -885,6 +885,11 @@ int dxgvmb_send_query_adapter_info(struct dxgprocess *process,
|
||||
@@ -52,7 +52,7 @@ index b454c7430f06..a55873bdd9a6 100644
|
||||
void *command,
|
||||
u32 cmd_size);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index f7264b12a477..9a1864bb4e14 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1829,6 +1829,48 @@ int dxgvmb_send_destroy_allocation(struct dxgprocess *process,
|
||||
@@ -144,7 +144,7 @@ index f7264b12a477..9a1864bb4e14 100644
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index a66e11097bb2..17768ed0e68d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -372,6 +372,16 @@ struct dxgkvmb_command_flushheaptransitions {
|
||||
@@ -183,7 +183,7 @@ index a66e11097bb2..17768ed0e68d 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
enum d3dkmdt_standardallocationtype alloc_type;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index ce4af610ada7..4babb21f38a9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -149,6 +149,65 @@ static int dxgkio_open_adapter_from_luid(struct dxgprocess *process,
|
||||
@@ -325,7 +325,7 @@ index ce4af610ada7..4babb21f38a9 100644
|
||||
/* 0x45 */ {},
|
||||
};
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index ce5a638a886d..ea18242ceb83 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -996,6 +996,34 @@ struct d3dkmt_queryadapterinfo {
|
||||
|
||||
@@ -30,7 +30,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 340 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index a55873bdd9a6..494ea8fb0bb3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -865,6 +865,14 @@ int dxgvmb_send_set_allocation_priority(struct dxgprocess *process,
|
||||
@@ -49,7 +49,7 @@ index a55873bdd9a6..494ea8fb0bb3 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmthandle other_process,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 9a1864bb4e14..8448fd78975b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1858,7 +1858,7 @@ int dxgvmb_send_query_clock_calibration(struct dxgprocess *process,
|
||||
@@ -191,7 +191,7 @@ index 9a1864bb4e14..8448fd78975b 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmthandle other_process,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 17768ed0e68d..558c6576a262 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -653,6 +653,33 @@ struct dxgkvmb_command_markdeviceaserror {
|
||||
@@ -229,7 +229,7 @@ index 17768ed0e68d..558c6576a262 100644
|
||||
struct dxgkvmb_command_changevideomemoryreservation {
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 4babb21f38a9..fa880aa0196a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -1961,6 +1961,119 @@ dxgkio_destroy_allocation(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -368,7 +368,7 @@ index 4babb21f38a9..fa880aa0196a 100644
|
||||
/* 0x2e */ {dxgkio_set_allocation_priority, LX_DXSETALLOCATIONPRIORITY},
|
||||
/* 0x2f */ {},
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index ea18242ceb83..46b9f6d303bf 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -61,6 +61,7 @@ struct winluid {
|
||||
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 294 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 494ea8fb0bb3..02d10bdcc820 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -865,6 +865,15 @@ int dxgvmb_send_set_allocation_priority(struct dxgprocess *process,
|
||||
@@ -46,7 +46,7 @@ index 494ea8fb0bb3..02d10bdcc820 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_offerallocations *args);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 8448fd78975b..9a610d48bed7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -2949,6 +2949,69 @@ int dxgvmb_send_get_allocation_priority(struct dxgprocess *process,
|
||||
@@ -138,7 +138,7 @@ index 8448fd78975b..9a610d48bed7 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 558c6576a262..509482e1f870 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -331,6 +331,25 @@ struct dxgkvmb_command_getallocationpriority_return {
|
||||
@@ -168,7 +168,7 @@ index 558c6576a262..509482e1f870 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmt_createdeviceflags flags;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index fa880aa0196a..bc0adebe52ae 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -3660,6 +3660,171 @@ dxgkio_get_allocation_priority(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -370,7 +370,7 @@ index fa880aa0196a..bc0adebe52ae 100644
|
||||
LX_DXSIGNALSYNCHRONIZATIONOBJECTFROMCPU},
|
||||
/* 0x32 */ {dxgkio_signal_sync_object_gpu,
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 46b9f6d303bf..a9bafab97c18 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -708,6 +708,26 @@ struct d3dkmt_submitcommandtohwqueue {
|
||||
|
||||
@@ -36,7 +36,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 322 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 02d10bdcc820..93c3ceb23865 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -810,6 +810,10 @@ int dxgvmb_send_create_allocation(struct dxgprocess *pr, struct dxgdevice *dev,
|
||||
@@ -51,7 +51,7 @@ index 02d10bdcc820..93c3ceb23865 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_submitcommand *args);
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 9a610d48bed7..f4c4a7e7ad8b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -2279,6 +2279,104 @@ int dxgvmb_send_get_stdalloc_data(struct dxgdevice *device,
|
||||
@@ -160,7 +160,7 @@ index 9a610d48bed7..f4c4a7e7ad8b 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_submitcommand *args)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 509482e1f870..23f92ab9f8ad 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -372,6 +372,33 @@ struct dxgkvmb_command_flushdevice {
|
||||
@@ -198,7 +198,7 @@ index 509482e1f870..23f92ab9f8ad 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmt_submitcommand args;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index bc0adebe52ae..2700da51bc01 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -1961,6 +1961,143 @@ dxgkio_destroy_allocation(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -364,7 +364,7 @@ index bc0adebe52ae..2700da51bc01 100644
|
||||
/* 0x20 */ {},
|
||||
/* 0x21 */ {dxgkio_get_context_process_scheduling_priority,
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index a9bafab97c18..944f9d1e73d6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -962,6 +962,56 @@ struct d3dkmt_destroyallocation2 {
|
||||
|
||||
@@ -41,7 +41,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 548 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 93c3ceb23865..93bc9b41aa41 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -817,6 +817,16 @@ int dxgvmb_send_evict(struct dxgprocess *pr, struct dxgadapter *adapter,
|
||||
@@ -62,7 +62,7 @@ index 93c3ceb23865..93bc9b41aa41 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_createsynchronizationobject2
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index f4c4a7e7ad8b..425a1ab87bd6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -2432,6 +2432,156 @@ int dxgvmb_send_submit_command(struct dxgprocess *process,
|
||||
@@ -223,7 +223,7 @@ index f4c4a7e7ad8b..425a1ab87bd6 100644
|
||||
u64 fence_gpu_va, u8 *va)
|
||||
{
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 23f92ab9f8ad..88967ff6a505 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -418,6 +418,44 @@ struct dxgkvmb_command_flushheaptransitions {
|
||||
@@ -272,7 +272,7 @@ index 23f92ab9f8ad..88967ff6a505 100644
|
||||
struct dxgkvmb_command_vgpu_to_host hdr;
|
||||
struct d3dkmt_queryclockcalibration args;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 2700da51bc01..f6700e974f25 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -2492,6 +2492,226 @@ dxgkio_submit_wait_to_hwqueue(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -535,7 +535,7 @@ index 2700da51bc01..f6700e974f25 100644
|
||||
LX_DXWAITFORSYNCHRONIZATIONOBJECTFROMCPU},
|
||||
/* 0x3b */ {dxgkio_wait_sync_object_gpu,
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 944f9d1e73d6..1f60f5120e1d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -1012,6 +1012,124 @@ struct d3dkmt_evict {
|
||||
|
||||
@@ -33,7 +33,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
6 files changed, 129 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/Makefile b/drivers/hv/dxgkrnl/Makefile
|
||||
index 9d821e83448a..fc85a47a6ad5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/Makefile
|
||||
+++ b/drivers/hv/dxgkrnl/Makefile
|
||||
@@ -2,4 +2,4 @@
|
||||
@@ -43,7 +43,7 @@ index 9d821e83448a..fc85a47a6ad5 100644
|
||||
-dxgkrnl-y := dxgmodule.o hmgr.o misc.o dxgadapter.o ioctl.o dxgvmbus.o dxgprocess.o
|
||||
+dxgkrnl-y := dxgmodule.o hmgr.o misc.o dxgadapter.o ioctl.o dxgvmbus.o dxgprocess.o
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 93bc9b41aa41..091dbe999d33 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -316,6 +316,7 @@ struct dxgglobal {
|
||||
@@ -55,7 +55,7 @@ index 93bc9b41aa41..091dbe999d33 100644
|
||||
|
||||
static inline struct dxgglobal *dxggbl(void)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 5c364a46b65f..b1b612b90fc1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -147,7 +147,7 @@ void dxgglobal_remove_host_event(struct dxghostevent *event)
|
||||
@@ -127,7 +127,7 @@ index 5c364a46b65f..b1b612b90fc1 100644
|
||||
dxgglobal->vmbus_ver = DXGK_VMBUS_INTERFACE_VERSION;
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 425a1ab87bd6..4d7807909284 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1383,15 +1383,19 @@ int create_existing_sysmem(struct dxgdevice *device,
|
||||
@@ -279,7 +279,7 @@ index 425a1ab87bd6..4d7807909284 100644
|
||||
cleanup:
|
||||
if (kmem)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.h b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
index 88967ff6a505..b4a98f7c2522 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.h
|
||||
@@ -234,6 +234,16 @@ struct dxgkvmb_command_setexistingsysmemstore {
|
||||
@@ -300,7 +300,7 @@ index 88967ff6a505..b4a98f7c2522 100644
|
||||
struct dxgkvmb_command_vm_to_host hdr;
|
||||
void *process;
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.c b/drivers/hv/dxgkrnl/misc.c
|
||||
index cb1e0635bebc..4a1309d80ee5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.c
|
||||
+++ b/drivers/hv/dxgkrnl/misc.c
|
||||
@@ -35,3 +35,4 @@ u16 *wcsncpy(u16 *dest, const u16 *src, size_t n)
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 6f763e326a65..236febbc6fca 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -932,7 +932,7 @@ void dxgallocation_destroy(struct dxgallocation *alloc)
|
||||
|
||||
@@ -15,7 +15,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
2 files changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index b1b612b90fc1..f1245a9d8826 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -300,7 +300,7 @@ static void dxgglobal_start_adapters(void)
|
||||
@@ -28,7 +28,7 @@ index b1b612b90fc1..f1245a9d8826 100644
|
||||
static void dxgglobal_stop_adapters(void)
|
||||
{
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index f6700e974f25..8732a66040a0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
@@ -34,7 +34,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
9 files changed, 294 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/Kconfig b/drivers/hv/dxgkrnl/Kconfig
|
||||
index bcd92bbff939..782692610887 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/Kconfig
|
||||
+++ b/drivers/hv/dxgkrnl/Kconfig
|
||||
@@ -6,6 +6,8 @@ config DXGKRNL
|
||||
@@ -47,7 +47,7 @@ index bcd92bbff939..782692610887 100644
|
||||
This driver supports paravirtualized virtual compute devices, exposed
|
||||
by Microsoft Hyper-V when Linux is running inside of a virtual machine
|
||||
diff --git a/drivers/hv/dxgkrnl/Makefile b/drivers/hv/dxgkrnl/Makefile
|
||||
index fc85a47a6ad5..89824cda670a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/Makefile
|
||||
+++ b/drivers/hv/dxgkrnl/Makefile
|
||||
@@ -2,4 +2,4 @@
|
||||
@@ -57,7 +57,7 @@ index fc85a47a6ad5..89824cda670a 100644
|
||||
-dxgkrnl-y := dxgmodule.o hmgr.o misc.o dxgadapter.o ioctl.o dxgvmbus.o dxgprocess.o
|
||||
+dxgkrnl-y := dxgmodule.o hmgr.o misc.o dxgadapter.o ioctl.o dxgvmbus.o dxgprocess.o dxgsyncfile.o
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 091dbe999d33..3a69e3b34e1c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -120,6 +120,7 @@ struct dxgpagingqueue {
|
||||
@@ -77,7 +77,7 @@ index 091dbe999d33..3a69e3b34e1c 100644
|
||||
int dxgvmb_send_lock2(struct dxgprocess *process,
|
||||
struct dxgadapter *adapter,
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index f1245a9d8826..af51fcd35697 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -115,7 +115,7 @@ index f1245a9d8826..af51fcd35697 100644
|
||||
break;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgsyncfile.c b/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
new file mode 100644
|
||||
index 000000000000..88fd78f08fbe
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
@@ -0,0 +1,215 @@
|
||||
@@ -336,7 +336,7 @@ index 000000000000..88fd78f08fbe
|
||||
+};
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgsyncfile.h b/drivers/hv/dxgkrnl/dxgsyncfile.h
|
||||
new file mode 100644
|
||||
index 000000000000..207ef9b30f67
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hv/dxgkrnl/dxgsyncfile.h
|
||||
@@ -0,0 +1,30 @@
|
||||
@@ -371,7 +371,7 @@ index 000000000000..207ef9b30f67
|
||||
+
|
||||
+#endif /* _DXGSYNCFILE_H */
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 4d7807909284..913ea3cabb31 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -2820,6 +2820,7 @@ int dxgvmb_send_wait_sync_object_cpu(struct dxgprocess *process,
|
||||
@@ -422,7 +422,7 @@ index 4d7807909284..913ea3cabb31 100644
|
||||
|
||||
ret = dxgvmb_send_sync_msg_ntstatus(msg.channel, msg.hdr, msg.size);
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 8732a66040a0..6c26aafb0619 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -19,6 +19,7 @@
|
||||
@@ -452,7 +452,7 @@ index 8732a66040a0..6c26aafb0619 100644
|
||||
|
||||
/*
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index 1f60f5120e1d..c7f168425dc7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -1554,6 +1554,13 @@ struct d3dkmt_shareobjectwithhost {
|
||||
|
||||
@@ -17,7 +17,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
7 files changed, 25 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 236febbc6fca..3d8bec295b87 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -18,8 +18,8 @@
|
||||
@@ -32,7 +32,7 @@ index 236febbc6fca..3d8bec295b87 100644
|
||||
int dxgadapter_set_vmbus(struct dxgadapter *adapter, struct hv_device *hdev)
|
||||
{
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index af51fcd35697..08feae97e845 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -24,6 +24,9 @@
|
||||
@@ -55,7 +55,7 @@ index af51fcd35697..08feae97e845 100644
|
||||
sizeof(u32))
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index 5de3f8ccb448..afef196c0588 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -13,8 +13,8 @@
|
||||
@@ -79,7 +79,7 @@ index 5de3f8ccb448..afef196c0588 100644
|
||||
DXG_ERR("failed to acquire adapter reference");
|
||||
adapter = NULL;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 913ea3cabb31..d53d4254be63 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -22,8 +22,8 @@
|
||||
@@ -94,7 +94,7 @@ index 913ea3cabb31..d53d4254be63 100644
|
||||
#define RING_BUFSIZE (256 * 1024)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/hmgr.c b/drivers/hv/dxgkrnl/hmgr.c
|
||||
index 526b50f46d96..24101d0091ab 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/hmgr.c
|
||||
+++ b/drivers/hv/dxgkrnl/hmgr.c
|
||||
@@ -19,8 +19,8 @@
|
||||
@@ -153,7 +153,7 @@ index 526b50f46d96..24101d0091ab 100644
|
||||
}
|
||||
return table->entry_table[get_index(h)].object;
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 6c26aafb0619..4db23cd55b24 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -21,8 +21,8 @@
|
||||
@@ -186,7 +186,7 @@ index 6c26aafb0619..4db23cd55b24 100644
|
||||
code, _IOC_TYPE(p1), _IOC_SIZE(p1), _IOC_DIR(p1));
|
||||
return -ENOTTY;
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.c b/drivers/hv/dxgkrnl/misc.c
|
||||
index 4a1309d80ee5..4bf6fe80d22a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.c
|
||||
+++ b/drivers/hv/dxgkrnl/misc.c
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
8 files changed, 396 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 3a69e3b34e1c..d92e1348ccfb 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -254,6 +254,10 @@ void dxgsharedsyncobj_add_syncobj(struct dxgsharedsyncobject *sharedsyncobj,
|
||||
@@ -61,7 +61,7 @@ index 3a69e3b34e1c..d92e1348ccfb 100644
|
||||
struct dxgadapter *adapter,
|
||||
struct d3dkmt_queryallocationresidency
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 08feae97e845..5570f35954d4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -149,10 +149,11 @@ void dxgglobal_remove_host_event(struct dxghostevent *event)
|
||||
@@ -103,7 +103,7 @@ index 08feae97e845..5570f35954d4 100644
|
||||
f->private_data = NULL;
|
||||
return 0;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index afef196c0588..e77e3a4983f8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -39,6 +39,7 @@ struct dxgprocess *dxgprocess_create(void)
|
||||
@@ -134,7 +134,7 @@ index afef196c0588..e77e3a4983f8 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgsyncfile.c b/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
index 88fd78f08fbe..9d5832c90ad7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
@@ -9,6 +9,20 @@
|
||||
@@ -487,7 +487,7 @@ index 88fd78f08fbe..9d5832c90ad7 100644
|
||||
|
||||
static bool dxgdmafence_signaled(struct dma_fence *fence)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgsyncfile.h b/drivers/hv/dxgkrnl/dxgsyncfile.h
|
||||
index 207ef9b30f67..292b7f718987 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgsyncfile.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgsyncfile.h
|
||||
@@ -17,10 +17,13 @@
|
||||
@@ -505,7 +505,7 @@ index 207ef9b30f67..292b7f718987 100644
|
||||
u64 context;
|
||||
spinlock_t lock;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index d53d4254be63..36f4d4e84d3e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -796,6 +796,55 @@ int dxgvmb_send_open_sync_object_nt(struct dxgprocess *process,
|
||||
@@ -565,7 +565,7 @@ index d53d4254be63..36f4d4e84d3e 100644
|
||||
struct d3dkmthandle object,
|
||||
struct d3dkmthandle *shared_handle)
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 4db23cd55b24..622904d5c3a9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -36,10 +36,8 @@ static char *errorstr(int ret)
|
||||
@@ -614,7 +614,7 @@ index 4db23cd55b24..622904d5c3a9 100644
|
||||
|
||||
/*
|
||||
diff --git a/include/uapi/misc/d3dkmthk.h b/include/uapi/misc/d3dkmthk.h
|
||||
index c7f168425dc7..1eaa3f038322 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/uapi/misc/d3dkmthk.h
|
||||
+++ b/include/uapi/misc/d3dkmthk.h
|
||||
@@ -1561,6 +1561,25 @@ struct d3dkmt_createsyncfile {
|
||||
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
5 files changed, 225 insertions(+), 231 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index d92e1348ccfb..f63aa6f7a9dc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -999,18 +999,25 @@ void dxgk_validate_ioctls(void);
|
||||
@@ -51,7 +51,7 @@ index d92e1348ccfb..f63aa6f7a9dc 100644
|
||||
+
|
||||
#endif
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 5570f35954d4..aa27931a3447 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -961,3 +961,4 @@ module_exit(dxg_drv_exit);
|
||||
@@ -60,7 +60,7 @@ index 5570f35954d4..aa27931a3447 100644
|
||||
MODULE_DESCRIPTION("Microsoft Dxgkrnl virtual compute device Driver");
|
||||
+MODULE_VERSION("2.0.0");
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgsyncfile.c b/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
index 9d5832c90ad7..f3b3e8dd4568 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgsyncfile.c
|
||||
@@ -38,13 +38,6 @@
|
||||
@@ -105,7 +105,7 @@ index 9d5832c90ad7..f3b3e8dd4568 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 36f4d4e84d3e..566ccb6d01c9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1212,7 +1212,7 @@ dxgvmb_send_create_context(struct dxgadapter *adapter,
|
||||
@@ -547,7 +547,7 @@ index 36f4d4e84d3e..566ccb6d01c9 100644
|
||||
}
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 622904d5c3a9..3dc9e76f4f3d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -29,13 +29,6 @@ struct ioctl_desc {
|
||||
|
||||
@@ -17,7 +17,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
7 files changed, 101 insertions(+), 50 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index 3d8bec295b87..d9d45bd4a31e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -136,7 +136,7 @@ void dxgadapter_release(struct kref *refcount)
|
||||
@@ -90,7 +90,7 @@ index 3d8bec295b87..d9d45bd4a31e 100644
|
||||
kfree(syncobj);
|
||||
}
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index f63aa6f7a9dc..1b40d6e39085 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -404,7 +404,10 @@ struct dxgprocess {
|
||||
@@ -123,7 +123,7 @@ index f63aa6f7a9dc..1b40d6e39085 100644
|
||||
|
||||
#define DXG_ERR(fmt, ...) do { \
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index aa27931a3447..f419597f711a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -272,6 +272,7 @@ int dxgglobal_create_adapter(struct pci_dev *dev, guid_t *guid,
|
||||
@@ -141,7 +141,7 @@ index aa27931a3447..f419597f711a 100644
|
||||
-MODULE_VERSION("2.0.0");
|
||||
+MODULE_VERSION("2.0.1");
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
index e77e3a4983f8..fd51fd968049 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgprocess.c
|
||||
@@ -214,14 +214,15 @@ int dxgprocess_close_adapter(struct dxgprocess *process,
|
||||
@@ -166,7 +166,7 @@ index e77e3a4983f8..fd51fd968049 100644
|
||||
DXG_ERR("Adapter not found %x", handle.v);
|
||||
ret = -EINVAL;
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 566ccb6d01c9..8c99f141482e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1573,8 +1573,27 @@ process_allocation_handles(struct dxgprocess *process,
|
||||
@@ -312,7 +312,7 @@ index 566ccb6d01c9..8c99f141482e 100644
|
||||
if (ret < 0) {
|
||||
DXG_ERR("failed %x", ret);
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 3dc9e76f4f3d..7c72790f917f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -636,6 +636,7 @@ dxgkio_create_device(struct dxgprocess *process, void *__user inargs)
|
||||
@@ -375,7 +375,7 @@ index 3dc9e76f4f3d..7c72790f917f 100644
|
||||
DXG_ERR("invalid host handle");
|
||||
ret = -EINVAL;
|
||||
diff --git a/drivers/hv/dxgkrnl/misc.h b/drivers/hv/dxgkrnl/misc.h
|
||||
index ee2ebfdd1c13..9fcab4ae2c0c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/misc.h
|
||||
+++ b/drivers/hv/dxgkrnl/misc.h
|
||||
@@ -38,6 +38,7 @@ extern const struct d3dkmthandle zerohandle;
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 7c72790f917f..69324510c9e2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -4536,7 +4536,7 @@ enum dxg_sharedobject_type {
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
|
||||
index 69324510c9e2..98350583943e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/ioctl.c
|
||||
+++ b/drivers/hv/dxgkrnl/ioctl.c
|
||||
@@ -1589,7 +1589,8 @@ dxgkio_create_allocation(struct dxgprocess *process, void *__user inargs)
|
||||
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: Iouri Tarassov <iourit@linux.microsoft.com>
|
||||
3 files changed, 20 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
index d9d45bd4a31e..bcd19b7267d1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
|
||||
@@ -927,19 +927,11 @@ void dxgallocation_destroy(struct dxgallocation *alloc)
|
||||
@@ -37,7 +37,7 @@ index d9d45bd4a31e..bcd19b7267d1 100644
|
||||
vfree(alloc->priv_drv_data);
|
||||
if (alloc->cpu_address_mapped)
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
index 1b40d6e39085..c5ed23cb90df 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
|
||||
@@ -728,11 +728,7 @@ struct dxgallocation {
|
||||
@@ -53,7 +53,7 @@ index 1b40d6e39085..c5ed23cb90df 100644
|
||||
u32 num_pages;
|
||||
/*
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
index 8c99f141482e..eb3f4c5153a6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
|
||||
@@ -1493,22 +1493,14 @@ int create_existing_sysmem(struct dxgdevice *device,
|
||||
|
||||
@@ -23,7 +23,7 @@ Signed-off-by: Tyler Hicks <tyhicks@linux.microsoft.com>
|
||||
2 files changed, 20 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/nvdimm/virtio_pmem.c b/drivers/nvdimm/virtio_pmem.c
|
||||
index a92eb172f0e7..ec20d642f030 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/nvdimm/virtio_pmem.c
|
||||
+++ b/drivers/nvdimm/virtio_pmem.c
|
||||
@@ -36,6 +36,8 @@ static int virtio_pmem_probe(struct virtio_device *vdev)
|
||||
@@ -62,7 +62,7 @@ index a92eb172f0e7..ec20d642f030 100644
|
||||
res.start = vpmem->start;
|
||||
res.end = vpmem->start + vpmem->size - 1;
|
||||
diff --git a/drivers/nvdimm/virtio_pmem.h b/drivers/nvdimm/virtio_pmem.h
|
||||
index 0dddefe594c4..62bb564e81cb 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/nvdimm/virtio_pmem.h
|
||||
+++ b/drivers/nvdimm/virtio_pmem.h
|
||||
@@ -50,6 +50,9 @@ struct virtio_pmem {
|
||||
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: Tyler Hicks <tyhicks@linux.microsoft.com>
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/nvdimm/virtio_pmem.c b/drivers/nvdimm/virtio_pmem.c
|
||||
index ec20d642f030..48dfc5d1c3a4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/nvdimm/virtio_pmem.c
|
||||
+++ b/drivers/nvdimm/virtio_pmem.c
|
||||
@@ -90,6 +90,11 @@ static int virtio_pmem_probe(struct virtio_device *vdev)
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: drivers: hv: dxgkrnl: restore `uuid_le_cmp` removed from upstream in
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index f419597f711a..1deef95a79cf 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -27,6 +27,12 @@
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: drivers: hv: dxgkrnl: adapt dxg_remove_vmbus to 96ec29396's reality
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
index 1deef95a79cf..c91b659b3c41 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
+++ b/drivers/hv/dxgkrnl/dxgmodule.c
|
||||
@@ -800,9 +800,8 @@ static int dxg_probe_vmbus(struct hv_device *hdev,
|
||||
|
||||
Reference in New Issue
Block a user