Commit 59a036cf authored by yakui_zhao's avatar yakui_zhao Committed by Eric Anholt
Browse files

drm/i915: Add the structure of child_device_config in video BIOS tables. 



Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 040d87f1

drivers/gpu/drm/i915/intel_bios.h

+93 −8
Original line number Original line Diff line number Diff line
@@ -135,6 +135,86 @@ struct bdb_general_features { 
	u8 rsvd11:6; /* finish byte */

	u8 rsvd11:6; /* finish byte */

} __attribute__((packed));

} __attribute__((packed));





/* pre-915 */

#define GPIO_PIN_DVI_LVDS	0x03 /* "DVI/LVDS DDC GPIO pins" */

#define GPIO_PIN_ADD_I2C	0x05 /* "ADDCARD I2C GPIO pins" */

#define GPIO_PIN_ADD_DDC	0x04 /* "ADDCARD DDC GPIO pins" */

#define GPIO_PIN_ADD_DDC_I2C	0x06 /* "ADDCARD DDC/I2C GPIO pins" */



/* Pre 915 */

#define DEVICE_TYPE_NONE	0x00

#define DEVICE_TYPE_CRT		0x01

#define DEVICE_TYPE_TV		0x09

#define DEVICE_TYPE_EFP		0x12

#define DEVICE_TYPE_LFP		0x22

/* On 915+ */

#define DEVICE_TYPE_CRT_DPMS		0x6001

#define DEVICE_TYPE_CRT_DPMS_HOTPLUG	0x4001

#define DEVICE_TYPE_TV_COMPOSITE	0x0209

#define DEVICE_TYPE_TV_MACROVISION	0x0289

#define DEVICE_TYPE_TV_RF_COMPOSITE	0x020c

#define DEVICE_TYPE_TV_SVIDEO_COMPOSITE	0x0609

#define DEVICE_TYPE_TV_SCART		0x0209

#define DEVICE_TYPE_TV_CODEC_HOTPLUG_PWR 0x6009

#define DEVICE_TYPE_EFP_HOTPLUG_PWR	0x6012

#define DEVICE_TYPE_EFP_DVI_HOTPLUG_PWR	0x6052

#define DEVICE_TYPE_EFP_DVI_I		0x6053

#define DEVICE_TYPE_EFP_DVI_D_DUAL	0x6152

#define DEVICE_TYPE_EFP_DVI_D_HDCP	0x60d2

#define DEVICE_TYPE_OPENLDI_HOTPLUG_PWR	0x6062

#define DEVICE_TYPE_OPENLDI_DUALPIX	0x6162

#define DEVICE_TYPE_LFP_PANELLINK	0x5012

#define DEVICE_TYPE_LFP_CMOS_PWR	0x5042

#define DEVICE_TYPE_LFP_LVDS_PWR	0x5062

#define DEVICE_TYPE_LFP_LVDS_DUAL	0x5162

#define DEVICE_TYPE_LFP_LVDS_DUAL_HDCP	0x51e2



#define DEVICE_CFG_NONE		0x00

#define DEVICE_CFG_12BIT_DVOB	0x01

#define DEVICE_CFG_12BIT_DVOC	0x02

#define DEVICE_CFG_24BIT_DVOBC	0x09

#define DEVICE_CFG_24BIT_DVOCB	0x0a

#define DEVICE_CFG_DUAL_DVOB	0x11

#define DEVICE_CFG_DUAL_DVOC	0x12

#define DEVICE_CFG_DUAL_DVOBC	0x13

#define DEVICE_CFG_DUAL_LINK_DVOBC	0x19

#define DEVICE_CFG_DUAL_LINK_DVOCB	0x1a



#define DEVICE_WIRE_NONE	0x00

#define DEVICE_WIRE_DVOB	0x01

#define DEVICE_WIRE_DVOC	0x02

#define DEVICE_WIRE_DVOBC	0x03

#define DEVICE_WIRE_DVOBB	0x05

#define DEVICE_WIRE_DVOCC	0x06

#define DEVICE_WIRE_DVOB_MASTER 0x0d

#define DEVICE_WIRE_DVOC_MASTER 0x0e



#define DEVICE_PORT_DVOA	0x00 /* none on 845+ */

#define DEVICE_PORT_DVOB	0x01

#define DEVICE_PORT_DVOC	0x02



struct child_device_config {

	u16 handle;

	u16 device_type;

	u8  device_id[10]; /* See DEVICE_TYPE_* above */

	u16 addin_offset;

	u8  dvo_port; /* See Device_PORT_* above */

	u8  i2c_pin;

	u8  slave_addr;

	u8  ddc_pin;

	u16 edid_ptr;

	u8  dvo_cfg; /* See DEVICE_CFG_* above */

	u8  dvo2_port;

	u8  i2c2_pin;

	u8  slave2_addr;

	u8  ddc2_pin;

	u8  capabilities;

	u8  dvo_wiring;/* See DEVICE_WIRE_* above */

	u8  dvo2_wiring;

	u16 extended_type;

	u8  dvo_function;

} __attribute__((packed));



struct bdb_general_definitions {

struct bdb_general_definitions {

	/* DDC GPIO */

	/* DDC GPIO */

	u8 crt_ddc_gmbus_pin;

	u8 crt_ddc_gmbus_pin;
@@ -149,14 +229,19 @@ struct bdb_general_definitions { 
	u8 boot_display[2];

	u8 boot_display[2];

	u8 child_dev_size;

	u8 child_dev_size;





	/* device info */

	/*

	u8 tv_or_lvds_info[33];

	 * Device info:

	u8 dev1[33];

	 * If TV is present, it'll be at devices[0].

	u8 dev2[33];

	 * LVDS will be next, either devices[0] or [1], if present.

	u8 dev3[33];

	 * On some platforms the number of device is 6. But could be as few as

	u8 dev4[33];

	 * 4 if both TV and LVDS are missing.

	/* may be another device block here on some platforms */

	 * And the device num is related with the size of general definition

};

	 * block. It is obtained by using the following formula:

	 * number = (block_size - sizeof(bdb_general_definitions))/

	 * 		sizeof(child_device_config);

	 */

	struct child_device_config devices[0];

} __attribute__((packed));





struct bdb_lvds_options {

struct bdb_lvds_options {

	u8 panel_type;

	u8 panel_type;