--- initial
+++ final
@@ -1,103 +1,103 @@
 void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) {
   struct intel_digital_port *intel_dig_port;
   struct intel_encoder *intel_encoder;
   struct drm_encoder *encoder;
   bool init_hdmi, init_dp, init_lspcon = false;
   int max_lanes;
   if (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES) {
     switch (port) {
     case PORT_A: max_lanes = 4; break;
     case PORT_E: max_lanes = 0; break;
     default: max_lanes = 4; break;
     }
   } else {
     switch (port) {
     case PORT_A: max_lanes = 2; break;
     case PORT_E: max_lanes = 2; break;
     default: max_lanes = 4; break;
     }
   }
   init_hdmi = (dev_priv->vbt.ddi_port_info[port].supports_dvi || dev_priv->vbt.ddi_port_info[port].supports_hdmi);
   init_dp = dev_priv->vbt.ddi_port_info[port].supports_dp;
   if (intel_bios_is_lspcon_present(dev_priv, port)) {
     /*
      * Lspcon device needs to be driven with DP connector
      * with special detection sequence. So make sure DP
      * is initialized before lspcon.
      */
     init_dp = true;
     init_lspcon = true;
     init_hdmi = false;
     DRM_DEBUG_KMS("VBT says port %c has lspcon\n", port_name(port));
   }
   if (!init_dp && !init_hdmi) {
     DRM_DEBUG_KMS("VBT says port %c is not DVI/HDMI/DP compatible, respect it\n", port_name(port));
     return;
   }
   intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
   if (!intel_dig_port) return;
   intel_encoder = &intel_dig_port->base;
   encoder = &intel_encoder->base;
   drm_encoder_init(&dev_priv->drm, encoder, &intel_ddi_funcs, DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));
   intel_encoder->compute_config = intel_ddi_compute_config;
   intel_encoder->enable = intel_enable_ddi;
-  if (IS_BROXTON(dev_priv)) intel_encoder->pre_pll_enable = bxt_ddi_pre_pll_enable;
+  if (IS_GEN9_LP(dev_priv)) intel_encoder->pre_pll_enable = bxt_ddi_pre_pll_enable;
   intel_encoder->pre_enable = intel_ddi_pre_enable;
   intel_encoder->disable = intel_disable_ddi;
   intel_encoder->post_disable = intel_ddi_post_disable;
   intel_encoder->get_hw_state = intel_ddi_get_hw_state;
   intel_encoder->get_config = intel_ddi_get_config;
   intel_encoder->suspend = intel_dp_encoder_suspend;
   intel_dig_port->port = port;
   intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) & (DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);
   /*
    * Bspec says that DDI_A_4_LANES is the only supported configuration
    * for Broxton.  Yet some BIOS fail to set this bit on port A if eDP
    * wasn't lit up at boot.  Force this bit on in our internal
    * configuration so that we use the proper lane count for our
    * calculations.
    */
-  if (IS_BROXTON(dev_priv) && port == PORT_A) {
+  if (IS_GEN9_LP(dev_priv) && port == PORT_A) {
     if (!(intel_dig_port->saved_port_bits & DDI_A_4_LANES)) {
       DRM_DEBUG_KMS("BXT BIOS forgot to set DDI_A_4_LANES for port A; fixing\n");
       intel_dig_port->saved_port_bits |= DDI_A_4_LANES;
       max_lanes = 4;
     }
   }
   intel_dig_port->max_lanes = max_lanes;
   intel_encoder->type = INTEL_OUTPUT_UNKNOWN;
   intel_encoder->port = port;
   intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
   intel_encoder->cloneable = 0;
   if (init_dp) {
     if (!intel_ddi_init_dp_connector(intel_dig_port)) goto err;
     intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
     /*
      * On BXT A0/A1, sw needs to activate DDIA HPD logic and
      * interrupts to check the external panel connection.
      */
     if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) && port == PORT_B)
       dev_priv->hotplug.irq_port[PORT_A] = intel_dig_port;
     else
       dev_priv->hotplug.irq_port[port] = intel_dig_port;
   }
   /* In theory we don't need the encoder->type check, but leave it just in
    * case we have some really bad VBTs... */
   if (intel_encoder->type != INTEL_OUTPUT_EDP && init_hdmi) {
     if (!intel_ddi_init_hdmi_connector(intel_dig_port)) goto err;
   }
   if (init_lspcon) {
     if (lspcon_init(intel_dig_port)) /* TODO: handle hdmi info frame part */
       DRM_DEBUG_KMS("LSPCON init success on port %c\n", port_name(port));
     else
       /*
        * LSPCON init faied, but DP init was success, so
        * lets try to drive as DP++ port.
        */
       DRM_ERROR("LSPCON init failed on port %c\n", port_name(port));
   }
   return;
 err:
   drm_encoder_cleanup(encoder);
   kfree(intel_dig_port);
 }<sep>@@
expression e;
@@

-       IS_BROXTON
+       IS_GEN9_LP
		(e)