Re: [PATCH v4 17/39] drm/msm/dp: Add catalog support for 3rd/4th stream MST

Dmitry Baryshkov
2026-04-11T18:24:30Z

Nit, there is no catalog anymore, please fix the subject line.

On Fri, Apr 10, 2026 at 05:33:52PM +0800, Yongxing Mou wrote:
> To support 4-stream MST, the link clocks for stream 3 and stream 4 are
> controlled by MST_2_LCLK and MST_3_LCLK which share the same register
> definitions but use different base addresses.
>
> Signed-off-by: Yongxing Mou <yongxing.mou@oss.qualcomm.com>
> ---
> drivers/gpu/drm/msm/dp/dp_ctrl.c | 225 ++++++++++++++++++++++--------------
> drivers/gpu/drm/msm/dp/dp_ctrl.h | 4 +-
> drivers/gpu/drm/msm/dp/dp_display.c | 24 +++-
> drivers/gpu/drm/msm/dp/dp_panel.c | 135 +++++++++++++++++-----
> drivers/gpu/drm/msm/dp/dp_panel.h | 2 +
> drivers/gpu/drm/msm/dp/dp_reg.h | 16 ++-
> 6 files changed, 283 insertions(+), 123 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
> index a52bcd9ea2a3..1109b2df21be 100644
> --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
> +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
> @@ -118,6 +118,8 @@ struct msm_dp_ctrl_private {
> struct msm_dp_link *link;
> void __iomem *ahb_base;
> void __iomem *link_base;
> + void __iomem *mst2link_base;
> + void __iomem *mst3link_base;
>
> struct phy *phy;
>
> @@ -158,19 +160,45 @@ static inline void msm_dp_write_ahb(struct msm_dp_ctrl_private *ctrl,
> writel(data, ctrl->ahb_base + offset);
> }
>
> -static inline u32 msm_dp_read_link(struct msm_dp_ctrl_private *ctrl, u32 offset)
> +static inline u32 msm_dp_read_link(struct msm_dp_ctrl_private *ctrl,
> + enum msm_dp_stream_id stream_id, u32 offset)
> {
> - return readl_relaxed(ctrl->link_base + offset);
> + switch (stream_id) {
> + case DP_STREAM_0:
> + case DP_STREAM_1:

Continuing the comment from the previous patch:

Or, can we remap all offsets here? It would be much, much easier to
always pass REG_DP_foo and then here, in the link reading code, remap
the offsets for DP_STREAM_1.

> + return readl_relaxed(ctrl->link_base + offset);
> + case DP_STREAM_2:
> + return readl_relaxed(ctrl->mst2link_base + offset);
> + case DP_STREAM_3:
> + return readl_relaxed(ctrl->mst3link_base + offset);
> + default:
> + DRM_ERROR("error stream_id\n");
> + return 0;
> + }
> }
>
> static inline void msm_dp_write_link(struct msm_dp_ctrl_private *ctrl,
> - u32 offset, u32 data)
> + enum msm_dp_stream_id stream_id, u32 offset, u32 data)
> {
> /*
> * To make sure link reg writes happens before any other operation,
> * this function uses writel() instread of writel_relaxed()
> */
> - writel(data, ctrl->link_base + offset);
> + switch (stream_id) {
> + case DP_STREAM_0:
> + case DP_STREAM_1:
> + writel(data, ctrl->link_base + offset);
> + break;
> + case DP_STREAM_2:
> + writel(data, ctrl->mst2link_base + offset);
> + break;
> + case DP_STREAM_3:
> + writel(data, ctrl->mst3link_base + offset);
> + break;
> + default:
> + DRM_ERROR("error stream_id\n");
> + break;
> + }
> }
>
> static int msm_dp_aux_link_configure(struct drm_dp_aux *aux,
> @@ -294,18 +322,18 @@ static void msm_dp_ctrl_psr_mainlink_enable(struct msm_dp_ctrl_private *ctrl)
> {
> u32 val;
>
> - val = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + val = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
> val |= DP_MAINLINK_CTRL_ENABLE;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, val);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, val);

Are those always using the link0 base? If so, can we keep the existing
API for the stream-independent registers and introduce a separate API
call for the stream-dependent calls? Generally, if you keep the existing
function, I think, it becomes easier to squash this and the previous
patches.

> }
>
> static void msm_dp_ctrl_psr_mainlink_disable(struct msm_dp_ctrl_private *ctrl)
> {
> u32 val;
>
> - val = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + val = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
> val &= ~DP_MAINLINK_CTRL_ENABLE;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, val);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, val);
> }
>
> static void msm_dp_ctrl_mainlink_enable(struct msm_dp_ctrl_private *ctrl)
> @@ -314,21 +342,21 @@ static void msm_dp_ctrl_mainlink_enable(struct msm_dp_ctrl_private *ctrl)
>
> drm_dbg_dp(ctrl->drm_dev, "enable\n");
>
> - mainlink_ctrl = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + mainlink_ctrl = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
>
> mainlink_ctrl &= ~(DP_MAINLINK_CTRL_RESET |
> DP_MAINLINK_CTRL_ENABLE);
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
>
> mainlink_ctrl |= DP_MAINLINK_CTRL_RESET;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
>
> mainlink_ctrl &= ~DP_MAINLINK_CTRL_RESET;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
>
> mainlink_ctrl |= (DP_MAINLINK_CTRL_ENABLE |
> DP_MAINLINK_FB_BOUNDARY_SEL);
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> }
>
> static void msm_dp_ctrl_mainlink_disable(struct msm_dp_ctrl_private *ctrl)
> @@ -337,23 +365,23 @@ static void msm_dp_ctrl_mainlink_disable(struct msm_dp_ctrl_private *ctrl)
>
> drm_dbg_dp(ctrl->drm_dev, "disable\n");
>
> - mainlink_ctrl = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + mainlink_ctrl = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
> mainlink_ctrl &= ~DP_MAINLINK_CTRL_ENABLE;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> }
>
> static void msm_dp_setup_peripheral_flush(struct msm_dp_ctrl_private *ctrl)
> {
> u32 mainlink_ctrl;
>
> - mainlink_ctrl = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + mainlink_ctrl = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
>
> if (ctrl->hw_revision >= DP_HW_VERSION_1_2)
> mainlink_ctrl |= DP_MAINLINK_FLUSH_MODE_SDE_PERIPH_UPDATE;
> else
> mainlink_ctrl |= DP_MAINLINK_FLUSH_MODE_UPDATE_SDP;
>
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, mainlink_ctrl);
> }
>
> static bool msm_dp_ctrl_mainlink_ready(struct msm_dp_ctrl_private *ctrl)
> @@ -380,7 +408,7 @@ void msm_dp_ctrl_push_idle(struct msm_dp_ctrl *msm_dp_ctrl)
> ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl);
>
> reinit_completion(&ctrl->idle_comp);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, DP_STATE_CTRL_PUSH_IDLE);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, DP_STATE_CTRL_PUSH_IDLE);
>
> if (!wait_for_completion_timeout(&ctrl->idle_comp,
> IDLE_PATTERN_COMPLETION_TIMEOUT_JIFFIES))
> @@ -395,7 +423,11 @@ static void msm_dp_ctrl_config_ctrl_streams(struct msm_dp_ctrl_private *ctrl,
> u32 config = 0, tbd;
> u32 reg_offset = 0;
>
> - config = msm_dp_read_link(ctrl, REG_DP_CONFIGURATION_CTRL);
> + if (msm_dp_panel->stream_id == DP_STREAM_0)
> + config = msm_dp_read_link(ctrl, 0, REG_DP_CONFIGURATION_CTRL);
> +
> + if (msm_dp_panel->stream_id == DP_STREAM_1)
> + reg_offset = REG_DP1_CONFIGURATION_CTRL - REG_DP_CONFIGURATION_CTRL;
>
> if (msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420)
> config |= DP_CONFIGURATION_CTRL_RGB_YUV; /* YUV420 */
> @@ -410,8 +442,10 @@ static void msm_dp_ctrl_config_ctrl_streams(struct msm_dp_ctrl_private *ctrl,
>
> drm_dbg_dp(ctrl->drm_dev, "stream DP_CONFIGURATION_CTRL=0x%x\n", config);
>
> - if (msm_dp_panel->stream_id == DP_STREAM_1)
> - reg_offset = REG_DP1_CONFIGURATION_CTRL - REG_DP_CONFIGURATION_CTRL;
> + msm_dp_write_link(ctrl, msm_dp_panel->stream_id, msm_dp_panel->stream_id > 1 ?
> + REG_DP_MSTLINK_CONFIGURATION_CTRL :
> + REG_DP_CONFIGURATION_CTRL + reg_offset, config);
> +

Yep, it would definitely help to handle these differences in the link
writing code.

> }
>
> static void msm_dp_ctrl_config_ctrl_link(struct msm_dp_ctrl_private *ctrl)
> @@ -441,7 +475,7 @@ static void msm_dp_ctrl_config_ctrl_link(struct msm_dp_ctrl_private *ctrl)
>
> drm_dbg_dp(ctrl->drm_dev, "link DP_CONFIGURATION_CTRL=0x%x\n", config);
>
> - msm_dp_write_link(ctrl, REG_DP_CONFIGURATION_CTRL, config);
> + msm_dp_write_link(ctrl, 0, REG_DP_CONFIGURATION_CTRL, config);
> }
>
> static void msm_dp_ctrl_lane_mapping(struct msm_dp_ctrl_private *ctrl)
> @@ -454,8 +488,8 @@ static void msm_dp_ctrl_lane_mapping(struct msm_dp_ctrl_private *ctrl)
> ln_mapping |= lane_map[2] << LANE2_MAPPING_SHIFT;
> ln_mapping |= lane_map[3] << LANE3_MAPPING_SHIFT;
>
> - msm_dp_write_link(ctrl, REG_DP_LOGICAL2PHYSICAL_LANE_MAPPING,
> - ln_mapping);
> + msm_dp_write_link(ctrl, 0, REG_DP_LOGICAL2PHYSICAL_LANE_MAPPING,
> + ln_mapping);
> }
>
> static void msm_dp_ctrl_config_misc1_misc0(struct msm_dp_ctrl_private *ctrl,
> @@ -471,7 +505,8 @@ static void msm_dp_ctrl_config_misc1_misc0(struct msm_dp_ctrl_private *ctrl,
> if (msm_dp_panel->stream_id == DP_STREAM_1)
> reg_offset = REG_DP1_MISC1_MISC0 - REG_DP_MISC1_MISC0;
>
> - misc_val = msm_dp_read_link(ctrl, REG_DP_MISC1_MISC0 + reg_offset);
> + misc_val = msm_dp_read_link(ctrl, msm_dp_panel->stream_id, msm_dp_panel->stream_id > 1 ?
> + REG_DP_MSTLINK_MISC1_MISC0 : REG_DP_MISC1_MISC0 + reg_offset);
>
> /* clear bpp bits */
> misc_val &= ~(0x07 << DP_MISC0_TEST_BITS_DEPTH_SHIFT);
> @@ -481,7 +516,10 @@ static void msm_dp_ctrl_config_misc1_misc0(struct msm_dp_ctrl_private *ctrl,
> misc_val |= DP_MISC0_SYNCHRONOUS_CLK;
>
> drm_dbg_dp(ctrl->drm_dev, "misc settings = 0x%x\n", misc_val);
> - msm_dp_write_link(ctrl, REG_DP_MISC1_MISC0 + reg_offset, misc_val);
> + msm_dp_write_link(ctrl, msm_dp_panel->stream_id,
> + msm_dp_panel->stream_id > 1 ?
> + REG_DP_MSTLINK_MISC1_MISC0 : REG_DP_MISC1_MISC0 + reg_offset,
> + misc_val);
> }
>
> static void msm_dp_ctrl_configure_source_params(struct msm_dp_ctrl_private *ctrl,
> @@ -1307,9 +1345,9 @@ static void msm_dp_ctrl_setup_tr_unit(struct msm_dp_ctrl_private *ctrl)
> pr_debug("dp_tu=0x%x, valid_boundary=0x%x, valid_boundary2=0x%x\n",
> msm_dp_tu, valid_boundary, valid_boundary2);
>
> - msm_dp_write_link(ctrl, REG_DP_VALID_BOUNDARY, valid_boundary);
> - msm_dp_write_link(ctrl, REG_DP_TU, msm_dp_tu);
> - msm_dp_write_link(ctrl, REG_DP_VALID_BOUNDARY_2, valid_boundary2);
> + msm_dp_write_link(ctrl, 0, REG_DP_VALID_BOUNDARY, valid_boundary);
> + msm_dp_write_link(ctrl, 0, REG_DP_TU, msm_dp_tu);
> + msm_dp_write_link(ctrl, 0, REG_DP_VALID_BOUNDARY_2, valid_boundary2);
> }
>
> static int msm_dp_ctrl_wait4video_ready(struct msm_dp_ctrl_private *ctrl)
> @@ -1426,7 +1464,7 @@ static int msm_dp_ctrl_set_pattern_state_bit(struct msm_dp_ctrl_private *ctrl,
>
> bit = BIT(state_bit - 1);
> drm_dbg_dp(ctrl->drm_dev, "hw: bit=%d train=%d\n", bit, state_bit);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, bit);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, bit);
>
> bit = BIT(state_bit - 1) << DP_MAINLINK_READY_LINK_TRAINING_SHIFT;
>
> @@ -1453,7 +1491,7 @@ static int msm_dp_ctrl_link_train_1(struct msm_dp_ctrl_private *ctrl,
> delay_us = drm_dp_read_clock_recovery_delay(ctrl->aux,
> ctrl->panel->dpcd, dp_phy, false);
>
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, 0);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, 0);
>
> *training_step = DP_TRAINING_1;
>
> @@ -1577,7 +1615,7 @@ static int msm_dp_ctrl_link_train_2(struct msm_dp_ctrl_private *ctrl,
> delay_us = drm_dp_read_channel_eq_delay(ctrl->aux,
> ctrl->panel->dpcd, dp_phy, false);
>
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, 0);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, 0);
>
> *training_step = DP_TRAINING_2;
>
> @@ -1694,7 +1732,7 @@ static int msm_dp_ctrl_link_train(struct msm_dp_ctrl_private *ctrl,
> }
>
> end:
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, 0);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, 0);
>
> return ret;
> }
> @@ -1840,34 +1878,34 @@ static int msm_dp_ctrl_enable_mainlink_clocks(struct msm_dp_ctrl_private *ctrl)
> static void msm_dp_ctrl_enable_sdp(struct msm_dp_ctrl_private *ctrl)
> {
> /* trigger sdp */
> - msm_dp_write_link(ctrl, MMSS_DP_SDP_CFG3, UPDATE_SDP);
> - msm_dp_write_link(ctrl, MMSS_DP_SDP_CFG3, 0x0);
> + msm_dp_write_link(ctrl, 0, MMSS_DP_SDP_CFG3, UPDATE_SDP);
> + msm_dp_write_link(ctrl, 0, MMSS_DP_SDP_CFG3, 0x0);
> }
>
> static void msm_dp_ctrl_psr_enter(struct msm_dp_ctrl_private *ctrl)
> {
> u32 cmd;
>
> - cmd = msm_dp_read_link(ctrl, REG_PSR_CMD);
> + cmd = msm_dp_read_link(ctrl, 0, REG_PSR_CMD);
>
> cmd &= ~(PSR_ENTER | PSR_EXIT);
> cmd |= PSR_ENTER;
>
> msm_dp_ctrl_enable_sdp(ctrl);
> - msm_dp_write_link(ctrl, REG_PSR_CMD, cmd);
> + msm_dp_write_link(ctrl, 0, REG_PSR_CMD, cmd);
> }
>
> static void msm_dp_ctrl_psr_exit(struct msm_dp_ctrl_private *ctrl)
> {
> u32 cmd;
>
> - cmd = msm_dp_read_link(ctrl, REG_PSR_CMD);
> + cmd = msm_dp_read_link(ctrl, 0, REG_PSR_CMD);
>
> cmd &= ~(PSR_ENTER | PSR_EXIT);
> cmd |= PSR_EXIT;
>
> msm_dp_ctrl_enable_sdp(ctrl);
> - msm_dp_write_link(ctrl, REG_PSR_CMD, cmd);
> + msm_dp_write_link(ctrl, 0, REG_PSR_CMD, cmd);
> }
>
> void msm_dp_ctrl_config_psr(struct msm_dp_ctrl *msm_dp_ctrl)
> @@ -1880,9 +1918,9 @@ void msm_dp_ctrl_config_psr(struct msm_dp_ctrl *msm_dp_ctrl)
> return;
>
> /* enable PSR1 function */
> - cfg = msm_dp_read_link(ctrl, REG_PSR_CONFIG);
> + cfg = msm_dp_read_link(ctrl, 0, REG_PSR_CONFIG);
> cfg |= PSR1_SUPPORTED;
> - msm_dp_write_link(ctrl, REG_PSR_CONFIG, cfg);
> + msm_dp_write_link(ctrl, 0, REG_PSR_CONFIG, cfg);
>
> msm_dp_ctrl_config_psr_interrupt(ctrl);
> msm_dp_ctrl_enable_sdp(ctrl);
> @@ -1921,16 +1959,16 @@ void msm_dp_ctrl_set_psr(struct msm_dp_ctrl *msm_dp_ctrl, bool enter)
> }
>
> msm_dp_ctrl_push_idle(msm_dp_ctrl);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, 0);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, 0);
>
> msm_dp_ctrl_psr_mainlink_disable(ctrl);
> } else {
> msm_dp_ctrl_psr_mainlink_enable(ctrl);
>
> msm_dp_ctrl_psr_exit(ctrl);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, DP_STATE_CTRL_SEND_VIDEO);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, DP_STATE_CTRL_SEND_VIDEO);
> msm_dp_ctrl_wait4video_ready(ctrl);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, 0);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, 0);
> }
> }
>
> @@ -2041,7 +2079,7 @@ static int msm_dp_ctrl_link_maintenance(struct msm_dp_ctrl_private *ctrl)
>
> msm_dp_ctrl_clear_training_pattern(ctrl, DP_PHY_DPRX);
>
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, DP_STATE_CTRL_SEND_VIDEO);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, DP_STATE_CTRL_SEND_VIDEO);
>
> ret = msm_dp_ctrl_wait4video_ready(ctrl);
> end:
> @@ -2056,72 +2094,72 @@ static void msm_dp_ctrl_send_phy_pattern(struct msm_dp_ctrl_private *ctrl,
> u32 value = 0x0;
>
> /* Make sure to clear the current pattern before starting a new one */
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, 0x0);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, 0x0);
>
> drm_dbg_dp(ctrl->drm_dev, "pattern: %#x\n", pattern);
> switch (pattern) {
> case DP_PHY_TEST_PATTERN_D10_2:
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL,
> - DP_STATE_CTRL_LINK_TRAINING_PATTERN1);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL,
> + DP_STATE_CTRL_LINK_TRAINING_PATTERN1);
> break;
>
> case DP_PHY_TEST_PATTERN_ERROR_COUNT:
> value &= ~(1 << 16);
> - msm_dp_write_link(ctrl, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> - value);
> + msm_dp_write_link(ctrl, 0, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> + value);
> value |= SCRAMBLER_RESET_COUNT_VALUE;
> - msm_dp_write_link(ctrl, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> - value);
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_LEVELS,
> - DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL,
> - DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE);
> + msm_dp_write_link(ctrl, 0, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> + value);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_LEVELS,
> + DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL,
> + DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE);
> break;
>
> case DP_PHY_TEST_PATTERN_PRBS7:
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL,
> - DP_STATE_CTRL_LINK_PRBS7);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL,
> + DP_STATE_CTRL_LINK_PRBS7);
> break;
>
> case DP_PHY_TEST_PATTERN_80BIT_CUSTOM:
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL,
> - DP_STATE_CTRL_LINK_TEST_CUSTOM_PATTERN);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL,
> + DP_STATE_CTRL_LINK_TEST_CUSTOM_PATTERN);
> /* 00111110000011111000001111100000 */
> - msm_dp_write_link(ctrl, REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG0,
> - 0x3E0F83E0);
> + msm_dp_write_link(ctrl, 0, REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG0,
> + 0x3E0F83E0);
> /* 00001111100000111110000011111000 */
> - msm_dp_write_link(ctrl, REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG1,
> - 0x0F83E0F8);
> + msm_dp_write_link(ctrl, 0, REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG1,
> + 0x0F83E0F8);
> /* 1111100000111110 */
> - msm_dp_write_link(ctrl, REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG2,
> - 0x0000F83E);
> + msm_dp_write_link(ctrl, 0, REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG2,
> + 0x0000F83E);
> break;
>
> case DP_PHY_TEST_PATTERN_CP2520:
> - value = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + value = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
> value &= ~DP_MAINLINK_CTRL_SW_BYPASS_SCRAMBLER;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, value);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, value);
>
> value = DP_HBR2_ERM_PATTERN;
> - msm_dp_write_link(ctrl, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> - value);
> + msm_dp_write_link(ctrl, 0, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> + value);
> value |= SCRAMBLER_RESET_COUNT_VALUE;
> - msm_dp_write_link(ctrl, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> - value);
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_LEVELS,
> - DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL,
> - DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE);
> - value = msm_dp_read_link(ctrl, REG_DP_MAINLINK_CTRL);
> + msm_dp_write_link(ctrl, 0, REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET,
> + value);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_LEVELS,
> + DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL,
> + DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE);
> + value = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_CTRL);
> value |= DP_MAINLINK_CTRL_ENABLE;
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL, value);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL, value);
> break;
>
> case DP_PHY_TEST_PATTERN_SEL_MASK:
> - msm_dp_write_link(ctrl, REG_DP_MAINLINK_CTRL,
> - DP_MAINLINK_CTRL_ENABLE);
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL,
> - DP_STATE_CTRL_LINK_TRAINING_PATTERN4);
> + msm_dp_write_link(ctrl, 0, REG_DP_MAINLINK_CTRL,
> + DP_MAINLINK_CTRL_ENABLE);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL,
> + DP_STATE_CTRL_LINK_TRAINING_PATTERN4);
> break;
>
> default:
> @@ -2149,7 +2187,7 @@ static bool msm_dp_ctrl_send_phy_test_pattern(struct msm_dp_ctrl_private *ctrl)
> msm_dp_ctrl_update_phy_vx_px(ctrl, DP_PHY_DPRX);
> msm_dp_link_send_test_response(ctrl->link);
>
> - pattern_sent = msm_dp_read_link(ctrl, REG_DP_MAINLINK_READY);
> + pattern_sent = msm_dp_read_link(ctrl, 0, REG_DP_MAINLINK_READY);
>
> switch (pattern_sent) {
> case MR_LINK_TRAINING1:
> @@ -2522,8 +2560,14 @@ static void msm_dp_ctrl_config_msa(struct msm_dp_ctrl_private *ctrl,
> nvid *= 3;
>
> drm_dbg_dp(ctrl->drm_dev, "mvid=0x%x, nvid=0x%x\n", mvid, nvid);
> - msm_dp_write_link(ctrl, REG_DP_SOFTWARE_MVID + mvid_reg_off, mvid);
> - msm_dp_write_link(ctrl, REG_DP_SOFTWARE_NVID + nvid_reg_off, nvid);
> + msm_dp_write_link(ctrl, msm_dp_panel->stream_id,
> + msm_dp_panel->stream_id > 1 ?
> + REG_MSTLINK_SOFTWARE_MVID : REG_DP_SOFTWARE_MVID + mvid_reg_off,
> + mvid);
> + msm_dp_write_link(ctrl, msm_dp_panel->stream_id,
> + msm_dp_panel->stream_id > 1 ?
> + REG_MSTLINK_SOFTWARE_NVID : REG_DP_SOFTWARE_NVID + nvid_reg_off,
> + nvid);
> }
>
> int msm_dp_ctrl_prepare_stream_on(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train)
> @@ -2593,7 +2637,8 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, struct msm_dp_panel *
>
> msm_dp_ctrl_lane_mapping(ctrl);
> msm_dp_setup_peripheral_flush(ctrl);
> - msm_dp_ctrl_config_ctrl_link(ctrl);
> + if (msm_dp_panel->stream_id == DP_STREAM_0)
> + msm_dp_ctrl_config_ctrl_link(ctrl);
>
> msm_dp_ctrl_configure_source_params(ctrl, msm_dp_panel);
>
> @@ -2607,7 +2652,7 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, struct msm_dp_panel *
>
> msm_dp_ctrl_setup_tr_unit(ctrl);
>
> - msm_dp_write_link(ctrl, REG_DP_STATE_CTRL, DP_STATE_CTRL_SEND_VIDEO);
> + msm_dp_write_link(ctrl, 0, REG_DP_STATE_CTRL, DP_STATE_CTRL_SEND_VIDEO);
>
> ret = msm_dp_ctrl_wait4video_ready(ctrl);
> if (ret)
> @@ -2787,7 +2832,9 @@ struct msm_dp_ctrl *msm_dp_ctrl_get(struct device *dev, struct msm_dp_link *link
> struct phy *phy,
> int max_stream,
> void __iomem *ahb_base,
> - void __iomem *link_base)
> + void __iomem *link_base,
> + void __iomem *mst2link_base,
> + void __iomem *mst3link_base)
> {
> struct msm_dp_ctrl_private *ctrl;
> int ret;
> @@ -2827,6 +2874,8 @@ struct msm_dp_ctrl *msm_dp_ctrl_get(struct device *dev, struct msm_dp_link *link
> ctrl->phy = phy;
> ctrl->ahb_base = ahb_base;
> ctrl->link_base = link_base;
> + ctrl->mst2link_base = mst2link_base;
> + ctrl->mst3link_base = mst3link_base;
>
> ret = msm_dp_ctrl_clk_init(&ctrl->msm_dp_ctrl, max_stream);
> if (ret) {
> diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h
> index 6fed3ff3a72d..e72d501ac1ce 100644
> --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h
> +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h
> @@ -31,7 +31,9 @@ struct msm_dp_ctrl *msm_dp_ctrl_get(struct device *dev,
> struct phy *phy,
> int max_stream,
> void __iomem *ahb_base,
> - void __iomem *link_base);
> + void __iomem *link_base,
> + void __iomem *mst2link_base,
> + void __iomem *mst3link_base);
>
> void msm_dp_ctrl_reset(struct msm_dp_ctrl *msm_dp_ctrl);
> void msm_dp_ctrl_phy_init(struct msm_dp_ctrl *msm_dp_ctrl);
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index ff506064a3fa..a924fbd825f7 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -85,6 +85,12 @@ struct msm_dp_display_private {
> void __iomem *link_base;
> size_t link_len;
>
> + void __iomem *mst2link_base;
> + size_t mst2link_len;
> +
> + void __iomem *mst3link_base;
> + size_t mst3link_len;
> +
> void __iomem *pixel_base[DP_STREAM_MAX];
> size_t pixel_len;
>
> @@ -561,7 +567,8 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp)
> goto error_link;
> }
>
> - dp->panel = msm_dp_panel_get(dev, dp->aux, dp->link, dp->link_base, dp->pixel_base[0]);
> + dp->panel = msm_dp_panel_get(dev, dp->aux, dp->link, dp->link_base,
> + dp->mst2link_base, dp->mst3link_base, dp->pixel_base[0]);
> if (IS_ERR(dp->panel)) {
> rc = PTR_ERR(dp->panel);
> DRM_ERROR("failed to initialize panel, rc = %d\n", rc);
> @@ -570,7 +577,8 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp)
> }
>
> dp->ctrl = msm_dp_ctrl_get(dev, dp->link, dp->panel, dp->aux,
> - phy, dp->max_stream, dp->ahb_base, dp->link_base);
> + phy, dp->max_stream, dp->ahb_base,
> + dp->link_base, dp->mst2link_base, dp->mst3link_base);
> if (IS_ERR(dp->ctrl)) {
> rc = PTR_ERR(dp->ctrl);
> DRM_ERROR("failed to initialize ctrl, rc = %d\n", rc);
> @@ -883,6 +891,10 @@ void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp)
> msm_dp_display->aux_base, "dp_aux");
> msm_disp_snapshot_add_block(disp_state, msm_dp_display->link_len,
> msm_dp_display->link_base, "dp_link");
> + msm_disp_snapshot_add_block(disp_state, msm_dp_display->mst2link_len,
> + msm_dp_display->mst2link_base, "dp_mst2link");
> + msm_disp_snapshot_add_block(disp_state, msm_dp_display->mst3link_len,
> + msm_dp_display->mst3link_base, "dp_mst3link");
> msm_disp_snapshot_add_block(disp_state, msm_dp_display->pixel_len,
> msm_dp_display->pixel_base[0], "dp_p0");
> msm_disp_snapshot_add_block(disp_state, msm_dp_display->pixel_len,
> @@ -1228,6 +1240,14 @@ static int msm_dp_display_get_io(struct msm_dp_display_private *display)
> }
> }
>
> + display->mst2link_base = msm_dp_ioremap(pdev, 7, &display->mst2link_len);
> + if (IS_ERR(display->mst2link_base))
> + DRM_DEBUG_DP("unable to remap link region: %pe\n", display->mst2link_base);
> +
> + display->mst3link_base = msm_dp_ioremap(pdev, 8, &display->mst3link_len);
> + if (IS_ERR(display->mst3link_base))
> + DRM_DEBUG_DP("unable to remap link region: %pe\n", display->mst3link_base);
> +
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
> index 6c88cc7e3037..a8a6297b37e3 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
> @@ -25,23 +25,50 @@ struct msm_dp_panel_private {
> struct drm_dp_aux *aux;
> struct msm_dp_link *link;
> void __iomem *link_base;
> + void __iomem *mst2link_base;
> + void __iomem *mst3link_base;
> void __iomem *pixel_base;
> bool panel_on;
> };
>
> static inline u32 msm_dp_read_link(struct msm_dp_panel_private *panel, u32 offset)
> {
> - return readl_relaxed(panel->link_base + offset);
> + switch (panel->msm_dp_panel.stream_id) {
> + case DP_STREAM_0:
> + case DP_STREAM_1:
> + return readl_relaxed(panel->link_base + offset);
> + case DP_STREAM_2:
> + return readl_relaxed(panel->mst2link_base + offset);
> + case DP_STREAM_3:
> + return readl_relaxed(panel->mst3link_base + offset);
> + default:
> + DRM_ERROR("error stream_id\n");
> + return 0;
> + }
> }
>
> static inline void msm_dp_write_link(struct msm_dp_panel_private *panel,
> - u32 offset, u32 data)
> + u32 offset, u32 data)
> {
> /*
> * To make sure link reg writes happens before any other operation,
> * this function uses writel() instread of writel_relaxed()
> */
> - writel(data, panel->link_base + offset);
> + switch (panel->msm_dp_panel.stream_id) {
> + case DP_STREAM_0:
> + case DP_STREAM_1:
> + writel(data, panel->link_base + offset);
> + break;
> + case DP_STREAM_2:
> + writel(data, panel->mst2link_base + offset);
> + break;
> + case DP_STREAM_3:
> + writel(data, panel->mst3link_base + offset);
> + break;
> + default:
> + DRM_ERROR("error stream_id\n");
> + break;
> + }
> }
>
> static inline void msm_dp_write_pn(struct msm_dp_panel_private *panel,
> @@ -444,38 +471,51 @@ void msm_dp_panel_clear_dsc_dto(struct msm_dp_panel *msm_dp_panel)
>
> static void msm_dp_panel_send_vsc_sdp(struct msm_dp_panel_private *panel, struct dp_sdp *vsc_sdp)
> {
> + u32 id = panel->msm_dp_panel.stream_id;
> u32 header[2];
> u32 val;
> int i;
> u32 offset = 0;
>
> - if (panel->msm_dp_panel.stream_id == DP_STREAM_1)
> + if (id == DP_STREAM_1)
> offset = MMSS_DP1_GENERIC0_0 - MMSS_DP_GENERIC0_0;
>
> msm_dp_utils_pack_sdp_header(&vsc_sdp->sdp_header, header);
>
> - msm_dp_write_link(panel, MMSS_DP_GENERIC0_0 + offset, header[0]);
> - msm_dp_write_link(panel, MMSS_DP_GENERIC0_1 + offset, header[1]);
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_GENERIC0_0 : MMSS_DP_GENERIC0_0 + offset,
> + header[0]);
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_GENERIC0_1 : MMSS_DP_GENERIC0_1 + offset,
> + header[1]);
>
> for (i = 0; i < sizeof(vsc_sdp->db); i += 4) {
> val = ((vsc_sdp->db[i]) | (vsc_sdp->db[i + 1] << 8) | (vsc_sdp->db[i + 2] << 16) |
> (vsc_sdp->db[i + 3] << 24));
> - msm_dp_write_link(panel, MMSS_DP_GENERIC0_2 + i + offset, val);
> +
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_GENERIC0_2 + i : MMSS_DP_GENERIC0_2 + i + offset,
> + val);
> }
> }
>
> static void msm_dp_panel_update_sdp(struct msm_dp_panel_private *panel)
> {
> + u32 id = panel->msm_dp_panel.stream_id;
> u32 hw_revision = panel->msm_dp_panel.hw_revision;
> u32 offset = 0;
>
> - if (panel->msm_dp_panel.stream_id == DP_STREAM_1)
> + if (id == DP_STREAM_1)
> offset = MMSS_DP1_SDP_CFG3 - MMSS_DP_SDP_CFG3;
>
> if (hw_revision >= DP_HW_VERSION_1_0 &&
> hw_revision < DP_HW_VERSION_1_2) {
> - msm_dp_write_link(panel, MMSS_DP_SDP_CFG3 + offset, UPDATE_SDP);
> - msm_dp_write_link(panel, MMSS_DP_SDP_CFG3 + offset, 0x0);
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG3 : MMSS_DP_SDP_CFG3 + offset,
> + UPDATE_SDP);
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG3 : MMSS_DP_SDP_CFG3 + offset,
> + 0x0);
> }
> }
>
> @@ -483,26 +523,34 @@ void msm_dp_panel_enable_vsc_sdp(struct msm_dp_panel *msm_dp_panel, struct dp_sd
> {
> struct msm_dp_panel_private *panel =
> container_of(msm_dp_panel, struct msm_dp_panel_private, msm_dp_panel);
> + u32 id = msm_dp_panel->stream_id;
> u32 cfg, cfg2, misc;
> u32 misc_reg_offset = 0;
> u32 sdp_cfg_offset = 0;
> u32 sdp_cfg2_offset = 0;
>
> - if (msm_dp_panel->stream_id == DP_STREAM_1) {
> + if (id == DP_STREAM_1) {
> misc_reg_offset = REG_DP1_MISC1_MISC0 - REG_DP_MISC1_MISC0;
> sdp_cfg_offset = MMSS_DP1_SDP_CFG - MMSS_DP_SDP_CFG;
> sdp_cfg2_offset = MMSS_DP1_SDP_CFG2 - MMSS_DP_SDP_CFG2;
> }
>
> - cfg = msm_dp_read_link(panel, MMSS_DP_SDP_CFG + sdp_cfg_offset);
> - cfg2 = msm_dp_read_link(panel, MMSS_DP_SDP_CFG2 + sdp_cfg2_offset);
> - misc = msm_dp_read_link(panel, REG_DP_MISC1_MISC0 + misc_reg_offset);
> + cfg = msm_dp_read_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG : MMSS_DP_SDP_CFG + sdp_cfg_offset);
> + cfg2 = msm_dp_read_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG2 : MMSS_DP_SDP_CFG2 + sdp_cfg2_offset);
> + misc = msm_dp_read_link(panel, id > 1 ?
> + REG_DP_MSTLINK_MISC1_MISC0 : REG_DP_MISC1_MISC0 + misc_reg_offset);
>
> cfg |= GEN0_SDP_EN;
> - msm_dp_write_link(panel, MMSS_DP_SDP_CFG + sdp_cfg_offset, cfg);
> -
> cfg2 |= GENERIC0_SDPSIZE_VALID;
> - msm_dp_write_link(panel, MMSS_DP_SDP_CFG2 + sdp_cfg2_offset, cfg2);
> +
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG : MMSS_DP_SDP_CFG + sdp_cfg_offset,
> + cfg);
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG2 : MMSS_DP_SDP_CFG2 + sdp_cfg2_offset,
> + cfg2);
>
> msm_dp_panel_send_vsc_sdp(panel, vsc_sdp);
>
> @@ -512,7 +560,9 @@ void msm_dp_panel_enable_vsc_sdp(struct msm_dp_panel *msm_dp_panel, struct dp_sd
> drm_dbg_dp(panel->drm_dev, "vsc sdp enable=1\n");
>
> pr_debug("misc settings = 0x%x\n", misc);
> - msm_dp_write_link(panel, REG_DP_MISC1_MISC0 + misc_reg_offset, misc);
> + msm_dp_write_link(panel, id > 1 ?
> + REG_DP_MSTLINK_MISC1_MISC0 : REG_DP_MISC1_MISC0 + misc_reg_offset,
> + misc);
>
> msm_dp_panel_update_sdp(panel);
> }
> @@ -521,26 +571,34 @@ void msm_dp_panel_disable_vsc_sdp(struct msm_dp_panel *msm_dp_panel)
> {
> struct msm_dp_panel_private *panel =
> container_of(msm_dp_panel, struct msm_dp_panel_private, msm_dp_panel);
> + u32 id = msm_dp_panel->stream_id;
> u32 cfg, cfg2, misc;
> u32 misc_reg_offset = 0;
> u32 sdp_cfg_offset = 0;
> u32 sdp_cfg2_offset = 0;
>
> - if (msm_dp_panel->stream_id == DP_STREAM_1) {
> + if (id == DP_STREAM_1) {
> misc_reg_offset = REG_DP1_MISC1_MISC0 - REG_DP_MISC1_MISC0;
> sdp_cfg_offset = MMSS_DP1_SDP_CFG - MMSS_DP_SDP_CFG;
> sdp_cfg2_offset = MMSS_DP1_SDP_CFG2 - MMSS_DP_SDP_CFG2;
> }
>
> - cfg = msm_dp_read_link(panel, MMSS_DP_SDP_CFG + sdp_cfg_offset);
> - cfg2 = msm_dp_read_link(panel, MMSS_DP_SDP_CFG2 + sdp_cfg2_offset);
> - misc = msm_dp_read_link(panel, REG_DP_MISC1_MISC0 + misc_reg_offset);
> + cfg = msm_dp_read_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG : MMSS_DP_SDP_CFG + sdp_cfg_offset);
> + cfg2 = msm_dp_read_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG2 : MMSS_DP_SDP_CFG2 + sdp_cfg2_offset);
> + misc = msm_dp_read_link(panel, id > 1 ?
> + REG_DP_MSTLINK_MISC1_MISC0 : REG_DP_MISC1_MISC0 + misc_reg_offset);
>
> cfg &= ~GEN0_SDP_EN;
> - msm_dp_write_link(panel, MMSS_DP_SDP_CFG + sdp_cfg_offset, cfg);
> -
> cfg2 &= ~GENERIC0_SDPSIZE_VALID;
> - msm_dp_write_link(panel, MMSS_DP_SDP_CFG2 + sdp_cfg2_offset, cfg2);
> +
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG : MMSS_DP_SDP_CFG + sdp_cfg_offset,
> + cfg);
> + msm_dp_write_link(panel, id > 1 ?
> + MMSS_DP_MSTLINK_SDP_CFG2 : MMSS_DP_SDP_CFG2 + sdp_cfg2_offset,
> + cfg2);
>
> /* switch back to MSA */
> misc &= ~DP_MISC1_VSC_SDP;
> @@ -548,7 +606,9 @@ void msm_dp_panel_disable_vsc_sdp(struct msm_dp_panel *msm_dp_panel)
> drm_dbg_dp(panel->drm_dev, "vsc sdp enable=0\n");
>
> pr_debug("misc settings = 0x%x\n", misc);
> - msm_dp_write_link(panel, REG_DP_MISC1_MISC0 + misc_reg_offset, misc);
> + msm_dp_write_link(panel, id > 1 ?
> + REG_DP_MSTLINK_MISC1_MISC0 : REG_DP_MISC1_MISC0 + misc_reg_offset,
> + misc);
>
> msm_dp_panel_update_sdp(panel);
> }
> @@ -598,6 +658,7 @@ static int msm_dp_panel_setup_vsc_sdp_yuv_420(struct msm_dp_panel *msm_dp_panel)
>
> int msm_dp_panel_timing_cfg(struct msm_dp_panel *msm_dp_panel, bool wide_bus_en)
> {
> + u32 id = msm_dp_panel->stream_id;
> u32 data, total_ver, total_hor;
> struct msm_dp_panel_private *panel;
> struct drm_display_mode *drm_mode;
> @@ -621,7 +682,7 @@ int msm_dp_panel_timing_cfg(struct msm_dp_panel *msm_dp_panel, bool wide_bus_en)
> drm_mode->vsync_start - drm_mode->vdisplay,
> drm_mode->vsync_end - drm_mode->vsync_start);
>
> - if (msm_dp_panel->stream_id == DP_STREAM_1)
> + if (id == DP_STREAM_1)
> offset = REG_DP1_TOTAL_HOR_VER - REG_DP_TOTAL_HOR_VER;
>
> total_hor = drm_mode->htotal;
> @@ -654,10 +715,18 @@ int msm_dp_panel_timing_cfg(struct msm_dp_panel *msm_dp_panel, bool wide_bus_en)
>
> msm_dp_active = data;
>
> - msm_dp_write_link(panel, REG_DP_TOTAL_HOR_VER + offset, total);
> - msm_dp_write_link(panel, REG_DP_START_HOR_VER_FROM_SYNC + offset, sync_start);
> - msm_dp_write_link(panel, REG_DP_HSYNC_VSYNC_WIDTH_POLARITY + offset, width_blanking);
> - msm_dp_write_link(panel, REG_DP_ACTIVE_HOR_VER + offset, msm_dp_active);
> + msm_dp_write_link(panel,
> + id > 1 ? REG_DP_MSTLINK_TOTAL_HOR_VER :
> + REG_DP_TOTAL_HOR_VER + offset, total);
> + msm_dp_write_link(panel,
> + id > 1 ? REG_DP_MSTLINK_START_HOR_VER_FROM_SYNC :
> + REG_DP_START_HOR_VER_FROM_SYNC + offset, sync_start);
> + msm_dp_write_link(panel,
> + id > 1 ? REG_DP_MSTLINK_HSYNC_VSYNC_WIDTH_POLARITY :
> + REG_DP_HSYNC_VSYNC_WIDTH_POLARITY + offset, width_blanking);
> + msm_dp_write_link(panel,
> + id > 1 ? REG_DP_MSTLINK_ACTIVE_HOR_VER :
> + REG_DP_ACTIVE_HOR_VER + offset, msm_dp_active);
>
> reg = msm_dp_read_pn(panel, MMSS_DP_INTF_CONFIG);
> if (wide_bus_en)
> @@ -726,6 +795,8 @@ int msm_dp_panel_init_panel_info(struct msm_dp_panel *msm_dp_panel)
> struct msm_dp_panel *msm_dp_panel_get(struct device *dev, struct drm_dp_aux *aux,
> struct msm_dp_link *link,
> void __iomem *link_base,
> + void __iomem *mst2link_base,
> + void __iomem *mst3link_base,
> void __iomem *pixel_base)
> {
> struct msm_dp_panel_private *panel;
> @@ -745,6 +816,8 @@ struct msm_dp_panel *msm_dp_panel_get(struct device *dev, struct drm_dp_aux *aux
> panel->link = link;
> panel->link_base = link_base;
> panel->pixel_base = pixel_base;
> + panel->mst2link_base = mst2link_base;
> + panel->mst3link_base = mst3link_base;
>
> msm_dp_panel = &panel->msm_dp_panel;
> msm_dp_panel->max_bw_code = DP_LINK_BW_8_1;
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index fe4ac3e47e17..4873c55bd693 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -101,5 +101,7 @@ static inline bool is_lane_count_valid(u32 lane_count)
> struct msm_dp_panel *msm_dp_panel_get(struct device *dev, struct drm_dp_aux *aux,
> struct msm_dp_link *link,
> void __iomem *link_base,
> + void __iomem *mst2link_base,
> + void __iomem *mst3link_base,
> void __iomem *pixel_base);
> #endif /* _DP_PANEL_H_ */
> diff --git a/drivers/gpu/drm/msm/dp/dp_reg.h b/drivers/gpu/drm/msm/dp/dp_reg.h
> index 295c1161e6b7..1c2d3d8d029d 100644
> --- a/drivers/gpu/drm/msm/dp/dp_reg.h
> +++ b/drivers/gpu/drm/msm/dp/dp_reg.h
> @@ -162,7 +162,6 @@
> #define REG_DP_START_HOR_VER_FROM_SYNC (0x00000020)
> #define REG_DP_HSYNC_VSYNC_WIDTH_POLARITY (0x00000024)
> #define REG_DP_ACTIVE_HOR_VER (0x00000028)
> -
> #define REG_DP_MISC1_MISC0 (0x0000002C)
> #define DP_MISC0_SYNCHRONOUS_CLK (0x00000001)
> #define DP_MISC0_COLORIMETRY_CFG_SHIFT (0x00000001)
> @@ -343,6 +342,21 @@
> #define MMSS_DP1_SDP_CFG2 (0x000004E4)
> #define MMSS_DP1_SDP_CFG3 (0x000004E8)
>
> +#define REG_DP_MSTLINK_CONFIGURATION_CTRL (0x00000034)
> +#define REG_MSTLINK_SOFTWARE_MVID (0x00000040)
> +#define REG_MSTLINK_SOFTWARE_NVID (0x00000044)
> +#define REG_DP_MSTLINK_TOTAL_HOR_VER (0x00000048)
> +#define REG_DP_MSTLINK_START_HOR_VER_FROM_SYNC (0x0000004C)
> +#define REG_DP_MSTLINK_HSYNC_VSYNC_WIDTH_POLARITY (0x00000050)
> +#define REG_DP_MSTLINK_ACTIVE_HOR_VER (0x00000054)
> +#define REG_DP_MSTLINK_MISC1_MISC0 (0x00000058)
> +#define MMSS_DP_MSTLINK_GENERIC0_0 (0x000000BC)
> +#define MMSS_DP_MSTLINK_GENERIC0_1 (0x000000C0)
> +#define MMSS_DP_MSTLINK_GENERIC0_2 (0x000000C4)
> +#define MMSS_DP_MSTLINK_SDP_CFG (0x0000010c)
> +#define MMSS_DP_MSTLINK_SDP_CFG2 (0x0000011c)
> +#define MMSS_DP_MSTLINK_SDP_CFG3 (0x00000114)
> +
> #define MMSS_DP_ASYNC_FIFO_CONFIG (0x00000088)
>
> #define REG_DP_PHY_AUX_INTERRUPT_CLEAR (0x0000004C)
>
> --
> 2.43.0
>

--
With best wishes
Dmitry