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

Commit cf082a4a authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-fixes-2017-04-01' of https://github.com/01org/gvt-linux into drm-intel-fixes 

gvt-fixes-2017-04-01

- Fix cfg space in failsafe (Changbin)
- Fix a race for irq inject with vgpu release (Zhi)
- Fix golden state firmware load (Zhi)

Link: http://patchwork.freedesktop.org/patch/msgid/20170401080650.6cvqon7nsbziwnyc@zhen-hp.sh.intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents ecf8e899 aa4ce449

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

+0 −3
Original line number Diff line number Diff line
@@ -285,9 +285,6 @@ int intel_vgpu_emulate_cfg_write(struct intel_vgpu *vgpu, unsigned int offset, 
{

	int ret;



	if (vgpu->failsafe)

		return 0;



	if (WARN_ON(bytes > 4))

		return -EINVAL;

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

+6 −3
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt) 
	struct gvt_firmware_header *h;

	void *firmware;

	void *p;

	unsigned long size;

	unsigned long size, crc32_start;

	int i;

	int ret;



	size = sizeof(*h) + info->mmio_size + info->cfg_space_size - 1;

	size = sizeof(*h) + info->mmio_size + info->cfg_space_size;

	firmware = vzalloc(size);

	if (!firmware)

		return -ENOMEM;
@@ -112,6 +112,9 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt) 


	memcpy(gvt->firmware.mmio, p, info->mmio_size);



	crc32_start = offsetof(struct gvt_firmware_header, crc32) + 4;

	h->crc32 = crc32_le(0, firmware + crc32_start, size - crc32_start);



	firmware_attr.size = size;

	firmware_attr.private = firmware;
@@ -234,7 +237,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt) 


	firmware->mmio = mem;



	sprintf(path, "%s/vid_0x%04x_did_0x%04x_rid_0x%04x.golden_hw_state",

	sprintf(path, "%s/vid_0x%04x_did_0x%04x_rid_0x%02x.golden_hw_state",

		 GVT_FIRMWARE_PATH, pdev->vendor, pdev->device,

		 pdev->revision);

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

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ static const struct intel_gvt_ops intel_gvt_ops = { 
	.vgpu_create = intel_gvt_create_vgpu,

	.vgpu_destroy = intel_gvt_destroy_vgpu,

	.vgpu_reset = intel_gvt_reset_vgpu,

	.vgpu_activate = intel_gvt_activate_vgpu,

	.vgpu_deactivate = intel_gvt_deactivate_vgpu,

};



/**

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

+4 −1
Original line number Diff line number Diff line
@@ -382,7 +382,8 @@ void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu); 
void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr,

				 unsigned int engine_mask);

void intel_gvt_reset_vgpu(struct intel_vgpu *vgpu);



void intel_gvt_activate_vgpu(struct intel_vgpu *vgpu);

void intel_gvt_deactivate_vgpu(struct intel_vgpu *vgpu);



/* validating GM functions */

#define vgpu_gmadr_is_aperture(vgpu, gmadr) \
@@ -449,6 +450,8 @@ struct intel_gvt_ops { 
				struct intel_vgpu_type *);

	void (*vgpu_destroy)(struct intel_vgpu *);

	void (*vgpu_reset)(struct intel_vgpu *);

	void (*vgpu_activate)(struct intel_vgpu *);

	void (*vgpu_deactivate)(struct intel_vgpu *);

};

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

+4 −0
Original line number Diff line number Diff line
@@ -544,6 +544,8 @@ static int intel_vgpu_open(struct mdev_device *mdev) 
	if (ret)

		goto undo_group;



	intel_gvt_ops->vgpu_activate(vgpu);



	atomic_set(&vgpu->vdev.released, 0);

	return ret;
@@ -569,6 +571,8 @@ static void __intel_vgpu_release(struct intel_vgpu *vgpu) 
	if (atomic_cmpxchg(&vgpu->vdev.released, 0, 1))

		return;



	intel_gvt_ops->vgpu_deactivate(vgpu);



	ret = vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_IOMMU_NOTIFY,

					&vgpu->vdev.iommu_notifier);

	WARN(ret, "vfio_unregister_notifier for iommu failed: %d\n", ret);