drm/i915: move VBT based DSI presence check to intel_bios.c

Hide knowledge about VBT child devices in intel_bios.c.

v2: Move port check to intel_bios.c (Sivakumar)

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-4-git-send-email-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e252978d6f1ba5c7d2da80eab0f7578c86bb14bc..f6a84baa02bda93c4304c5269f744cc294b1075d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1468,7 +1468,6 @@ struct intel_vbt_data {
 
        /* MIPI DSI */
        struct {
-               u16 port;
                u16 panel_id;
                struct mipi_config *config;
                struct mipi_pps_data *pps;
@@ -3356,6 +3355,7 @@ bool intel_bios_is_valid_vbt(const void *buf, size_t size);
 bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
 bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
 bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
+bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
 
 /* intel_opregion.c */
 #ifdef CONFIG_ACPI

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 7f61ca8165f0af90a7ca0ea552afb348a595de84..4b6bd6f2e1938fa5f0796cf214b74fcc69811c7e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1237,7 +1237,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
                    &&p_child->common.device_type & DEVICE_TYPE_MIPI_OUTPUT) {
                        DRM_DEBUG_KMS("Found MIPI as LFP\n");
                        dev_priv->vbt.has_mipi = 1;
-                       dev_priv->vbt.dsi.port = p_child->common.dvo_port;
                }
 
                child_dev_ptr = dev_priv->vbt.child_dev + count;
@@ -1555,3 +1554,41 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port)
 
        return false;
 }
+
+/**
+ * intel_bios_is_dsi_present - is DSI present in VBT
+ * @dev_priv:  i915 device instance
+ * @port:      port for DSI if present
+ *
+ * Return true if DSI is present, and return the port in %port.
+ */
+bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv,
+                              enum port *port)
+{
+       union child_device_config *p_child;
+       u8 dvo_port;
+       int i;
+
+       for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
+               p_child = dev_priv->vbt.child_dev + i;
+
+               if (!(p_child->common.device_type & DEVICE_TYPE_MIPI_OUTPUT))
+                       continue;
+
+               dvo_port = p_child->common.dvo_port;
+
+               switch (dvo_port) {
+               case DVO_PORT_MIPIA:
+               case DVO_PORT_MIPIC:
+                       *port = dvo_port - DVO_PORT_MIPIA;
+                       return true;
+               case DVO_PORT_MIPIB:
+               case DVO_PORT_MIPID:
+                       DRM_DEBUG_KMS("VBT has unsupported DSI port %c\n",
+                                     port_name(dvo_port - DVO_PORT_MIPIA));
+                       break;
+               }
+       }
+
+       return false;
+}

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 475634667222c2d4c4e3f8c96289a08b8ed22e53..3562bf337e62f9561ceb94a7c21b11b12c3fefe0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1149,7 +1149,7 @@ void intel_dsi_init(struct drm_device *dev)
        DRM_DEBUG_KMS("\n");
 
        /* There is no detection method for MIPI so rely on VBT */
-       if (!dev_priv->vbt.has_mipi)
+       if (!intel_bios_is_dsi_present(dev_priv, &port))
                return;
 
        if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
@@ -1190,16 +1190,15 @@ void intel_dsi_init(struct drm_device *dev)
        intel_connector->unregister = intel_connector_unregister;
 
        /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */
-       if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) {
-               intel_encoder->crtc_mask = (1 << PIPE_A);
-               intel_dsi->ports = (1 << PORT_A);
-       } else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) {
-               intel_encoder->crtc_mask = (1 << PIPE_B);
-               intel_dsi->ports = (1 << PORT_C);
-       }
+       if (port == PORT_A)
+               intel_encoder->crtc_mask = 1 << PIPE_A;
+       else
+               intel_encoder->crtc_mask = 1 << PIPE_B;
 
        if (dev_priv->vbt.dsi.config->dual_link)
-               intel_dsi->ports = ((1 << PORT_A) | (1 << PORT_C));
+               intel_dsi->ports = (1 << PORT_A) | (1 << PORT_C);
+       else
+               intel_dsi->ports = 1 << port;
 
        /* Create a DSI host (and a device) for each port. */
        for_each_dsi_port(port, intel_dsi->ports) {