Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Ville Syrjälä 11 years ago
parent
9ca2fe731b
commit
78eb06c394
2 changed files with 21 additions and 5 deletions
Split View Show Diff Stats
  1. 5 5
      drivers/gpu/drm/i915/intel_bios.c
  2. 16 0
      drivers/gpu/drm/i915/intel_bios.h

+ 5 - 5
drivers/gpu/drm/i915/intel_bios.c
View File 

@@ -624,11 +624,11 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
 
 
 	aux_channel = child->raw[25];
 
 
-	is_dvi = child->common.device_type & (1 << 4);
 
-	is_dp = child->common.device_type & (1 << 2);
 
-	is_crt = child->common.device_type & (1 << 0);
 
-	is_hdmi = is_dvi && (child->common.device_type & (1 << 11)) == 0;
 
-	is_edp = is_dp && (child->common.device_type & (1 << 12));
 
+	is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
 
+	is_dp = child->common.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
 
+	is_crt = child->common.device_type & DEVICE_TYPE_ANALOG_OUTPUT;
 
+	is_hdmi = is_dvi && (child->common.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
 
+	is_edp = is_dp && (child->common.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
 
 
 	info->supports_dvi = is_dvi;
 
 	info->supports_hdmi = is_hdmi;

+ 16 - 0
drivers/gpu/drm/i915/intel_bios.h
View File 

@@ -638,6 +638,22 @@ int intel_parse_bios(struct drm_device *dev);
 
 #define	 DEVICE_TYPE_DP		0x68C6
 
 #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		DVO_B		1
 
 #define		DVO_C		2