#define HAS_IPS(dev_priv)      (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv))
 
-#define HAS_DP_MST(dev_priv)   (INTEL_INFO(dev_priv)->display.has_dp_mst)
 #define HAS_DP20(dev_priv)     (IS_DG2(dev_priv))
 
 #define HAS_CDCLK_CRAWL(dev_priv)       (INTEL_INFO(dev_priv)->display.has_cdclk_crawl)
 #define HAS_DDI(dev_priv)               (DISPLAY_VER(dev_priv) >= 9 || \
                                          IS_BROADWELL(dev_priv) || \
                                          IS_HASWELL(dev_priv))
+#define HAS_DP_MST(dev_priv)            (HAS_DDI(dev_priv))
 #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)->display.has_fpga_dbg)
 #define HAS_PSR(dev_priv)               (INTEL_INFO(dev_priv)->display.has_psr)
 #define HAS_PSR_HW_TRACKING(dev_priv) \
 
        .display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \
                BIT(TRANSCODER_C) | BIT(TRANSCODER_EDP), \
        .display.has_fpga_dbg = 1, \
-       .display.has_dp_mst = 1, \
        .has_rc6p = 0 /* RC6p removed-by HSW */, \
        HSW_PIPE_OFFSETS, \
        .has_runtime_pm = 1
        .has_runtime_pm = 1, \
        .display.has_dmc = 1, \
        .has_rps = true, \
-       .display.has_dp_mst = 1, \
        .has_logical_ring_contexts = 1, \
        .dma_mask_size = 39, \
        .ppgtt_type = INTEL_PPGTT_FULL, \
        .dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2) | BIT(DBUF_S3) |         \
                BIT(DBUF_S4),                                                   \
        .display.has_dmc = 1,                                                   \
-       .display.has_dp_mst = 1,                                                \
        .display.has_dsb = 1,                                                   \
        .display.has_dsc = 1,                                                   \
        .display.fbc_mask = BIT(INTEL_FBC_A),                                   \