Commit 3ce8d49c authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

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



gvt-fixes-2020-11-17

- Temporarily disable VFIO edid on BXT/APL (Colin)
- Fix emulated DPCD for version 1.2 (Tina)
- Fix error return when failing to take module reference (Xiongfeng)

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201117023918.GB23899@zhen-hp.sh.intel.com
parents b4ca4354 4ec2b69d

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static unsigned char virtual_dp_monitor_edid[GVT_EDID_NUM][EDID_SIZE] = { 


/* let the virtual display supports DP1.2 */

static u8 dpcd_fix_data[DPCD_HEADER_SIZE] = {

	0x12, 0x014, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

	0x12, 0x014, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

};



static void emulate_monitor_status_change(struct intel_vgpu *vgpu)

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

+3 −1
Original line number Diff line number Diff line
@@ -829,8 +829,10 @@ static int intel_vgpu_open(struct mdev_device *mdev) 
	/* Take a module reference as mdev core doesn't take

	 * a reference for vendor driver.

	 */

	if (!try_module_get(THIS_MODULE))

	if (!try_module_get(THIS_MODULE)) {

		ret = -ENODEV;

		goto undo_group;

	}



	ret = kvmgt_guest_init(mdev);

	if (ret)

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

+2 −1
Original line number Diff line number Diff line
@@ -439,7 +439,8 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt, 


	if (IS_BROADWELL(dev_priv))

		ret = intel_gvt_hypervisor_set_edid(vgpu, PORT_B);

	else

	/* FixMe: Re-enable APL/BXT once vfio_edid enabled */

	else if (!IS_BROXTON(dev_priv))

		ret = intel_gvt_hypervisor_set_edid(vgpu, PORT_D);

	if (ret)

		goto out_clean_sched_policy;

CRA Git | Maintained and supported by SUSTech CRA and CCSE