Commit bda4a7ab authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/dsi: Extract port_ctrl_reg()

The code to determine the pre-ICL DSI port control register is
repeated several times. Consolidate.

vlv_dsi_clear_device_ready() is left with the open-coded version
due to the weirdness with port A vs. C on VLV/CHV.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231101114212.9345-6-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent cf6e1165
...@@ -561,6 +561,12 @@ static void glk_dsi_clear_device_ready(struct intel_encoder *encoder) ...@@ -561,6 +561,12 @@ static void glk_dsi_clear_device_ready(struct intel_encoder *encoder)
glk_dsi_disable_mipi_io(encoder); glk_dsi_disable_mipi_io(encoder);
} }
static i915_reg_t port_ctrl_reg(struct drm_i915_private *i915, enum port port)
{
return IS_GEMINILAKE(i915) || IS_BROXTON(i915) ?
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);
}
static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder)
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
...@@ -627,8 +633,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder, ...@@ -627,8 +633,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder,
} }
for_each_dsi_port(port, intel_dsi->ports) { for_each_dsi_port(port, intel_dsi->ports) {
i915_reg_t port_ctrl = IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv) ? i915_reg_t port_ctrl = port_ctrl_reg(dev_priv, port);
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);
u32 temp; u32 temp;
temp = intel_de_read(dev_priv, port_ctrl); temp = intel_de_read(dev_priv, port_ctrl);
...@@ -664,8 +669,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder) ...@@ -664,8 +669,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)
enum port port; enum port port;
for_each_dsi_port(port, intel_dsi->ports) { for_each_dsi_port(port, intel_dsi->ports) {
i915_reg_t port_ctrl = IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv) ? i915_reg_t port_ctrl = port_ctrl_reg(dev_priv, port);
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);
/* de-assert ip_tg_enable signal */ /* de-assert ip_tg_enable signal */
intel_de_rmw(dev_priv, port_ctrl, DPI_ENABLE, 0); intel_de_rmw(dev_priv, port_ctrl, DPI_ENABLE, 0);
...@@ -955,9 +959,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, ...@@ -955,9 +959,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
/* XXX: this only works for one DSI output */ /* XXX: this only works for one DSI output */
for_each_dsi_port(port, intel_dsi->ports) { for_each_dsi_port(port, intel_dsi->ports) {
i915_reg_t ctrl_reg = IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv) ? i915_reg_t port_ctrl = port_ctrl_reg(dev_priv, port);
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port); bool enabled = intel_de_read(dev_priv, port_ctrl) & DPI_ENABLE;
bool enabled = intel_de_read(dev_priv, ctrl_reg) & DPI_ENABLE;
/* /*
* Due to some hardware limitations on VLV/CHV, the DPI enable * Due to some hardware limitations on VLV/CHV, the DPI enable
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment