Commit 1b4fd5d3 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge tag 'gvt-next-2019-02-01' of https://github.com/intel/gvt-linux into drm-intel-next-queued 



gvt-next-2019-02-01

- new VFIO EDID region support (Henry)

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190201061523.GE5588@zhen-hp.sh.intel.com
parents 7360c9f6 39c68e87

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

+31 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num, 
	port->dpcd->data_valid = true;

	port->dpcd->data[DPCD_SINK_COUNT] = 0x1;

	port->type = type;

	port->id = resolution;



	emulate_monitor_status_change(vgpu);
@@ -444,6 +445,36 @@ void intel_gvt_emulate_vblank(struct intel_gvt *gvt) 
	mutex_unlock(&gvt->lock);

}



/**

 * intel_vgpu_emulate_hotplug - trigger hotplug event for vGPU

 * @vgpu: a vGPU

 * @conncted: link state

 *

 * This function is used to trigger hotplug interrupt for vGPU

 *

 */

void intel_vgpu_emulate_hotplug(struct intel_vgpu *vgpu, bool connected)

{

	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;



	/* TODO: add more platforms support */

	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {

		if (connected) {

			vgpu_vreg_t(vgpu, SFUSE_STRAP) |=

				SFUSE_STRAP_DDID_DETECTED;

			vgpu_vreg_t(vgpu, SDEISR) |= SDE_PORTD_HOTPLUG_CPT;

		} else {

			vgpu_vreg_t(vgpu, SFUSE_STRAP) &=

				~SFUSE_STRAP_DDID_DETECTED;

			vgpu_vreg_t(vgpu, SDEISR) &= ~SDE_PORTD_HOTPLUG_CPT;

		}

		vgpu_vreg_t(vgpu, SDEIIR) |= SDE_PORTD_HOTPLUG_CPT;

		vgpu_vreg_t(vgpu, PCH_PORT_HOTPLUG) |=

				PORTD_HOTPLUG_STATUS_MASK;

		intel_vgpu_trigger_virtual_event(vgpu, DP_D_HOTPLUG);

	}

}



/**

 * intel_vgpu_clean_display - clean vGPU virtual display emulation

 * @vgpu: a vGPU

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

+31 −6
Original line number Diff line number Diff line
@@ -146,18 +146,19 @@ enum intel_vgpu_port_type { 
	GVT_PORT_MAX

};



enum intel_vgpu_edid {

	GVT_EDID_1024_768,

	GVT_EDID_1920_1200,

	GVT_EDID_NUM,

};



struct intel_vgpu_port {

	/* per display EDID information */

	struct intel_vgpu_edid_data *edid;

	/* per display DPCD information */

	struct intel_vgpu_dpcd_data *dpcd;

	int type;

};



enum intel_vgpu_edid {

	GVT_EDID_1024_768,

	GVT_EDID_1920_1200,

	GVT_EDID_NUM,

	enum intel_vgpu_edid id;

};



static inline char *vgpu_edid_str(enum intel_vgpu_edid id)
@@ -172,6 +173,30 @@ static inline char *vgpu_edid_str(enum intel_vgpu_edid id) 
	}

}



static inline unsigned int vgpu_edid_xres(enum intel_vgpu_edid id)

{

	switch (id) {

	case GVT_EDID_1024_768:

		return 1024;

	case GVT_EDID_1920_1200:

		return 1920;

	default:

		return 0;

	}

}



static inline unsigned int vgpu_edid_yres(enum intel_vgpu_edid id)

{

	switch (id) {

	case GVT_EDID_1024_768:

		return 768;

	case GVT_EDID_1920_1200:

		return 1200;

	default:

		return 0;

	}

}



void intel_gvt_emulate_vblank(struct intel_gvt *gvt);

void intel_gvt_check_vblank_emulation(struct intel_gvt *gvt);

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

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static const struct intel_gvt_ops intel_gvt_ops = { 
	.vgpu_query_plane = intel_vgpu_query_plane,

	.vgpu_get_dmabuf = intel_vgpu_get_dmabuf,

	.write_protect_handler = intel_vgpu_page_track_handler,

	.emulate_hotplug = intel_vgpu_emulate_hotplug,

};



static void init_device_info(struct intel_gvt *gvt)

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

+3 −0
Original line number Diff line number Diff line
@@ -536,6 +536,8 @@ int intel_vgpu_emulate_cfg_read(struct intel_vgpu *vgpu, unsigned int offset, 
int intel_vgpu_emulate_cfg_write(struct intel_vgpu *vgpu, unsigned int offset,

		void *p_data, unsigned int bytes);



void intel_vgpu_emulate_hotplug(struct intel_vgpu *vgpu, bool connected);



static inline u64 intel_vgpu_get_bar_gpa(struct intel_vgpu *vgpu, int bar)

{

	/* We are 64bit bar. */
@@ -577,6 +579,7 @@ struct intel_gvt_ops { 
	int (*vgpu_get_dmabuf)(struct intel_vgpu *vgpu, unsigned int);

	int (*write_protect_handler)(struct intel_vgpu *, u64, void *,

				     unsigned int);

	void (*emulate_hotplug)(struct intel_vgpu *vgpu, bool connected);

};

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

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ struct intel_gvt_mpt { 
	int (*set_trap_area)(unsigned long handle, u64 start, u64 end,

			     bool map);

	int (*set_opregion)(void *vgpu);

	int (*set_edid)(void *vgpu, int port_num);

	int (*get_vfio_device)(void *vgpu);

	void (*put_vfio_device)(void *vgpu);

	bool (*is_valid_gfn)(unsigned long handle, unsigned long gfn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE