From e2f27d28ea07ed826f5a568950e9497efc10cf6f Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 10 Aug 2017 22:25:51 +0300 Subject: [PATCH] drm/i915/vbt: ignore extraneous child devices for a port Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: Jani Nikula Commit message to be written... see commits 6acab15a7b0d ("drm/i915: use the HDMI DDI buffer translations from VBT") bb1d132935c2 ("drm/i915/vbt: split out defaults that are set when there is no VBT") 311a20949f04 ("drm/i915: don't init DP or HDMI when not supported by DDI port") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101745 Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/intel_bios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 82b144cdfa1d..9f77571421b9 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1142,9 +1142,9 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, if (child) { DRM_DEBUG_KMS("More than one child device for port %c in VBT.\n", port_name(port)); - return; + } else { + child = it; } - child = it; } } } -- 2.11.0