Commit f1c7a36b authored by Sean Paul's avatar Sean Paul Committed by Ramalingam C
parent 515d5755
...@@ -4042,13 +4042,14 @@ static void intel_ddi_update_pipe_dp(struct intel_atomic_state *state, ...@@ -4042,13 +4042,14 @@ static void intel_ddi_update_pipe_dp(struct intel_atomic_state *state,
intel_panel_update_backlight(state, encoder, crtc_state, conn_state); intel_panel_update_backlight(state, encoder, crtc_state, conn_state);
} }
static void intel_ddi_update_pipe(struct intel_atomic_state *state, void intel_ddi_update_pipe(struct intel_atomic_state *state,
struct intel_encoder *encoder, struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state, const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state) const struct drm_connector_state *conn_state)
{ {
if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) &&
!intel_encoder_is_mst(encoder))
intel_ddi_update_pipe_dp(state, encoder, crtc_state, intel_ddi_update_pipe_dp(state, encoder, crtc_state,
conn_state); conn_state);
......
...@@ -17,6 +17,7 @@ struct drm_encoder; ...@@ -17,6 +17,7 @@ struct drm_encoder;
struct drm_i915_private; struct drm_i915_private;
struct drm_modeset_acquire_ctx; struct drm_modeset_acquire_ctx;
struct drm_dp_vsc_sdp; struct drm_dp_vsc_sdp;
struct intel_atomic_state;
struct intel_connector; struct intel_connector;
struct intel_crtc_state; struct intel_crtc_state;
struct intel_digital_port; struct intel_digital_port;
...@@ -130,4 +131,9 @@ static inline unsigned int intel_dp_unused_lane_mask(int lane_count) ...@@ -130,4 +131,9 @@ static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
u32 intel_dp_mode_to_fec_clock(u32 mode_clock); u32 intel_dp_mode_to_fec_clock(u32 mode_clock);
void intel_ddi_update_pipe(struct intel_atomic_state *state,
struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state);
#endif /* __INTEL_DP_H__ */ #endif /* __INTEL_DP_H__ */
...@@ -865,6 +865,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *dig_port, enum pipe ...@@ -865,6 +865,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *dig_port, enum pipe
intel_encoder->compute_config_late = intel_dp_mst_compute_config_late; intel_encoder->compute_config_late = intel_dp_mst_compute_config_late;
intel_encoder->disable = intel_mst_disable_dp; intel_encoder->disable = intel_mst_disable_dp;
intel_encoder->post_disable = intel_mst_post_disable_dp; intel_encoder->post_disable = intel_mst_post_disable_dp;
intel_encoder->update_pipe = intel_ddi_update_pipe;
intel_encoder->pre_pll_enable = intel_mst_pre_pll_enable_dp; intel_encoder->pre_pll_enable = intel_mst_pre_pll_enable_dp;
intel_encoder->pre_enable = intel_mst_pre_enable_dp; intel_encoder->pre_enable = intel_mst_pre_enable_dp;
intel_encoder->enable = intel_mst_enable_dp; intel_encoder->enable = intel_mst_enable_dp;
......
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