Commit 6a794c8a authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/bios: group device type definitions together 



No idea why some definitions were defined at a different place from the
rest. Move them together. No functional changes.

Cc: Animesh Manna <animesh.manna@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6433a24240ef965f9c032e8f66fcce0ea33277ef.1503600621.git.jani.nikula@intel.com
parent fca36df5

drivers/gpu/drm/i915/intel_vbt_defs.h

+51 −52
Original line number Diff line number Diff line
@@ -206,6 +206,56 @@ struct bdb_general_features { 
#define DEVICE_TYPE_LFP_LVDS_DUAL	0x5162

#define DEVICE_TYPE_LFP_LVDS_DUAL_HDCP	0x51e2



/* Add the device class for LFP, TV, HDMI */

#define DEVICE_TYPE_INT_LFP		0x1022

#define DEVICE_TYPE_INT_TV		0x1009

#define DEVICE_TYPE_HDMI		0x60D2

#define DEVICE_TYPE_DP			0x68C6

#define DEVICE_TYPE_DP_DUAL_MODE	0x60D6

#define DEVICE_TYPE_eDP			0x78C6



#define DEVICE_TYPE_CLASS_EXTENSION	(1 << 15)

#define DEVICE_TYPE_POWER_MANAGEMENT	(1 << 14)

#define DEVICE_TYPE_HOTPLUG_SIGNALING	(1 << 13)

#define DEVICE_TYPE_INTERNAL_CONNECTOR	(1 << 12)

#define DEVICE_TYPE_NOT_HDMI_OUTPUT	(1 << 11)

#define DEVICE_TYPE_MIPI_OUTPUT		(1 << 10)

#define DEVICE_TYPE_COMPOSITE_OUTPUT	(1 << 9)

#define DEVICE_TYPE_DUAL_CHANNEL	(1 << 8)

#define DEVICE_TYPE_HIGH_SPEED_LINK	(1 << 6)

#define DEVICE_TYPE_LVDS_SINGALING	(1 << 5)

#define DEVICE_TYPE_TMDS_DVI_SIGNALING	(1 << 4)

#define DEVICE_TYPE_VIDEO_SIGNALING	(1 << 3)

#define DEVICE_TYPE_DISPLAYPORT_OUTPUT	(1 << 2)

#define DEVICE_TYPE_DIGITAL_OUTPUT	(1 << 1)

#define DEVICE_TYPE_ANALOG_OUTPUT	(1 << 0)



/*

 * Bits we care about when checking for DEVICE_TYPE_eDP. Depending on the

 * system, the other bits may or may not be set for eDP outputs.

 */

#define DEVICE_TYPE_eDP_BITS \

	(DEVICE_TYPE_INTERNAL_CONNECTOR |	\

	 DEVICE_TYPE_MIPI_OUTPUT |		\

	 DEVICE_TYPE_COMPOSITE_OUTPUT |		\

	 DEVICE_TYPE_DUAL_CHANNEL |		\

	 DEVICE_TYPE_LVDS_SINGALING |		\

	 DEVICE_TYPE_TMDS_DVI_SIGNALING |	\

	 DEVICE_TYPE_VIDEO_SIGNALING |		\

	 DEVICE_TYPE_DISPLAYPORT_OUTPUT |	\

	 DEVICE_TYPE_ANALOG_OUTPUT)



#define DEVICE_TYPE_DP_DUAL_MODE_BITS \

	(DEVICE_TYPE_INTERNAL_CONNECTOR |	\

	 DEVICE_TYPE_MIPI_OUTPUT |		\

	 DEVICE_TYPE_COMPOSITE_OUTPUT |		\

	 DEVICE_TYPE_LVDS_SINGALING |		\

	 DEVICE_TYPE_TMDS_DVI_SIGNALING |	\

	 DEVICE_TYPE_VIDEO_SIGNALING |		\

	 DEVICE_TYPE_DISPLAYPORT_OUTPUT |	\

	 DEVICE_TYPE_DIGITAL_OUTPUT |		\

	 DEVICE_TYPE_ANALOG_OUTPUT)



#define DEVICE_CFG_NONE		0x00

#define DEVICE_CFG_12BIT_DVOB	0x01

#define DEVICE_CFG_12BIT_DVOC	0x02
@@ -272,7 +322,7 @@ struct bdb_general_features { 
 */

struct child_device_config {

	u16 handle;

	u16 device_type;

	u16 device_type; /* See DEVICE_TYPE_* above */



	union {

		u8  device_id[10]; /* ascii string */
@@ -788,57 +838,6 @@ struct bdb_psr { 
#define   SWF14_APM_STANDBY	0x1

#define   SWF14_APM_RESTORE	0x0



/* Add the device class for LFP, TV, HDMI */

#define	 DEVICE_TYPE_INT_LFP	0x1022

#define	 DEVICE_TYPE_INT_TV	0x1009

#define	 DEVICE_TYPE_HDMI	0x60D2

#define	 DEVICE_TYPE_DP		0x68C6

#define	 DEVICE_TYPE_DP_DUAL_MODE	0x60D6

#define	 DEVICE_TYPE_eDP	0x78C6



#define  DEVICE_TYPE_CLASS_EXTENSION	(1 << 15)

#define  DEVICE_TYPE_POWER_MANAGEMENT	(1 << 14)

#define  DEVICE_TYPE_HOTPLUG_SIGNALING	(1 << 13)

#define  DEVICE_TYPE_INTERNAL_CONNECTOR	(1 << 12)

#define  DEVICE_TYPE_NOT_HDMI_OUTPUT	(1 << 11)

#define  DEVICE_TYPE_MIPI_OUTPUT	(1 << 10)

#define  DEVICE_TYPE_COMPOSITE_OUTPUT	(1 << 9)

#define  DEVICE_TYPE_DUAL_CHANNEL	(1 << 8)

#define  DEVICE_TYPE_HIGH_SPEED_LINK	(1 << 6)

#define  DEVICE_TYPE_LVDS_SINGALING	(1 << 5)

#define  DEVICE_TYPE_TMDS_DVI_SIGNALING	(1 << 4)

#define  DEVICE_TYPE_VIDEO_SIGNALING	(1 << 3)

#define  DEVICE_TYPE_DISPLAYPORT_OUTPUT	(1 << 2)

#define  DEVICE_TYPE_DIGITAL_OUTPUT	(1 << 1)

#define  DEVICE_TYPE_ANALOG_OUTPUT	(1 << 0)



/*

 * Bits we care about when checking for DEVICE_TYPE_eDP

 * Depending on the system, the other bits may or may not

 * be set for eDP outputs.

 */

#define DEVICE_TYPE_eDP_BITS \

	(DEVICE_TYPE_INTERNAL_CONNECTOR | \

	 DEVICE_TYPE_MIPI_OUTPUT | \

	 DEVICE_TYPE_COMPOSITE_OUTPUT | \

	 DEVICE_TYPE_DUAL_CHANNEL | \

	 DEVICE_TYPE_LVDS_SINGALING | \

	 DEVICE_TYPE_TMDS_DVI_SIGNALING | \

	 DEVICE_TYPE_VIDEO_SIGNALING | \

	 DEVICE_TYPE_DISPLAYPORT_OUTPUT | \

	 DEVICE_TYPE_ANALOG_OUTPUT)



#define DEVICE_TYPE_DP_DUAL_MODE_BITS \

	(DEVICE_TYPE_INTERNAL_CONNECTOR | \

	 DEVICE_TYPE_MIPI_OUTPUT | \

	 DEVICE_TYPE_COMPOSITE_OUTPUT | \

	 DEVICE_TYPE_LVDS_SINGALING | \

	 DEVICE_TYPE_TMDS_DVI_SIGNALING | \

	 DEVICE_TYPE_VIDEO_SIGNALING | \

	 DEVICE_TYPE_DISPLAYPORT_OUTPUT | \

	 DEVICE_TYPE_DIGITAL_OUTPUT | \

	 DEVICE_TYPE_ANALOG_OUTPUT)



/* define the DVO port for HDMI output type */

#define		DVO_B		1

#define		DVO_C		2

CRA Git | Maintained and supported by SUSTech CRA and CCSE