Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jim Bride <jim.bride@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479145447-12907-2-git-send-email-ville.syrjala@linux.intel.com

+2 -4
+2 -2
drivers/gpu/drm/i915/intel_display.c
··· 5509 5509 if (intel_crtc->config->has_pch_encoder) 5510 5510 lpt_pch_enable(crtc); 5511 5511 5512 - if (intel_crtc->config->dp_encoder_is_mst) 5512 + if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST)) 5513 5513 intel_ddi_set_vc_payload_alloc(crtc, true); 5514 5514 5515 5515 assert_vblank_disabled(crtc); ··· 5632 5632 if (!transcoder_is_dsi(cpu_transcoder)) 5633 5633 intel_disable_pipe(intel_crtc); 5634 5634 5635 - if (intel_crtc->config->dp_encoder_is_mst) 5635 + if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST)) 5636 5636 intel_ddi_set_vc_payload_alloc(crtc, false); 5637 5637 5638 5638 if (!transcoder_is_dsi(cpu_transcoder))
-1
drivers/gpu/drm/i915/intel_dp_mst.c
··· 43 43 const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; 44 44 int mst_pbn; 45 45 46 - pipe_config->dp_encoder_is_mst = true; 47 46 pipe_config->has_pch_encoder = false; 48 47 bpp = 24; 49 48 /*
-1
drivers/gpu/drm/i915/intel_drv.h
··· 652 652 653 653 bool double_wide; 654 654 655 - bool dp_encoder_is_mst; 656 655 int pbn; 657 656 658 657 struct intel_crtc_scaler_state scaler_state;