OSDN Git Service

drm/i915/bios: remove duplicated code
authorJani Nikula <jani.nikula@intel.com>
Tue, 10 Apr 2018 09:12:48 +0000 (12:12 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 11 Apr 2018 13:06:17 +0000 (16:06 +0300)
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.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180410091248.1454-1-jani.nikula@intel.com
drivers/gpu/drm/i915/intel_bios.c

index c5c7530..6aae88c 100644 (file)
@@ -1271,13 +1271,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;