aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2014-11-14 09:54:22 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-12-03 03:35:25 -0500
commit17af40a835f1805e8d0523dddf1fbabe06abf230 (patch)
tree33f7eac1f4302bca7faa116f8e941782812353a3
parente7d7cad08d35329a5a783a0aa620560223fe0eb8 (diff)
drm/i915/dsi: add ports to intel_dsi to describe the ports being driven
Later on this can include multiple ports (e.g. (1 << PORT_A) | (1 << PORT_C)) to describe dual link DSI. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Gaurav K Singh <gaurav.k.singh@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_dsi.c7
-rw-r--r--drivers/gpu/drm/i915/intel_dsi.h3
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 35842a6687d8..259cb4ab2067 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -749,10 +749,13 @@ void intel_dsi_init(struct drm_device *dev)
749 intel_connector->unregister = intel_connector_unregister; 749 intel_connector->unregister = intel_connector_unregister;
750 750
751 /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */ 751 /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */
752 if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) 752 if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) {
753 intel_encoder->crtc_mask = (1 << PIPE_A); 753 intel_encoder->crtc_mask = (1 << PIPE_A);
754 else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) 754 intel_dsi->ports = (1 << PORT_A);
755 } else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) {
755 intel_encoder->crtc_mask = (1 << PIPE_B); 756 intel_encoder->crtc_mask = (1 << PIPE_B);
757 intel_dsi->ports = (1 << PORT_C);
758 }
756 759
757 for (i = 0; i < ARRAY_SIZE(intel_dsi_devices); i++) { 760 for (i = 0; i < ARRAY_SIZE(intel_dsi_devices); i++) {
758 dsi = &intel_dsi_devices[i]; 761 dsi = &intel_dsi_devices[i];
diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h
index 97a6f621774f..7f5d0280b9d7 100644
--- a/drivers/gpu/drm/i915/intel_dsi.h
+++ b/drivers/gpu/drm/i915/intel_dsi.h
@@ -78,6 +78,9 @@ struct intel_dsi {
78 78
79 struct intel_connector *attached_connector; 79 struct intel_connector *attached_connector;
80 80
81 /* bit mask of ports being driven */
82 u16 ports;
83
81 /* if true, use HS mode, otherwise LP */ 84 /* if true, use HS mode, otherwise LP */
82 bool hs; 85 bool hs;
83 86