Skip to content

Commit c1da8fc

Browse files
committed
Merge feature/dxgkrnl/5.15 into v5.15.137
* commit '26d29d8377a78f1b0014f6c9ba6df9ed5763f885': (47 commits) drivers: hv: dxgkrnl: Retry sending a VM bus packet when there is no place in the ring buffer drivers: hv: dxgkrnl: Fixed the implementation of D3DKMTQueryClockCalibration drivers: hv: dxgkrnl: Fixed coding style issues drivers: hv: dxgkrnl: Implement known escapes drivers: hv: dxgkrnl: Implement D3DDKMTIsFeatureEnabled API drivers: hv: dxgkrnl: Implement the D3DKMTEnumProcesses API drivers: hv: dxgkrnl: Handle process ID in D3DKMTQueryStatistics drivers: hv: dxgkrnl: Added implementation for D3DKMTInvalidateCache drivers: hv: dxgkrnl: Added support for compute only adapters drivers: hv: dxgkrnl: Added missed NULL check for resource object drivers: hv: dxgkrnl: Close shared file objects in case of a failure drivers: hv: dxgkrnl: Fix synchronization locks drivers: hv: dxgkrnl: Improve tracing and return values from copy from user drivers: hv: dxgkrnl: Implement D3DKMTWaitSyncFile drivers: hv: dxgkrnl: Use tracing instead of dev_dbg drivers: hv: dxgkrnl: Creation of dxgsyncfile objects drivers: hv: dxgkrnl: Remove dxgk_init_ioctls drivers: hv: dxgkrnl: Removed struct vmbus_gpadl, which was defined in the main linux branch drivers: hv: dxgkrnl: Add support to map guest pages by host drivers: hv: dxgkrnl: Manage compute device virtual addresses ...
2 parents 64e8332 + 26d29d8 commit c1da8fc

20 files changed

Lines changed: 17452 additions & 0 deletions

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8727,6 +8727,13 @@ F: Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
87278727
F: drivers/mtd/hyperbus/
87288728
F: include/linux/mtd/hyperbus.h
87298729

8730+
Hyper-V vGPU DRIVER
8731+
M: Iouri Tarassov <iourit@microsoft.com>
8732+
L: linux-hyperv@vger.kernel.org
8733+
S: Supported
8734+
F: drivers/hv/dxgkrnl/
8735+
F: include/uapi/misc/d3dkmthk.h
8736+
87308737
HYPERVISOR VIRTUAL CONSOLE DRIVER
87318738
L: linuxppc-dev@lists.ozlabs.org
87328739
S: Odd Fixes

drivers/hv/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ config HYPERV_BALLOON
2929
help
3030
Select this option to enable Hyper-V Balloon driver.
3131

32+
source "drivers/hv/dxgkrnl/Kconfig"
33+
3234
endmenu

drivers/hv/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
obj-$(CONFIG_HYPERV) += hv_vmbus.o
33
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
44
obj-$(CONFIG_HYPERV_BALLOON) += hv_balloon.o
5+
obj-$(CONFIG_DXGKRNL) += dxgkrnl/
56

67
CFLAGS_hv_trace.o = -I$(src)
78
CFLAGS_hv_balloon.o = -I$(src)

drivers/hv/dxgkrnl/Kconfig

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# Configuration for the hyper-v virtual compute driver (dxgkrnl)
3+
#
4+
5+
config DXGKRNL
6+
tristate "Microsoft Paravirtualized GPU support"
7+
depends on HYPERV
8+
depends on 64BIT || COMPILE_TEST
9+
select DMA_SHARED_BUFFER
10+
select SYNC_FILE
11+
help
12+
This driver supports paravirtualized virtual compute devices, exposed
13+
by Microsoft Hyper-V when Linux is running inside of a virtual machine
14+
hosted by Windows. The virtual machines needs to be configured to use
15+
host compute adapters. The driver name is dxgkrnl.
16+
17+
An example of such virtual machine is a Windows Subsystem for
18+
Linux container. When such container is instantiated, the Windows host
19+
assigns compatible host GPU adapters to the container. The corresponding
20+
virtual GPU devices appear on the PCI bus in the container. These
21+
devices are enumerated and accessed by this driver.
22+
23+
Communications with the driver are done by using the Microsoft libdxcore
24+
library, which translates the D3DKMT interface
25+
<https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/d3dkmthk/>
26+
to the driver IOCTLs. The virtual GPU devices are paravirtualized,
27+
which means that access to the hardware is done in the host. The driver
28+
communicates with the host using Hyper-V VM bus communication channels.

drivers/hv/dxgkrnl/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# Makefile for the hyper-v compute device driver (dxgkrnl).
3+
4+
obj-$(CONFIG_DXGKRNL) += dxgkrnl.o
5+
dxgkrnl-y := dxgmodule.o hmgr.o misc.o dxgadapter.o ioctl.o dxgvmbus.o dxgprocess.o dxgsyncfile.o

0 commit comments

Comments
 (0)