Commit 5d2fdb25 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-next-fixes-2023-02-23' of https://github.com/intel/gvt-linux... 

Merge tag 'gvt-next-fixes-2023-02-23' of https://github.com/intel/gvt-linux

 into drm-intel-next-fixes

gvt-next-fixes-2023-02-23

- use debugfs attribute for gvt debugfs entries (Deepak R Varma)
- fix memory leak in vgpu destroy for debugfs_lookup() then remove (Greg KH)
- fix DRM_I915_GVT kconfig symbol to unbreak menu presentation (Randy Dunlap)
- fix typos (Deepak R Varma, Colin Ian King)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y/co4cy10KM1/2uX@debian-scheme
parents 85636167 0b93efca

drivers/gpu/drm/i915/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -118,9 +118,6 @@ config DRM_I915_USERPTR 


	  If in doubt, say "Y".



config DRM_I915_GVT

	bool



config DRM_I915_GVT_KVMGT

	tristate "Enable KVM host support Intel GVT-g graphics virtualization"

	depends on DRM_I915
@@ -171,3 +168,6 @@ menu "drm/i915 Unstable Evolution" 
	depends on DRM_I915

	source "drivers/gpu/drm/i915/Kconfig.unstable"

endmenu



config DRM_I915_GVT

	bool

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

+8 −8
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ vgpu_scan_nonprivbb_set(void *data, u64 val) 
	return 0;

}



DEFINE_SIMPLE_ATTRIBUTE(vgpu_scan_nonprivbb_fops,

DEFINE_DEBUGFS_ATTRIBUTE(vgpu_scan_nonprivbb_fops,

			 vgpu_scan_nonprivbb_get, vgpu_scan_nonprivbb_set,

			 "0x%llx\n");
@@ -165,7 +165,7 @@ static int vgpu_status_get(void *data, u64 *val) 
	return 0;

}



DEFINE_SIMPLE_ATTRIBUTE(vgpu_status_fops, vgpu_status_get, NULL, "0x%llx\n");

DEFINE_DEBUGFS_ATTRIBUTE(vgpu_status_fops, vgpu_status_get, NULL, "0x%llx\n");



/**

 * intel_gvt_debugfs_add_vgpu - register debugfs entries for a vGPU
@@ -180,9 +180,9 @@ void intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu) 


	debugfs_create_file("mmio_diff", 0444, vgpu->debugfs, vgpu,

			    &vgpu_mmio_diff_fops);

	debugfs_create_file("scan_nonprivbb", 0644, vgpu->debugfs, vgpu,

	debugfs_create_file_unsafe("scan_nonprivbb", 0644, vgpu->debugfs, vgpu,

				   &vgpu_scan_nonprivbb_fops);

	debugfs_create_file("status", 0644, vgpu->debugfs, vgpu,

	debugfs_create_file_unsafe("status", 0644, vgpu->debugfs, vgpu,

				   &vgpu_status_fops);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int verify_firmware(struct intel_gvt *gvt, 
	mem = (fw->data + h->cfg_space_offset);



	id = *(u16 *)(mem + PCI_VENDOR_ID);

	VERIFY("vender id", id, pdev->vendor);

	VERIFY("vendor id", id, pdev->vendor);



	id = *(u16 *)(mem + PCI_DEVICE_ID);

	VERIFY("device id", id, pdev->device);

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

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static void intel_vgpu_close_device(struct vfio_device *vfio_dev) 


	clear_bit(INTEL_VGPU_STATUS_ATTACHED, vgpu->status);



	debugfs_remove(debugfs_lookup(KVMGT_DEBUGFS_FILENAME, vgpu->debugfs));

	debugfs_lookup_and_remove(KVMGT_DEBUGFS_FILENAME, vgpu->debugfs);



	kvm_page_track_unregister_notifier(vgpu->vfio_device.kvm,

					   &vgpu->track_node);

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

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ int intel_gvt_create_vgpu(struct intel_vgpu *vgpu, 
	ret = idr_alloc(&gvt->vgpu_idr, vgpu, IDLE_VGPU_IDR + 1, GVT_MAX_VGPU,

		GFP_KERNEL);

	if (ret < 0)

		goto out_unlock;;

		goto out_unlock;



	vgpu->id = ret;

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