diff options
| author | Jani Nikula | 2016-03-16 11:43:31 +0100 |
|---|---|---|
| committer | Jani Nikula | 2016-03-16 17:28:36 +0100 |
| commit | 951d9efe07877a3f1bb04e8932d11eafbfad02bf (patch) | |
| tree | 54dcaa69a73ae1f20810e8a151d2f043959b7f04 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm/i915: move VBT based LVDS presence check to intel_bios.c (diff) | |
| download | kernel-qcow2-linux-951d9efe07877a3f1bb04e8932d11eafbfad02bf.tar.gz kernel-qcow2-linux-951d9efe07877a3f1bb04e8932d11eafbfad02bf.tar.xz kernel-qcow2-linux-951d9efe07877a3f1bb04e8932d11eafbfad02bf.zip | |
drm/i915: move VBT based eDP port check to intel_bios.c
Hide knowledge about VBT child devices in intel_bios.c.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458125015-7931-3-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ba2d0242d532..3ff8f1d67594 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4993,14 +4993,6 @@ put_power: bool intel_dp_is_edp(struct drm_device *dev, enum port port) { struct drm_i915_private *dev_priv = dev->dev_private; - union child_device_config *p_child; - int i; - static const short port_mapping[] = { - [PORT_B] = DVO_PORT_DPB, - [PORT_C] = DVO_PORT_DPC, - [PORT_D] = DVO_PORT_DPD, - [PORT_E] = DVO_PORT_DPE, - }; /* * eDP not supported on g4x. so bail out early just @@ -5012,18 +5004,7 @@ bool intel_dp_is_edp(struct drm_device *dev, enum port port) if (port == PORT_A) return true; - if (!dev_priv->vbt.child_dev_num) - return false; - - for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { - p_child = dev_priv->vbt.child_dev + i; - - if (p_child->common.dvo_port == port_mapping[port] && - (p_child->common.device_type & DEVICE_TYPE_eDP_BITS) == - (DEVICE_TYPE_eDP & DEVICE_TYPE_eDP_BITS)) - return true; - } - return false; + return intel_bios_is_port_edp(dev_priv, port); } void |