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

Commit bca5609f authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

drm/i915/gvt: Add more edid definition support 



We'll need to apply different resolution for vgpu types, so this
adds more EDID types definition.

v2: fix typo for actual 1920x1200 resolution

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 191020b6

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

+74 −38
Original line number Diff line number Diff line
@@ -83,8 +83,43 @@ static int pipe_is_enabled(struct intel_vgpu *vgpu, int pipe) 
	return 0;

}



static unsigned char virtual_dp_monitor_edid[GVT_EDID_NUM][EDID_SIZE] = {

	{

/* EDID with 1024x768 as its resolution */

		/*Header*/

		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,

		/* Vendor & Product Identification */

		0x22, 0xf0, 0x54, 0x29, 0x00, 0x00, 0x00, 0x00, 0x04, 0x17,

		/* Version & Revision */

		0x01, 0x04,

		/* Basic Display Parameters & Features */

		0xa5, 0x34, 0x20, 0x78, 0x23,

		/* Color Characteristics */

		0xfc, 0x81, 0xa4, 0x55, 0x4d, 0x9d, 0x25, 0x12, 0x50, 0x54,

		/* Established Timings: maximum resolution is 1024x768 */

		0x21, 0x08, 0x00,

		/* Standard Timings. All invalid */

		0x00, 0xc0, 0x00, 0xc0, 0x00, 0x40, 0x00, 0x80, 0x00, 0x00,

		0x00, 0x40, 0x00, 0x00, 0x00, 0x01,

		/* 18 Byte Data Blocks 1: invalid */

		0x00, 0x00, 0x80, 0xa0, 0x70, 0xb0,

		0x23, 0x40, 0x30, 0x20, 0x36, 0x00, 0x06, 0x44, 0x21, 0x00, 0x00, 0x1a,

		/* 18 Byte Data Blocks 2: invalid */

		0x00, 0x00, 0x00, 0xfd, 0x00, 0x18, 0x3c, 0x18, 0x50, 0x11, 0x00, 0x0a,

		0x20, 0x20, 0x20, 0x20, 0x20, 0x20,

		/* 18 Byte Data Blocks 3: invalid */

		0x00, 0x00, 0x00, 0xfc, 0x00, 0x48,

		0x50, 0x20, 0x5a, 0x52, 0x32, 0x34, 0x34, 0x30, 0x77, 0x0a, 0x20, 0x20,

		/* 18 Byte Data Blocks 4: invalid */

		0x00, 0x00, 0x00, 0xff, 0x00, 0x43, 0x4e, 0x34, 0x33, 0x30, 0x34, 0x30,

		0x44, 0x58, 0x51, 0x0a, 0x20, 0x20,

		/* Extension Block Count */

		0x00,

		/* Checksum */

		0xef,

	},

	{

/* EDID with 1920x1200 as its resolution */

static unsigned char virtual_dp_monitor_edid[] = {

		/*Header*/

		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,

		/* Vendor & Product Identification */
@@ -121,6 +156,7 @@ static unsigned char virtual_dp_monitor_edid[] = { 
		0x00,

		/* Checksum */

		0x45,

	},

};



#define DPCD_HEADER_SIZE        0xb
@@ -189,7 +225,7 @@ static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num, 
		return -ENOMEM;

	}



	memcpy(port->edid->edid_block, virtual_dp_monitor_edid,

	memcpy(port->edid->edid_block, virtual_dp_monitor_edid[GVT_EDID_1920_1200],

			EDID_SIZE);

	port->edid->data_valid = true;

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

+6 −0
Original line number Diff line number Diff line
@@ -154,6 +154,12 @@ struct intel_vgpu_port { 
	int type;

};



enum intel_vgpu_edid {

	GVT_EDID_1024_768,

	GVT_EDID_1920_1200,

	GVT_EDID_NUM,

};



void intel_gvt_emulate_vblank(struct intel_gvt *gvt);

void intel_gvt_check_vblank_emulation(struct intel_gvt *gvt);