diff options
author | Jani Nikula <jani.nikula@intel.com> | 2016-03-18 17:05:44 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-03-21 12:59:09 +0200 |
commit | 2e85ab4fed5762f86ae12c0347e64b89412191ca (patch) | |
tree | a01c0577730007f65659115323bbe031ae948999 /drivers/gpu/drm/i915 | |
parent | 701d25b40c2e69a0b8e472a8b40a13a0b051bb43 (diff) | |
download | talos-op-linux-2e85ab4fed5762f86ae12c0347e64b89412191ca.tar.gz talos-op-linux-2e85ab4fed5762f86ae12c0347e64b89412191ca.zip |
drm/i915/bxt: allow dsi on any pipe
BXT isn't as limited as BYT and CHT regarding DSI pipes and ports.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/0375f1e237092d0ae3f39ecfc5702024918acbfd.1458313400.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dsi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index dd6f7bc4f444..456676c00059 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -1198,8 +1198,13 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; intel_connector->unregister = intel_connector_unregister; - /* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */ - if (port == PORT_A) + /* + * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI + * port C. BXT isn't limited like this. + */ + if (IS_BROXTON(dev_priv)) + intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C); + else if (port == PORT_A) intel_encoder->crtc_mask = BIT(PIPE_A); else intel_encoder->crtc_mask = BIT(PIPE_B); |