From db3f030043f9fc65401fc444e996e244c7102768 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Nov 2022 19:13:22 +0100 Subject: [PATCH] drop queue-6.0/drm-i915-gvt-add-missing-vfio_unregister_group_dev-c.patch --- ...-missing-vfio_unregister_group_dev-c.patch | 43 ------------------- queue-6.0/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 queue-6.0/drm-i915-gvt-add-missing-vfio_unregister_group_dev-c.patch diff --git a/queue-6.0/drm-i915-gvt-add-missing-vfio_unregister_group_dev-c.patch b/queue-6.0/drm-i915-gvt-add-missing-vfio_unregister_group_dev-c.patch deleted file mode 100644 index 097747ee22b..00000000000 --- a/queue-6.0/drm-i915-gvt-add-missing-vfio_unregister_group_dev-c.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9df747c58f96b4595e835824008f2a2974ba7723 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Sep 2022 14:48:35 -0300 -Subject: drm/i915/gvt: Add missing vfio_unregister_group_dev() call - -From: Jason Gunthorpe - -[ Upstream commit f423fa1bc9fe1978e6b9f54927411b62cb43eb04 ] - -When converting to directly create the vfio_device the mdev driver has to -put a vfio_register_emulated_iommu_dev() in the probe() and a pairing -vfio_unregister_group_dev() in the remove. - -This was missed for gvt, add it. - -Cc: stable@vger.kernel.org -Fixes: 978cf586ac35 ("drm/i915/gvt: convert to use vfio_register_emulated_iommu_dev") -Reported-by: Alex Williamson -Signed-off-by: Jason Gunthorpe -Reviewed-by: Kevin Tian -Reviewed-by: Christoph Hellwig -Link: https://lore.kernel.org/r/0-v1-013609965fe8+9d-vfio_gvt_unregister_jgg@nvidia.com -Signed-off-by: Alex Williamson -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c -index e3cd58946477..dacd57732dbe 100644 ---- a/drivers/gpu/drm/i915/gvt/kvmgt.c -+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c -@@ -1595,6 +1595,7 @@ static void intel_vgpu_remove(struct mdev_device *mdev) - - if (WARN_ON_ONCE(vgpu->attached)) - return; -+ vfio_unregister_group_dev(&vgpu->vfio_device); - intel_gvt_destroy_vgpu(vgpu); - } - --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index 7ff3c3ef6ab..cc87ac5dbaa 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -1,6 +1,5 @@ usb-dwc3-gadget-force-sending-delayed-status-during-.patch usb-dwc3-gadget-don-t-delay-end-transfer-on-delayed_.patch -drm-i915-gvt-add-missing-vfio_unregister_group_dev-c.patch rdma-cma-use-output-interface-for-net_dev-check.patch ib-hfi1-correctly-move-list-in-sc_disable.patch rdma-hns-disable-local-invalidate-operation.patch -- 2.47.2