From: Hang Yuan <hang.yuan@linux.intel.com>

Date: Mon, 30 Jul 2018 10:52:53 +0800

Subject: drm/i915/gvt: initialize dmabuf mutex in vgpu_create

Git-commit: d6c6113bfe19af514128163a6d176437d45b7325

Patch-mainline: v4.19-rc1

References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Currently, the mutex used in GVT dmabuf support is not initialized until

vgpu device is opened. If one vgpu device is opened and then removed, the

mutex will be used in vgpu remove operation without initialization. This

patch initializes the mutex in vgpu create operation to avoid the problem.

Fixes: e546e281d33d("drm/i915/gvt: Dmabuf support for GVT-g")

Signed-off-by: Hang Yuan <hang.yuan@linux.intel.com>

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

Acked-by: Petr Tesarik <ptesarik@suse.com>

---

 drivers/gpu/drm/i915/gvt/kvmgt.c |    1 -

 drivers/gpu/drm/i915/gvt/vgpu.c  |    1 +

 2 files changed, 1 insertion(+), 1 deletion(-)

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

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

@@ -1615,7 +1615,6 @@ static int kvmgt_guest_init(struct mdev_

 	kvmgt_protect_table_init(info);

 	gvt_cache_init(vgpu);

-	mutex_init(&vgpu->dmabuf_lock);

 	init_completion(&vgpu->vblank_done);

 	info->track_node.track_write = kvmgt_page_track_write;

--- a/drivers/gpu/drm/i915/gvt/vgpu.c

+++ b/drivers/gpu/drm/i915/gvt/vgpu.c

@@ -379,6 +379,7 @@ static struct intel_vgpu *__intel_gvt_cr

 	vgpu->gvt = gvt;

 	vgpu->sched_ctl.weight = param->weight;

 	mutex_init(&vgpu->vgpu_lock);

+	mutex_init(&vgpu->dmabuf_lock);

 	INIT_LIST_HEAD(&vgpu->dmabuf_obj_list_head);

 	INIT_RADIX_TREE(&vgpu->page_track_tree, GFP_KERNEL);

 	idr_init(&vgpu->object_idr);