Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f484e42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kvmgt-vfio-mdev-for-v4.10-rc1' of git://github.com/01org/gvt-linux 

Pull i915/gvt KVMGT updates from Zhenyu Wang:
 "KVMGT support depending on the VFIO/mdev framework"

* tag 'kvmgt-vfio-mdev-for-v4.10-rc1' of git://github.com/01org/gvt-linux:
  drm/i915/gvt/kvmgt: add vfio/mdev support to KVMGT
  drm/i915/gvt/kvmgt: read/write GPA via KVM API
  drm/i915/gvt/kvmgt: replace kmalloc() by kzalloc()
parents af79ce47 659643f7

drivers/gpu/drm/i915/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ config DRM_I915_GVT_KVMGT 
	tristate "Enable KVM/VFIO support for Intel GVT-g"

	depends on DRM_I915_GVT

	depends on KVM

	depends on VFIO_MDEV && VFIO_MDEV_DEVICE

	default n

	help

	  Choose this option if you want to enable KVMGT support for

drivers/gpu/drm/i915/gvt/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -5,6 +5,4 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ 


ccflags-y				+= -I$(src) -I$(src)/$(GVT_DIR) -Wall

i915-y					+= $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))



CFLAGS_kvmgt.o				:= -Wno-unused-function

obj-$(CONFIG_DRM_I915_GVT_KVMGT)	+= $(GVT_DIR)/kvmgt.o

drivers/gpu/drm/i915/gvt/gvt.h

+4 −2
Original line number Diff line number Diff line
@@ -164,15 +164,17 @@ struct intel_vgpu { 


#if IS_ENABLED(CONFIG_DRM_I915_GVT_KVMGT)

	struct {

		struct device *mdev;

		struct mdev_device *mdev;

		struct vfio_region *region;

		int num_regions;

		struct eventfd_ctx *intx_trigger;

		struct eventfd_ctx *msi_trigger;

		struct rb_root cache;

		struct mutex cache_lock;

		void *vfio_group;

		struct notifier_block iommu_notifier;

		struct notifier_block group_notifier;

		struct kvm *kvm;

		struct work_struct release_work;

	} vdev;

#endif

};

drivers/gpu/drm/i915/gvt/kvmgt.c

+918 −57

File changed.

Preview size limit exceeded, changes collapsed.