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

Commit 78eb06c3 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Give names to the VBT child device type bits 



Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9ca2fe73

drivers/gpu/drm/i915/intel_bios.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -624,11 +624,11 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 




	aux_channel = child->raw[25];

	aux_channel = child->raw[25];





	is_dvi = child->common.device_type & (1 << 4);

	is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;

	is_dp = child->common.device_type & (1 << 2);

	is_dp = child->common.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;

	is_crt = child->common.device_type & (1 << 0);

	is_crt = child->common.device_type & DEVICE_TYPE_ANALOG_OUTPUT;

	is_hdmi = is_dvi && (child->common.device_type & (1 << 11)) == 0;

	is_hdmi = is_dvi && (child->common.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;

	is_edp = is_dp && (child->common.device_type & (1 << 12));

	is_edp = is_dp && (child->common.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);





	info->supports_dvi = is_dvi;

	info->supports_dvi = is_dvi;

	info->supports_hdmi = is_hdmi;

	info->supports_hdmi = is_hdmi;

drivers/gpu/drm/i915/intel_bios.h

+16 −0
Original line number Original line Diff line number Diff line
@@ -638,6 +638,22 @@ int intel_parse_bios(struct drm_device *dev); 
#define	 DEVICE_TYPE_DP		0x68C6

#define	 DEVICE_TYPE_DP		0x68C6

#define	 DEVICE_TYPE_eDP	0x78C6

#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)



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

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

#define		DVO_B		1

#define		DVO_B		1

#define		DVO_C		2

#define		DVO_C		2