]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Only ignore eDP ports that are connected
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 1 Jun 2016 07:27:50 +0000 (08:27 +0100)
committerJani Nikula <jani.nikula@intel.com>
Fri, 10 Jun 2016 07:39:16 +0000 (10:39 +0300)
commit90309883aa9313c8a9bf9b6d3c0fb8efe122042b
treecc6c054847b3ab84b5e641fcc87c4605837f13ee
parentbecc107498622dbbd23d923e87e333242a391b98
drm/i915: Only ignore eDP ports that are connected

If the VBT says that a certain port should be eDP (and hence fused off
from HDMI), but in reality it isn't, we need to try and acquire the HDMI
connection instead. So only trust the VBT edp setting if we can connect
to an eDP device on that port.

Fixes: a1fb43a6ce (drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV)
References: https://bugs.freedesktop.org/show_bug.cgi?id=96288
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Phidias Chiang <phidias.chiang@canonical.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1464766070-31623-1-git-send-email-chris@chris-wilson.co.uk
(cherry picked from commit 457c52d87e5dac9a4cf1a6a287e60ea7645067d4)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h