2013/11/1 <ville.syrjala@xxxxxxxxxxxxxxx>: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> I guess you can blame Paulo for being lazy here... Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> On a future patch, you might also want to do something about the definition of bits below the comment "/* Add the device class for LFP, TV, HDMI */". > --- > drivers/gpu/drm/i915/intel_bios.c | 10 +++++----- > drivers/gpu/drm/i915/intel_bios.h | 16 ++++++++++++++++ > 2 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index e29bcae..6dd622d 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -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; > diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h > index 287cc5a..f439c14 100644 > --- a/drivers/gpu/drm/i915/intel_bios.h > +++ b/drivers/gpu/drm/i915/intel_bios.h > @@ -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 > -- > 1.8.1.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
