Commit 8e9a400c authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-fixes-2020-02-26' of https://github.com/intel/gvt-linux into drm-intel-fixes 



gvt-fixes-2020-02-26

- Fix virtual display reset (Tina)
- Fix one use-after-free for dmabuf (Tina)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226103016.GC10413@zhen-hp.sh.intel.com
parents 23873426 b549c252

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

+1 −1
Original line number Diff line number Diff line
@@ -151,12 +151,12 @@ static void dmabuf_gem_object_free(struct kref *kref) 
			dmabuf_obj = container_of(pos,

					struct intel_vgpu_dmabuf_obj, list);

			if (dmabuf_obj == obj) {

				list_del(pos);

				intel_gvt_hypervisor_put_vfio_device(vgpu);

				idr_remove(&vgpu->object_idr,

					   dmabuf_obj->dmabuf_id);

				kfree(dmabuf_obj->info);

				kfree(dmabuf_obj);

				list_del(pos);

				break;

			}

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -560,9 +560,9 @@ void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr, 


		intel_vgpu_reset_mmio(vgpu, dmlr);

		populate_pvinfo_page(vgpu);

		intel_vgpu_reset_display(vgpu);



		if (dmlr) {

			intel_vgpu_reset_display(vgpu);

			intel_vgpu_reset_cfg_space(vgpu);

			/* only reset the failsafe mode when dmlr reset */

			vgpu->failsafe = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE