Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0037071d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Kill dp_encoder_is_mst 



dp_encoder_is_mst flag in the crtc state can be replaced by
intel_crtc_has_type(..., INTEL_OUTPUT_DP_MST). Let's do that.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJim Bride <jim.bride@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479145447-12907-2-git-send-email-ville.syrjala@linux.intel.com
parent 4ea7be2b

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -5509,7 +5509,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, 
	if (intel_crtc->config->has_pch_encoder)

		lpt_pch_enable(crtc);



	if (intel_crtc->config->dp_encoder_is_mst)

	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST))

		intel_ddi_set_vc_payload_alloc(crtc, true);



	assert_vblank_disabled(crtc);
@@ -5632,7 +5632,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, 
	if (!transcoder_is_dsi(cpu_transcoder))

		intel_disable_pipe(intel_crtc);



	if (intel_crtc->config->dp_encoder_is_mst)

	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST))

		intel_ddi_set_vc_payload_alloc(crtc, false);



	if (!transcoder_is_dsi(cpu_transcoder))

drivers/gpu/drm/i915/intel_dp_mst.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, 
	const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;

	int mst_pbn;



	pipe_config->dp_encoder_is_mst = true;

	pipe_config->has_pch_encoder = false;

	bpp = 24;

	/*

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -652,7 +652,6 @@ struct intel_crtc_state { 


	bool double_wide;



	bool dp_encoder_is_mst;

	int pbn;



	struct intel_crtc_scaler_state scaler_state;