Em Ter, 2018-04-10 às 12:12 +0300, Jani Nikula escreveu: > Apparently caused by a merge fail at some point. Due to the nature of > the duplicated block, the second one will have no effect, and there's > no > need to backport. > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_bios.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c > b/drivers/gpu/drm/i915/intel_bios.c > index fc14bab9c798..7f95d405d585 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -1276,13 +1276,6 @@ static void parse_ddi_port(struct > drm_i915_private *dev_priv, enum port port, > is_hdmi = false; > } > > - if (port == PORT_A && is_dvi) { > - DRM_DEBUG_KMS("VBT claims port A supports DVI%s, > ignoring\n", > - is_hdmi ? "/HDMI" : ""); > - is_dvi = false; > - is_hdmi = false; > - } > - > info->supports_dvi = is_dvi; > info->supports_hdmi = is_hdmi; > info->supports_dp = is_dp; _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx