Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued

Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i914/intel_dp.c
	drivers/gpu/drm/i915/intel_lrc.c

Conflicts are all fairly harmless adjacent line stuff.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

20 files changed, 313 insertions, 237 deletions

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index eb87e2538861..051eab33e4c7 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -36,21 +36,6 @@ config DRM_I915
           i810 driver instead, and the Atom z5xx series has an entirely
           different implementation.
 
-config DRM_I915_FBDEV
-        bool "Enable legacy fbdev support for the modesetting intel driver"
-        depends on DRM_I915
-        select DRM_KMS_FB_HELPER
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        default y
-        help
-          Choose this option if you have a need for the legacy fbdev
-          support. Note that this support also provide the linux console
-          support on top of the intel modesetting driver.
-
-          If in doubt, say "Y".
-
 config DRM_I915_PRELIMINARY_HW_SUPPORT
         bool "Enable preliminary support for prerelease Intel hardware by default"
         depends on DRM_I915
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index ddb69f337dc6..44d290ae1999 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -66,7 +66,7 @@ i915-y += intel_audio.o \
           intel_sideband.o \
           intel_sprite.o
 i915-$(CONFIG_ACPI)             += intel_acpi.o intel_opregion.o
-i915-$(CONFIG_DRM_I915_FBDEV)   += intel_fbdev.o
+i915-$(CONFIG_DRM_FBDEV_EMULATION)      += intel_fbdev.o
 
 # modesetting output/encoder code
 i915-y += dvo_ch7017.o \
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 2f1b693d7162..4563f8b955ea 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1863,7 +1863,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
         struct intel_framebuffer *fb;
         struct drm_framebuffer *drm_fb;
 
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         ifbdev = dev_priv->fbdev;
@@ -2700,6 +2700,8 @@ static const char *power_domain_str(enum intel_display_power_domain domain)
                 return "PORT_DDI_D_2_LANES";
         case POWER_DOMAIN_PORT_DDI_D_4_LANES:
                 return "PORT_DDI_D_4_LANES";
+        case POWER_DOMAIN_PORT_DDI_E_2_LANES:
+                return "PORT_DDI_E_2_LANES";
         case POWER_DOMAIN_PORT_DSI:
                 return "PORT_DSI";
         case POWER_DOMAIN_PORT_CRT:
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4646fe1a0499..4737d15de5f0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -665,15 +665,18 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)
 
         pci_disable_device(drm_dev->pdev);
         /*
-         * During hibernation on some GEN4 platforms the BIOS may try to access
+         * During hibernation on some platforms the BIOS may try to access
          * the device even though it's already in D3 and hang the machine. So
          * leave the device in D0 on those platforms and hope the BIOS will
-         * power down the device properly. Platforms where this was seen:
-         * Lenovo Thinkpad X301, X61s
+         * power down the device properly. The issue was seen on multiple old
+         * GENs with different BIOS vendors, so having an explicit blacklist
+         * is inpractical; apply the workaround on everything pre GEN6. The
+         * platforms where the issue was seen:
+         * Lenovo Thinkpad X301, X61s, X60, T60, X41
+         * Fujitsu FSC S7110
+         * Acer Aspire 1830T
          */
-        if (!(hibernation &&
-              drm_dev->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO &&
-              INTEL_INFO(dev_priv)->gen == 4))
+        if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))
                 pci_set_power_state(drm_dev->pdev, PCI_D3hot);
 
         return 0;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1d99402e4a1e..4eabe19a684f 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -188,6 +188,7 @@ enum intel_display_power_domain {
         POWER_DOMAIN_PORT_DDI_C_4_LANES,
         POWER_DOMAIN_PORT_DDI_D_2_LANES,
         POWER_DOMAIN_PORT_DDI_D_4_LANES,
+        POWER_DOMAIN_PORT_DDI_E_2_LANES,
         POWER_DOMAIN_PORT_DSI,
         POWER_DOMAIN_PORT_CRT,
         POWER_DOMAIN_PORT_OTHER,
@@ -220,6 +221,7 @@ enum hpd_pin {
         HPD_PORT_B,
         HPD_PORT_C,
         HPD_PORT_D,
+        HPD_PORT_E,
         HPD_NUM_PINS
 };
 
@@ -1421,6 +1423,10 @@ enum modeset_restore {
 #define DP_AUX_C 0x20
 #define DP_AUX_D 0x30
 
+#define DDC_PIN_B  0x05
+#define DDC_PIN_C  0x04
+#define DDC_PIN_D  0x06
+
 struct ddi_vbt_port_info {
         /*
          * This is an index in the HDMI/DVI DDI buffer translation table.
@@ -1435,6 +1441,7 @@ struct ddi_vbt_port_info {
         uint8_t supports_dp:1;
 
         uint8_t alternate_aux_channel;
+        uint8_t alternate_ddc_pin;
 
         uint8_t dp_boost_level;
         uint8_t hdmi_boost_level;
@@ -1875,7 +1882,7 @@ struct drm_i915_private {
 
         struct drm_i915_gem_object *vlv_pctx;
 
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
         /* list of fbdev register on this device */
         struct intel_fbdev *fbdev;
         struct work_struct fbdev_suspend_work;
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index a36cb95ec798..f361c4a56995 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -348,7 +348,7 @@ int i915_gem_init_stolen(struct drm_device *dev)
          * memory, so just consider the start. */
         reserved_total = stolen_top - reserved_base;
 
-        DRM_DEBUG_KMS("Memory reserved for graphics device: %luK, usable: %luK\n",
+        DRM_DEBUG_KMS("Memory reserved for graphics device: %zuK, usable: %luK\n",
                       dev_priv->gtt.stolen_size >> 10,
                       (dev_priv->gtt.stolen_size - reserved_total) >> 10);
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index a05104562932..8485bea966cc 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -61,6 +61,13 @@ static const u32 hpd_cpt[HPD_NUM_PINS] = {
         [HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT
 };
 
+static const u32 hpd_spt[HPD_NUM_PINS] = {
+        [HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
+        [HPD_PORT_C] = SDE_PORTC_HOTPLUG_CPT,
+        [HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT,
+        [HPD_PORT_E] = SDE_PORTE_HOTPLUG_SPT
+};
+
 static const u32 hpd_mask_i915[HPD_NUM_PINS] = {
         [HPD_CRT] = CRT_HOTPLUG_INT_EN,
         [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_EN,
@@ -1253,6 +1260,8 @@ static bool pch_port_hotplug_long_detect(enum port port, u32 val)
                 return val & PORTC_HOTPLUG_LONG_DETECT;
         case PORT_D:
                 return val & PORTD_HOTPLUG_LONG_DETECT;
+        case PORT_E:
+                return val & PORTE_HOTPLUG_LONG_DETECT;
         default:
                 return false;
         }
@@ -1753,7 +1762,12 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe;
-        u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
+        u32 hotplug_trigger;
+
+        if (HAS_PCH_SPT(dev))
+                hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_SPT;
+        else
+                hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
 
         if (hotplug_trigger) {
                 u32 dig_hotplug_reg, pin_mask, long_mask;
@@ -1761,9 +1775,23 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir)
                 dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG);
                 I915_WRITE(PCH_PORT_HOTPLUG, dig_hotplug_reg);
 
-                intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
-                                   dig_hotplug_reg, hpd_cpt,
-                                   pch_port_hotplug_long_detect);
+                if (HAS_PCH_SPT(dev)) {
+                        intel_get_hpd_pins(&pin_mask, &long_mask,
+                                           hotplug_trigger,
+                                           dig_hotplug_reg, hpd_spt,
+                                           pch_port_hotplug_long_detect);
+
+                        /* detect PORTE HP event */
+                        dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG2);
+                        if (pch_port_hotplug_long_detect(PORT_E,
+                                                         dig_hotplug_reg))
+                                long_mask |= 1 << HPD_PORT_E;
+                } else
+                        intel_get_hpd_pins(&pin_mask, &long_mask,
+                                           hotplug_trigger,
+                                           dig_hotplug_reg, hpd_cpt,
+                                           pch_port_hotplug_long_detect);
+
                 intel_hpd_irq_handler(dev, pin_mask, long_mask);
         }
 
@@ -2985,6 +3013,11 @@ static void ibx_hpd_irq_setup(struct drm_device *dev)
                 for_each_intel_encoder(dev, intel_encoder)
                         if (dev_priv->hotplug.stats[intel_encoder->hpd_pin].state == HPD_ENABLED)
                                 enabled_irqs |= hpd_ibx[intel_encoder->hpd_pin];
+        } else if (HAS_PCH_SPT(dev)) {
+                hotplug_irqs = SDE_HOTPLUG_MASK_SPT;
+                for_each_intel_encoder(dev, intel_encoder)
+                        if (dev_priv->hotplug.stats[intel_encoder->hpd_pin].state == HPD_ENABLED)
+                                enabled_irqs |= hpd_spt[intel_encoder->hpd_pin];
         } else {
                 hotplug_irqs = SDE_HOTPLUG_MASK_CPT;
                 for_each_intel_encoder(dev, intel_encoder)
@@ -3006,6 +3039,13 @@ static void ibx_hpd_irq_setup(struct drm_device *dev)
         hotplug |= PORTC_HOTPLUG_ENABLE | PORTC_PULSE_DURATION_2ms;
         hotplug |= PORTB_HOTPLUG_ENABLE | PORTB_PULSE_DURATION_2ms;
         I915_WRITE(PCH_PORT_HOTPLUG, hotplug);
+
+        /* enable SPT PORTE hot plug */
+        if (HAS_PCH_SPT(dev)) {
+                hotplug = I915_READ(PCH_PORT_HOTPLUG2);
+                hotplug |= PORTE_HOTPLUG_ENABLE;
+                I915_WRITE(PCH_PORT_HOTPLUG2, hotplug);
+        }
 }
 
 static void bxt_hpd_irq_setup(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c82db2aed55c..e7c9dc8e24fe 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -5981,6 +5981,7 @@ enum skl_disp_power_wells {
 #define SDE_AUXC_CPT            (1 << 26)
 #define SDE_AUXB_CPT            (1 << 25)
 #define SDE_AUX_MASK_CPT        (7 << 25)
+#define SDE_PORTE_HOTPLUG_SPT   (1 << 25)
 #define SDE_PORTD_HOTPLUG_CPT   (1 << 23)
 #define SDE_PORTC_HOTPLUG_CPT   (1 << 22)
 #define SDE_PORTB_HOTPLUG_CPT   (1 << 21)
@@ -5991,6 +5992,10 @@ enum skl_disp_power_wells {
                                  SDE_PORTD_HOTPLUG_CPT |        \
                                  SDE_PORTC_HOTPLUG_CPT |        \
                                  SDE_PORTB_HOTPLUG_CPT)
+#define SDE_HOTPLUG_MASK_SPT    (SDE_PORTE_HOTPLUG_SPT |        \
+                                 SDE_PORTD_HOTPLUG_CPT |        \
+                                 SDE_PORTC_HOTPLUG_CPT |        \
+                                 SDE_PORTB_HOTPLUG_CPT)
 #define SDE_GMBUS_CPT           (1 << 17)
 #define SDE_ERROR_CPT           (1 << 16)
 #define SDE_AUDIO_CP_REQ_C_CPT  (1 << 10)
@@ -6062,6 +6067,13 @@ enum skl_disp_power_wells {
 #define  PORTB_HOTPLUG_SHORT_DETECT     (1 << 0)
 #define  PORTB_HOTPLUG_LONG_DETECT      (2 << 0)
 
+#define PCH_PORT_HOTPLUG2        0xc403C                /* SHOTPLUG_CTL2 */
+#define PORTE_HOTPLUG_ENABLE            (1 << 4)
+#define PORTE_HOTPLUG_STATUS_MASK       (0x3 << 0)
+#define  PORTE_HOTPLUG_NO_DETECT        (0 << 0)
+#define  PORTE_HOTPLUG_SHORT_DETECT     (1 << 0)
+#define  PORTE_HOTPLUG_LONG_DETECT      (2 << 0)
+
 #define PCH_GPIOA               0xc5010
 #define PCH_GPIOB               0xc5014
 #define PCH_GPIOC               0xc5018
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 8e46149bafdd..b3e437b3bb54 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -401,7 +401,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv,
 {
         struct sdvo_device_mapping *p_mapping;
         const struct bdb_general_definitions *p_defs;
-        const union child_device_config *p_child;
+        const struct old_child_dev_config *child; /* legacy */
         int i, child_device_num, count;
         u16     block_size;
 
@@ -410,14 +410,14 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv,
                 DRM_DEBUG_KMS("No general definition block is found, unable to construct sdvo mapping.\n");
                 return;
         }
-        /* judge whether the size of child device meets the requirements.
-         * If the child device size obtained from general definition block
-         * is different with sizeof(struct child_device_config), skip the
-         * parsing of sdvo device info
+
+        /*
+         * Only parse SDVO mappings when the general definitions block child
+         * device size matches that of the *legacy* child device config
+         * struct. Thus, SDVO mapping will be skipped for newer VBT.
          */
-        if (p_defs->child_dev_size != sizeof(*p_child)) {
-                /* different child dev size . Ignore it */
-                DRM_DEBUG_KMS("different child size is found. Invalid.\n");
+        if (p_defs->child_dev_size != sizeof(*child)) {
+                DRM_DEBUG_KMS("Unsupported child device size for SDVO mapping.\n");
                 return;
         }
         /* get the block size of general definitions */
@@ -427,37 +427,37 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv,
                 p_defs->child_dev_size;
         count = 0;
         for (i = 0; i < child_device_num; i++) {
-                p_child = child_device_ptr(p_defs, i);
-                if (!p_child->old.device_type) {
+                child = &child_device_ptr(p_defs, i)->old;
+                if (!child->device_type) {
                         /* skip the device block if device type is invalid */
                         continue;
                 }
-                if (p_child->old.slave_addr != SLAVE_ADDR1 &&
-                        p_child->old.slave_addr != SLAVE_ADDR2) {
+                if (child->slave_addr != SLAVE_ADDR1 &&
+                    child->slave_addr != SLAVE_ADDR2) {
                         /*
                          * If the slave address is neither 0x70 nor 0x72,
                          * it is not a SDVO device. Skip it.
                          */
                         continue;
                 }
-                if (p_child->old.dvo_port != DEVICE_PORT_DVOB &&
-                        p_child->old.dvo_port != DEVICE_PORT_DVOC) {
+                if (child->dvo_port != DEVICE_PORT_DVOB &&
+                    child->dvo_port != DEVICE_PORT_DVOC) {
                         /* skip the incorrect SDVO port */
                         DRM_DEBUG_KMS("Incorrect SDVO port. Skip it\n");
                         continue;
                 }
                 DRM_DEBUG_KMS("the SDVO device with slave addr %2x is found on"
-                                " %s port\n",
-                                p_child->old.slave_addr,
-                                (p_child->old.dvo_port == DEVICE_PORT_DVOB) ?
-                                        "SDVOB" : "SDVOC");
-                p_mapping = &(dev_priv->sdvo_mappings[p_child->old.dvo_port - 1]);
+                              " %s port\n",
+                              child->slave_addr,
+                              (child->dvo_port == DEVICE_PORT_DVOB) ?
+                              "SDVOB" : "SDVOC");
+                p_mapping = &(dev_priv->sdvo_mappings[child->dvo_port - 1]);
                 if (!p_mapping->initialized) {
-                        p_mapping->dvo_port = p_child->old.dvo_port;
-                        p_mapping->slave_addr = p_child->old.slave_addr;
-                        p_mapping->dvo_wiring = p_child->old.dvo_wiring;
-                        p_mapping->ddc_pin = p_child->old.ddc_pin;
-                        p_mapping->i2c_pin = p_child->old.i2c_pin;
+                        p_mapping->dvo_port = child->dvo_port;
+                        p_mapping->slave_addr = child->slave_addr;
+                        p_mapping->dvo_wiring = child->dvo_wiring;
+                        p_mapping->ddc_pin = child->ddc_pin;
+                        p_mapping->i2c_pin = child->i2c_pin;
                         p_mapping->initialized = 1;
                         DRM_DEBUG_KMS("SDVO device: dvo=%x, addr=%x, wiring=%d, ddc_pin=%d, i2c_pin=%d\n",
                                       p_mapping->dvo_port,
@@ -469,7 +469,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv,
                         DRM_DEBUG_KMS("Maybe one SDVO port is shared by "
                                          "two SDVO device.\n");
                 }
-                if (p_child->old.slave2_addr) {
+                if (child->slave2_addr) {
                         /* Maybe this is a SDVO device with multiple inputs */
                         /* And the mapping info is not added */
                         DRM_DEBUG_KMS("there exists the slave2_addr. Maybe this"
@@ -905,23 +905,23 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
         uint8_t hdmi_level_shift;
         int i, j;
         bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;
-        uint8_t aux_channel;
+        uint8_t aux_channel, ddc_pin;
         /* Each DDI port can have more than one value on the "DVO Port" field,
          * so look for all the possible values for each port and abort if more
          * than one is found. */
-        int dvo_ports[][2] = {
-                {DVO_PORT_HDMIA, DVO_PORT_DPA},
-                {DVO_PORT_HDMIB, DVO_PORT_DPB},
-                {DVO_PORT_HDMIC, DVO_PORT_DPC},
-                {DVO_PORT_HDMID, DVO_PORT_DPD},
-                {DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ },
+        int dvo_ports[][3] = {
+                {DVO_PORT_HDMIA, DVO_PORT_DPA, -1},
+                {DVO_PORT_HDMIB, DVO_PORT_DPB, -1},
+                {DVO_PORT_HDMIC, DVO_PORT_DPC, -1},
+                {DVO_PORT_HDMID, DVO_PORT_DPD, -1},
+                {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE},
         };
 
         /* Find the child device to use, abort if more than one found. */
         for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
                 it = dev_priv->vbt.child_dev + i;
 
-                for (j = 0; j < 2; j++) {
+                for (j = 0; j < 3; j++) {
                         if (dvo_ports[port][j] == -1)
                                 break;
 
@@ -939,6 +939,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
                 return;
 
         aux_channel = child->raw[25];
+        ddc_pin = child->common.ddc_pin;
 
         is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
         is_dp = child->common.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
@@ -970,11 +971,27 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
                 DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));
 
         if (is_dvi) {
-                if (child->common.ddc_pin == 0x05 && port != PORT_B)
+                if (port == PORT_E) {
+                        info->alternate_ddc_pin = ddc_pin;
+                        /* if DDIE share ddc pin with other port, then
+                         * dvi/hdmi couldn't exist on the shared port.
+                         * Otherwise they share the same ddc bin and system
+                         * couldn't communicate with them seperately. */
+                        if (ddc_pin == DDC_PIN_B) {
+                                dev_priv->vbt.ddi_port_info[PORT_B].supports_dvi = 0;
+                                dev_priv->vbt.ddi_port_info[PORT_B].supports_hdmi = 0;
+                        } else if (ddc_pin == DDC_PIN_C) {
+                                dev_priv->vbt.ddi_port_info[PORT_C].supports_dvi = 0;
+                                dev_priv->vbt.ddi_port_info[PORT_C].supports_hdmi = 0;
+                        } else if (ddc_pin == DDC_PIN_D) {
+                                dev_priv->vbt.ddi_port_info[PORT_D].supports_dvi = 0;
+                                dev_priv->vbt.ddi_port_info[PORT_D].supports_hdmi = 0;
+                        }
+                } else if (ddc_pin == DDC_PIN_B && port != PORT_B)
                         DRM_DEBUG_KMS("Unexpected DDC pin for port B\n");
-                if (child->common.ddc_pin == 0x04 && port != PORT_C)
+                else if (ddc_pin == DDC_PIN_C && port != PORT_C)
                         DRM_DEBUG_KMS("Unexpected DDC pin for port C\n");
-                if (child->common.ddc_pin == 0x06 && port != PORT_D)
+                else if (ddc_pin == DDC_PIN_D && port != PORT_D)
                         DRM_DEBUG_KMS("Unexpected DDC pin for port D\n");
         }
 
@@ -1060,27 +1077,30 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
                 return;
         }
         if (bdb->version < 195) {
-                expected_size = 33;
+                expected_size = sizeof(struct old_child_dev_config);
         } else if (bdb->version == 195) {
                 expected_size = 37;
         } else if (bdb->version <= 197) {
                 expected_size = 38;
         } else {
                 expected_size = 38;
-                DRM_DEBUG_DRIVER("Expected child_device_config size for BDB version %u not known; assuming %u\n",
-                                 expected_size, bdb->version);
+                BUILD_BUG_ON(sizeof(*p_child) < 38);
+                DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
+                                 bdb->version, expected_size);
         }
 
-        if (expected_size > sizeof(*p_child)) {
-                DRM_ERROR("child_device_config cannot fit in p_child\n");
+        /* The legacy sized child device config is the minimum we need. */
+        if (p_defs->child_dev_size < sizeof(struct old_child_dev_config)) {
+                DRM_ERROR("Child device config size %u is too small.\n",
+                          p_defs->child_dev_size);
                 return;
         }
 
-        if (p_defs->child_dev_size != expected_size) {
-                DRM_ERROR("Size mismatch; child_device_config size=%u (expected %u); bdb->version: %u\n",
+        /* Flag an error for unexpected size, but continue anyway. */
+        if (p_defs->child_dev_size != expected_size)
+                DRM_ERROR("Unexpected child device config size %u (expected %u for VBT version %u)\n",
                           p_defs->child_dev_size, expected_size, bdb->version);
-                return;
-        }
+
         /* get the block size of general definitions */
         block_size = get_blocksize(p_defs);
         /* get the number of child device */
@@ -1125,7 +1145,14 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
 
                 child_dev_ptr = dev_priv->vbt.child_dev + count;
                 count++;
-                memcpy(child_dev_ptr, p_child, p_defs->child_dev_size);
+
+                /*
+                 * Copy as much as we know (sizeof) and is available
+                 * (child_dev_size) of the child device. Accessing the data must
+                 * depend on VBT version.
+                 */
+                memcpy(child_dev_ptr, p_child,
+                       min_t(size_t, p_defs->child_dev_size, sizeof(*p_child)));
         }
         return;
 }
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 6d909efbf43f..46cd5c7ebacd 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -203,9 +203,11 @@ struct bdb_general_features {
 #define DEVICE_PORT_DVOB        0x01
 #define DEVICE_PORT_DVOC        0x02
 
-/* We used to keep this struct but without any version control. We should avoid
+/*
+ * We used to keep this struct but without any version control. We should avoid
  * using it in the future, but it should be safe to keep using it in the old
- * code. */
+ * code. Do not change; we rely on its size.
+ */
 struct old_child_dev_config {
         u16 handle;
         u16 device_type;
@@ -756,11 +758,6 @@ int intel_parse_bios(struct drm_device *dev);
 #define         DVO_C           2
 #define         DVO_D           3
 
-/* define the PORT for DP output type */
-#define         PORT_IDPB       7
-#define         PORT_IDPC       8
-#define         PORT_IDPD       9
-
 /* Possible values for the "DVO Port" field for versions >= 155: */
 #define DVO_PORT_HDMIA  0
 #define DVO_PORT_HDMIB  1
@@ -773,6 +770,8 @@ int intel_parse_bios(struct drm_device *dev);
 #define DVO_PORT_DPC    8
 #define DVO_PORT_DPD    9
 #define DVO_PORT_DPA    10
+#define DVO_PORT_DPE    11
+#define DVO_PORT_HDMIE  12
 #define DVO_PORT_MIPIA  21
 #define DVO_PORT_MIPIB  22
 #define DVO_PORT_MIPIC  23
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 5dff8b7e0f03..4823184258a0 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -128,7 +128,7 @@ static const struct ddi_buf_trans bdw_ddi_translations_hdmi[] = {
         { 0x80FFFFFF, 0x001B0002, 0x0 },/* 9:   1000    1000    0       */
 };
 
-/* Skylake H, S, and Skylake Y with 0.95V VccIO */
+/* Skylake H and S */
 static const struct ddi_buf_trans skl_ddi_translations_dp[] = {
         { 0x00002016, 0x000000A0, 0x0 },
         { 0x00005012, 0x0000009B, 0x0 },
@@ -143,23 +143,23 @@ static const struct ddi_buf_trans skl_ddi_translations_dp[] = {
 
 /* Skylake U */
 static const struct ddi_buf_trans skl_u_ddi_translations_dp[] = {
-        { 0x00002016, 0x000000A2, 0x0 },
+        { 0x0000201B, 0x000000A2, 0x0 },
         { 0x00005012, 0x00000088, 0x0 },
         { 0x00007011, 0x00000087, 0x0 },
-        { 0x80009010, 0x000000C7, 0x1 },        /* Uses I_boost */
-        { 0x00002016, 0x0000009D, 0x0 },
+        { 0x80009010, 0x000000C7, 0x1 },        /* Uses I_boost level 0x1 */
+        { 0x0000201B, 0x0000009D, 0x0 },
         { 0x00005012, 0x000000C7, 0x0 },
         { 0x00007011, 0x000000C7, 0x0 },
         { 0x00002016, 0x00000088, 0x0 },
         { 0x00005012, 0x000000C7, 0x0 },
 };
 
-/* Skylake Y with 0.85V VccIO */
-static const struct ddi_buf_trans skl_y_085v_ddi_translations_dp[] = {
+/* Skylake Y */
+static const struct ddi_buf_trans skl_y_ddi_translations_dp[] = {
         { 0x00000018, 0x000000A2, 0x0 },
         { 0x00005012, 0x00000088, 0x0 },
         { 0x00007011, 0x00000087, 0x0 },
-        { 0x80009010, 0x000000C7, 0x1 },        /* Uses I_boost */
+        { 0x80009010, 0x000000C7, 0x3 },        /* Uses I_boost level 0x3 */
         { 0x00000018, 0x0000009D, 0x0 },
         { 0x00005012, 0x000000C7, 0x0 },
         { 0x00007011, 0x000000C7, 0x0 },
@@ -168,7 +168,7 @@ static const struct ddi_buf_trans skl_y_085v_ddi_translations_dp[] = {
 };
 
 /*
- * Skylake H and S, and Skylake Y with 0.95V VccIO
+ * Skylake H and S
  * eDP 1.4 low vswing translation parameters
  */
 static const struct ddi_buf_trans skl_ddi_translations_edp[] = {
@@ -202,10 +202,10 @@ static const struct ddi_buf_trans skl_u_ddi_translations_edp[] = {
 };
 
 /*
- * Skylake Y with 0.95V VccIO
+ * Skylake Y
  * eDP 1.4 low vswing translation parameters
  */
-static const struct ddi_buf_trans skl_y_085v_ddi_translations_edp[] = {
+static const struct ddi_buf_trans skl_y_ddi_translations_edp[] = {
         { 0x00000018, 0x000000A8, 0x0 },
         { 0x00004013, 0x000000AB, 0x0 },
         { 0x00007011, 0x000000A4, 0x0 },
@@ -218,7 +218,7 @@ static const struct ddi_buf_trans skl_y_085v_ddi_translations_edp[] = {
         { 0x00000018, 0x0000008A, 0x0 },
 };
 
-/* Skylake H, S and U, and Skylake Y with 0.95V VccIO */
+/* Skylake U, H and S */
 static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = {
         { 0x00000018, 0x000000AC, 0x0 },
         { 0x00005012, 0x0000009D, 0x0 },
@@ -233,8 +233,8 @@ static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = {
         { 0x00000018, 0x000000C7, 0x0 },
 };
 
-/* Skylake Y with 0.85V VccIO */
-static const struct ddi_buf_trans skl_y_085v_ddi_translations_hdmi[] = {
+/* Skylake Y */
+static const struct ddi_buf_trans skl_y_ddi_translations_hdmi[] = {
         { 0x00000018, 0x000000A1, 0x0 },
         { 0x00005012, 0x000000DF, 0x0 },
         { 0x00007011, 0x00000084, 0x0 },
@@ -244,7 +244,7 @@ static const struct ddi_buf_trans skl_y_085v_ddi_translations_hdmi[] = {
         { 0x00006013, 0x000000C7, 0x0 },
         { 0x00000018, 0x0000008A, 0x0 },
         { 0x00003015, 0x000000C7, 0x0 },        /* Default */
-        { 0x80003015, 0x000000C7, 0x7 },        /* Uses I_boost */
+        { 0x80003015, 0x000000C7, 0x7 },        /* Uses I_boost level 0x7 */
         { 0x00000018, 0x000000C7, 0x0 },
 };
 
@@ -335,19 +335,11 @@ intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
 static const struct ddi_buf_trans *skl_get_buf_trans_dp(struct drm_device *dev,
                                                         int *n_entries)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         const struct ddi_buf_trans *ddi_translations;
-        static int is_095v = -1;
-
-        if (is_095v == -1) {
-                u32 spr1 = I915_READ(UAIMI_SPR1);
-
-                is_095v = spr1 & SKL_VCCIO_MASK;
-        }
 
-        if (IS_SKL_ULX(dev) && !is_095v) {
-                ddi_translations = skl_y_085v_ddi_translations_dp;
-                *n_entries = ARRAY_SIZE(skl_y_085v_ddi_translations_dp);
+        if (IS_SKL_ULX(dev)) {
+                ddi_translations = skl_y_ddi_translations_dp;
+                *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp);
         } else if (IS_SKL_ULT(dev)) {
                 ddi_translations = skl_u_ddi_translations_dp;
                 *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp);
@@ -364,23 +356,14 @@ static const struct ddi_buf_trans *skl_get_buf_trans_edp(struct drm_device *dev,
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         const struct ddi_buf_trans *ddi_translations;
-        static int is_095v = -1;
-
-        if (is_095v == -1) {
-                u32 spr1 = I915_READ(UAIMI_SPR1);
 
-                is_095v = spr1 & SKL_VCCIO_MASK;
-        }
-
-        if (IS_SKL_ULX(dev) && !is_095v) {
+        if (IS_SKL_ULX(dev)) {
                 if (dev_priv->edp_low_vswing) {
-                        ddi_translations = skl_y_085v_ddi_translations_edp;
-                        *n_entries =
-                                ARRAY_SIZE(skl_y_085v_ddi_translations_edp);
+                        ddi_translations = skl_y_ddi_translations_edp;
+                        *n_entries = ARRAY_SIZE(skl_y_ddi_translations_edp);
                 } else {
-                        ddi_translations = skl_y_085v_ddi_translations_dp;
-                        *n_entries =
-                                ARRAY_SIZE(skl_y_085v_ddi_translations_dp);
+                        ddi_translations = skl_y_ddi_translations_dp;
+                        *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp);
                 }
         } else if (IS_SKL_ULT(dev)) {
                 if (dev_priv->edp_low_vswing) {
@@ -407,19 +390,11 @@ static const struct ddi_buf_trans *
 skl_get_buf_trans_hdmi(struct drm_device *dev,
                        int *n_entries)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         const struct ddi_buf_trans *ddi_translations;
-        static int is_095v = -1;
-
-        if (is_095v == -1) {
-                u32 spr1 = I915_READ(UAIMI_SPR1);
-
-                is_095v = spr1 & SKL_VCCIO_MASK;
-        }
 
-        if (IS_SKL_ULX(dev) && !is_095v) {
-                ddi_translations = skl_y_085v_ddi_translations_hdmi;
-                *n_entries = ARRAY_SIZE(skl_y_085v_ddi_translations_hdmi);
+        if (IS_SKL_ULX(dev)) {
+                ddi_translations = skl_y_ddi_translations_hdmi;
+                *n_entries = ARRAY_SIZE(skl_y_ddi_translations_hdmi);
         } else {
                 ddi_translations = skl_ddi_translations_hdmi;
                 *n_entries = ARRAY_SIZE(skl_ddi_translations_hdmi);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d38ceb039de6..deba3330de71 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5102,7 +5102,6 @@ static enum intel_display_power_domain port_to_power_domain(enum port port)
 {
         switch (port) {
         case PORT_A:
-        case PORT_E:
                 return POWER_DOMAIN_PORT_DDI_A_4_LANES;
         case PORT_B:
                 return POWER_DOMAIN_PORT_DDI_B_4_LANES;
@@ -5110,6 +5109,8 @@ static enum intel_display_power_domain port_to_power_domain(enum port port)
                 return POWER_DOMAIN_PORT_DDI_C_4_LANES;
         case PORT_D:
                 return POWER_DOMAIN_PORT_DDI_D_4_LANES;
+        case PORT_E:
+                return POWER_DOMAIN_PORT_DDI_E_2_LANES;
         default:
                 WARN_ON_ONCE(1);
                 return POWER_DOMAIN_PORT_OTHER;
@@ -5684,16 +5685,13 @@ void skl_init_cdclk(struct drm_i915_private *dev_priv)
         /* enable PG1 and Misc I/O */
         intel_display_power_get(dev_priv, POWER_DOMAIN_PLLS);
 
-        /* DPLL0 already enabed !? */
-        if (I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE) {
-                DRM_DEBUG_DRIVER("DPLL0 already running\n");
-                return;
+        /* DPLL0 not enabled (happens on early BIOS versions) */
+        if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE)) {
+                /* enable DPLL0 */
+                required_vco = skl_cdclk_get_vco(dev_priv->skl_boot_cdclk);
+                skl_dpll0_enable(dev_priv, required_vco);
         }
 
-        /* enable DPLL0 */
-        required_vco = skl_cdclk_get_vco(dev_priv->skl_boot_cdclk);
-        skl_dpll0_enable(dev_priv, required_vco);
-
         /* set CDCLK to the frequency the BIOS chose */
         skl_set_cdclk(dev_priv, dev_priv->skl_boot_cdclk);
 
@@ -10114,7 +10112,7 @@ static struct drm_framebuffer *
 mode_fits_in_fbdev(struct drm_device *dev,
                    struct drm_display_mode *mode)
 {
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
         struct drm_framebuffer *fb;
@@ -13509,7 +13507,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
         struct intel_plane *primary;
         struct intel_plane_state *state;
         const uint32_t *intel_primary_formats;
-        int num_formats;
+        unsigned int num_formats;
 
         primary = kzalloc(sizeof(*primary), GFP_KERNEL);
         if (primary == NULL)
@@ -13947,6 +13945,15 @@ static void intel_setup_outputs(struct drm_device *dev)
                         intel_ddi_init(dev, PORT_C);
                 if (found & SFUSE_STRAP_DDID_DETECTED)
                         intel_ddi_init(dev, PORT_D);
+                /*
+                 * On SKL we don't have a way to detect DDI-E so we rely on VBT.
+                 */
+                if (IS_SKYLAKE(dev) &&
+                    (dev_priv->vbt.ddi_port_info[PORT_E].supports_dp ||
+                     dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi ||
+                     dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi))
+                        intel_ddi_init(dev, PORT_E);
+
         } else if (HAS_PCH_SPLIT(dev)) {
                 int found;
                 dpd_is_edp = intel_dp_is_edp(dev, PORT_D);
@@ -14302,7 +14309,7 @@ intel_user_framebuffer_create(struct drm_device *dev,
         return intel_framebuffer_create(dev, mode_cmd, obj);
 }
 
-#ifndef CONFIG_DRM_I915_FBDEV
+#ifndef CONFIG_DRM_FBDEV_EMULATION
 static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)
 {
 }
@@ -14717,6 +14724,24 @@ void intel_modeset_init(struct drm_device *dev)
         if (INTEL_INFO(dev)->num_pipes == 0)
                 return;
 
+        /*
+         * There may be no VBT; and if the BIOS enabled SSC we can
+         * just keep using it to avoid unnecessary flicker.  Whereas if the
+         * BIOS isn't using it, don't assume it will work even if the VBT
+         * indicates as much.
+         */
+        if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) {
+                bool bios_lvds_use_ssc = !!(I915_READ(PCH_DREF_CONTROL) &
+                                            DREF_SSC1_ENABLE);
+
+                if (dev_priv->vbt.lvds_use_ssc != bios_lvds_use_ssc) {
+                        DRM_DEBUG_KMS("SSC %sabled by BIOS, overriding VBT which says %sabled\n",
+                                     bios_lvds_use_ssc ? "en" : "dis",
+                                     dev_priv->vbt.lvds_use_ssc ? "en" : "dis");
+                        dev_priv->vbt.lvds_use_ssc = bios_lvds_use_ssc;
+                }
+        }
+
         intel_init_display(dev);
         intel_init_audio(dev);
 
@@ -15278,7 +15303,6 @@ err:
 
 void intel_modeset_gem_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_crtc *c;
         struct drm_i915_gem_object *obj;
         int ret;
@@ -15287,16 +15311,6 @@ void intel_modeset_gem_init(struct drm_device *dev)
         intel_init_gt_powersave(dev);
         mutex_unlock(&dev->struct_mutex);
 
-        /*
-         * There may be no VBT; and if the BIOS enabled SSC we can
-         * just keep using it to avoid unnecessary flicker.  Whereas if the
-         * BIOS isn't using it, don't assume it will work even if the VBT
-         * indicates as much.
-         */
-        if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
-                dev_priv->vbt.lvds_use_ssc = !!(I915_READ(PCH_DREF_CONTROL) &
-                                                DREF_SSC1_ENABLE);
-
         intel_modeset_init_hw(dev);
 
         intel_setup_overlay(dev);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f45872cc6d24..f8f4d99440c1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -95,9 +95,6 @@ static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
                                   324000, 432000, 540000 };
 static const int skl_rates[] = { 162000, 216000, 270000,
                                   324000, 432000, 540000 };
-static const int chv_rates[] = { 162000, 202500, 210000, 216000,
-                                 243000, 270000, 324000, 405000,
-                                 420000, 432000, 540000 };
 static const int default_rates[] = { 162000, 270000, 540000 };
 
 /**
@@ -1159,7 +1156,7 @@ skl_edp_set_pll_config(struct intel_crtc_state *pipe_config)
         pipe_config->dpll_hw_state.ctrl1 = ctrl1;
 }
 
-static void
+void
 hsw_dp_set_ddi_pll_sel(struct intel_crtc_state *pipe_config)
 {
         memset(&pipe_config->dpll_hw_state, 0,
@@ -1191,30 +1188,40 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)
         return (intel_dp_max_link_bw(intel_dp) >> 3) + 1;
 }
 
+static bool intel_dp_source_supports_hbr2(struct drm_device *dev)
+{
+        /* WaDisableHBR2:skl */
+        if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
+                return false;
+
+        if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || IS_BROADWELL(dev) ||
+            (INTEL_INFO(dev)->gen >= 9))
+                return true;
+        else
+                return false;
+}
+
 static int
 intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
 {
+        int size;
+
         if (IS_BROXTON(dev)) {
                 *source_rates = bxt_rates;
-                return ARRAY_SIZE(bxt_rates);
+                size = ARRAY_SIZE(bxt_rates);
         } else if (IS_SKYLAKE(dev)) {
                 *source_rates = skl_rates;
-                return ARRAY_SIZE(skl_rates);
-        } else if (IS_CHERRYVIEW(dev)) {
-                *source_rates = chv_rates;
-                return ARRAY_SIZE(chv_rates);
+                size = ARRAY_SIZE(skl_rates);
+        } else {
+                *source_rates = default_rates;
+                size = ARRAY_SIZE(default_rates);
         }
 
-        *source_rates = default_rates;
+        /* This depends on the fact that 5.4 is last value in the array */
+        if (!intel_dp_source_supports_hbr2(dev))
+                size--;
 
-        if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
-                /* WaDisableHBR2:skl */
-                return (DP_LINK_BW_2_7 >> 3) + 1;
-        else if (INTEL_INFO(dev)->gen >= 8 ||
-            (IS_HASWELL(dev) && !IS_HSW_ULX(dev)))
-                return (DP_LINK_BW_5_4 >> 3) + 1;
-        else
-                return (DP_LINK_BW_2_7 >> 3) + 1;
+        return size;
 }
 
 static void
@@ -3993,9 +4000,14 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
                 }
         }
 
-        /* Training Pattern 3 support, both source and sink */
+        /* Training Pattern 3 support, Intel platforms that support HBR2 alone
+         * have support for TP3 hence that check is used along with dpcd check
+         * to ensure TP3 can be enabled.
+         * SKL < B0: due it's WaDisableHBR2 is the only exception where TP3 is
+         * supported but still not enabled.
+         */
         if (drm_dp_tps3_supported(intel_dp->dpcd) &&
-            (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8)) {
+            intel_dp_source_supports_hbr2(dev)) {
                 intel_dp->use_tps3 = true;
                 DRM_DEBUG_KMS("Displayport TPS3 supported\n");
         } else
@@ -5166,9 +5178,12 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 
                 intel_dp_probe_oui(intel_dp);
 
-                if (!intel_dp_probe_mst(intel_dp))
+                if (!intel_dp_probe_mst(intel_dp)) {
+                        drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
+                        intel_dp_check_link_status(intel_dp);
+                        drm_modeset_unlock(&dev->mode_config.connection_mutex);
                         goto mst_fail;
-
+                }
         } else {
                 if (intel_dp->is_mst) {
                         if (intel_dp_check_mst_status(intel_dp) == -EINVAL)
@@ -5176,10 +5191,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
                 }
 
                 if (!intel_dp->is_mst) {
-                        /*
-                         * we'll check the link status via the normal hot plug path later -
-                         * but for short hpds we should check it now
-                         */
                         drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
                         intel_dp_check_link_status(intel_dp);
                         drm_modeset_unlock(&dev->mode_config.connection_mutex);
@@ -5221,16 +5232,17 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc)
         return -1;
 }
 
-/* check the VBT to see whether the eDP is on DP-D port */
+/* check the VBT to see whether the eDP is on another port */
 bool intel_dp_is_edp(struct drm_device *dev, enum port port)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         union child_device_config *p_child;
         int i;
         static const short port_mapping[] = {
-                [PORT_B] = PORT_IDPB,
-                [PORT_C] = PORT_IDPC,
-                [PORT_D] = PORT_IDPD,
+                [PORT_B] = DVO_PORT_DPB,
+                [PORT_C] = DVO_PORT_DPC,
+                [PORT_D] = DVO_PORT_DPD,
+                [PORT_E] = DVO_PORT_DPE,
         };
 
         if (port == PORT_A)
@@ -6067,6 +6079,9 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
         case PORT_D:
                 intel_encoder->hpd_pin = HPD_PORT_D;
                 break;
+        case PORT_E:
+                intel_encoder->hpd_pin = HPD_PORT_E;
+                break;
         default:
                 BUG();
         }
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index dd291d123219..677d70e4d363 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -33,6 +33,7 @@
 static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
                                         struct intel_crtc_state *pipe_config)
 {
+        struct drm_device *dev = encoder->base.dev;
         struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
         struct intel_digital_port *intel_dig_port = intel_mst->primary;
         struct intel_dp *intel_dp = &intel_dig_port->dp;
@@ -88,6 +89,10 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
                                &pipe_config->dp_m_n);
 
         pipe_config->dp_m_n.tu = slots;
+
+        if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+                hsw_dp_set_ddi_pll_sel(pipe_config);
+
         return true;
 
 }
@@ -403,7 +408,7 @@ static bool intel_dp_mst_get_hw_state(struct intel_connector *connector)
 
 static void intel_connector_add_to_fbdev(struct intel_connector *connector)
 {
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
         struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
         drm_fb_helper_add_one_connector(&dev_priv->fbdev->helper, &connector->base);
 #endif
@@ -411,7 +416,7 @@ static void intel_connector_add_to_fbdev(struct intel_connector *connector)
 
 static void intel_connector_remove_from_fbdev(struct intel_connector *connector)
 {
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
         struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
         drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper, &connector->base);
 #endif
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 090d67b04307..40e825d6a26f 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1212,6 +1212,7 @@ void intel_edp_drrs_disable(struct intel_dp *intel_dp);
 void intel_edp_drrs_invalidate(struct drm_device *dev,
                 unsigned frontbuffer_bits);
 void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffer_bits);
+void hsw_dp_set_ddi_pll_sel(struct intel_crtc_state *pipe_config);
 
 /* intel_dp_mst.c */
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
@@ -1225,7 +1226,7 @@ void intel_dvo_init(struct drm_device *dev);
 
 
 /* legacy fbdev emulation in intel_fbdev.c */
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
 extern int intel_fbdev_init(struct drm_device *dev);
 extern void intel_fbdev_initial_config(void *data, async_cookie_t cookie);
 extern void intel_fbdev_fini(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 6c9351b2e3af..96476d7d7ed2 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -55,13 +55,6 @@ static int intel_fbdev_set_par(struct fb_info *info)
         ret = drm_fb_helper_set_par(info);
 
         if (ret == 0) {
-                /*
-                 * FIXME: fbdev presumes that all callbacks also work from
-                 * atomic contexts and relies on that for emergency oops
-                 * printing. KMS totally doesn't do that and the locking here is
-                 * by far not the only place this goes wrong.  Ignore this for
-                 * now until we solve this for real.
-                 */
                 mutex_lock(&fb_helper->dev->struct_mutex);
                 intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);
                 mutex_unlock(&fb_helper->dev->struct_mutex);
@@ -80,13 +73,6 @@ static int intel_fbdev_blank(int blank, struct fb_info *info)
         ret = drm_fb_helper_blank(blank, info);
 
         if (ret == 0) {
-                /*
-                 * FIXME: fbdev presumes that all callbacks also work from
-                 * atomic contexts and relies on that for emergency oops
-                 * printing. KMS totally doesn't do that and the locking here is
-                 * by far not the only place this goes wrong.  Ignore this for
-                 * now until we solve this for real.
-                 */
                 mutex_lock(&fb_helper->dev->struct_mutex);
                 intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);
                 mutex_unlock(&fb_helper->dev->struct_mutex);
@@ -106,13 +92,6 @@ static int intel_fbdev_pan_display(struct fb_var_screeninfo *var,
         ret = drm_fb_helper_pan_display(var, info);
 
         if (ret == 0) {
-                /*
-                 * FIXME: fbdev presumes that all callbacks also work from
-                 * atomic contexts and relies on that for emergency oops
-                 * printing. KMS totally doesn't do that and the locking here is
-                 * by far not the only place this goes wrong.  Ignore this for
-                 * now until we solve this for real.
-                 */
                 mutex_lock(&fb_helper->dev->struct_mutex);
                 intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);
                 mutex_unlock(&fb_helper->dev->struct_mutex);
@@ -125,9 +104,9 @@ static struct fb_ops intelfb_ops = {
         .owner = THIS_MODULE,
         .fb_check_var = drm_fb_helper_check_var,
         .fb_set_par = intel_fbdev_set_par,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = cfb_copyarea,
-        .fb_imageblit = cfb_imageblit,
+        .fb_fillrect = drm_fb_helper_cfb_fillrect,
+        .fb_copyarea = drm_fb_helper_cfb_copyarea,
+        .fb_imageblit = drm_fb_helper_cfb_imageblit,
         .fb_pan_display = intel_fbdev_pan_display,
         .fb_blank = intel_fbdev_blank,
         .fb_setcmap = drm_fb_helper_setcmap,
@@ -236,9 +215,9 @@ static int intelfb_create(struct drm_fb_helper *helper,
         obj = intel_fb->obj;
         size = obj->base.size;
 
-        info = framebuffer_alloc(0, &dev->pdev->dev);
-        if (!info) {
-                ret = -ENOMEM;
+        info = drm_fb_helper_alloc_fbi(helper);
+        if (IS_ERR(info)) {
+                ret = PTR_ERR(info);
                 goto out_unpin;
         }
 
@@ -247,24 +226,13 @@ static int intelfb_create(struct drm_fb_helper *helper,
         fb = &ifbdev->fb->base;
 
         ifbdev->helper.fb = fb;
-        ifbdev->helper.fbdev = info;
 
         strcpy(info->fix.id, "inteldrmfb");
 
         info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
         info->fbops = &intelfb_ops;
 
-        ret = fb_alloc_cmap(&info->cmap, 256, 0);
-        if (ret) {
-                ret = -ENOMEM;
-                goto out_unpin;
-        }
         /* setup aperture base/size for vesafb takeover */
-        info->apertures = alloc_apertures(1);
-        if (!info->apertures) {
-                ret = -ENOMEM;
-                goto out_unpin;
-        }
         info->apertures->ranges[0].base = dev->mode_config.fb_base;
         info->apertures->ranges[0].size = dev_priv->gtt.mappable_end;
 
@@ -276,7 +244,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
                            size);
         if (!info->screen_base) {
                 ret = -ENOSPC;
-                goto out_unpin;
+                goto out_destroy_fbi;
         }
         info->screen_size = size;
 
@@ -303,6 +271,8 @@ static int intelfb_create(struct drm_fb_helper *helper,
         vga_switcheroo_client_fb_set(dev->pdev, info);
         return 0;
 
+out_destroy_fbi:
+        drm_fb_helper_release_fbi(helper);
 out_unpin:
         i915_gem_object_ggtt_unpin(obj);
         drm_gem_object_unreference(&obj->base);
@@ -544,16 +514,9 @@ static const struct drm_fb_helper_funcs intel_fb_helper_funcs = {
 static void intel_fbdev_destroy(struct drm_device *dev,
                                 struct intel_fbdev *ifbdev)
 {
-        if (ifbdev->helper.fbdev) {
-                struct fb_info *info = ifbdev->helper.fbdev;
 
-                unregister_framebuffer(info);
-                iounmap(info->screen_base);
-                if (info->cmap.len)
-                        fb_dealloc_cmap(&info->cmap);
-
-                framebuffer_release(info);
-        }
+        drm_fb_helper_unregister_fbi(&ifbdev->helper);
+        drm_fb_helper_release_fbi(&ifbdev->helper);
 
         drm_fb_helper_fini(&ifbdev->helper);
 
@@ -802,7 +765,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
         if (state == FBINFO_STATE_RUNNING && ifbdev->fb->obj->stolen)
                 memset_io(info->screen_base, 0, info->screen_size);
 
-        fb_set_suspend(info, state);
+        drm_fb_helper_set_suspend(&ifbdev->helper, state);
         console_unlock();
 }
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 4da737ccf69a..feb31d891482 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2020,6 +2020,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         struct drm_device *dev = intel_encoder->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         enum port port = intel_dig_port->port;
+        uint8_t alternate_ddc_pin;
 
         drm_connector_init(dev, connector, &intel_hdmi_connector_funcs,
                            DRM_MODE_CONNECTOR_HDMIA);
@@ -2060,6 +2061,26 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                         intel_hdmi->ddc_bus = GMBUS_PIN_DPD;
                 intel_encoder->hpd_pin = HPD_PORT_D;
                 break;
+        case PORT_E:
+                /* On SKL PORT E doesn't have seperate GMBUS pin
+                 *  We rely on VBT to set a proper alternate GMBUS pin. */
+                alternate_ddc_pin =
+                        dev_priv->vbt.ddi_port_info[PORT_E].alternate_ddc_pin;
+                switch (alternate_ddc_pin) {
+                case DDC_PIN_B:
+                        intel_hdmi->ddc_bus = GMBUS_PIN_DPB;
+                        break;
+                case DDC_PIN_C:
+                        intel_hdmi->ddc_bus = GMBUS_PIN_DPC;
+                        break;
+                case DDC_PIN_D:
+                        intel_hdmi->ddc_bus = GMBUS_PIN_DPD;
+                        break;
+                default:
+                        MISSING_CASE(alternate_ddc_pin);
+                }
+                intel_encoder->hpd_pin = HPD_PORT_E;
+                break;
         case PORT_A:
                 intel_encoder->hpd_pin = HPD_PORT_A;
                 /* Internal port only for eDP. */
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index 032a0bf75f3b..53c0173a39fe 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -91,6 +91,9 @@ bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port)
         case HPD_PORT_D:
                 *port = PORT_D;
                 return true;
+        case HPD_PORT_E:
+                *port = PORT_E;
+                return true;
         default:
                 return false;   /* no hpd */
         }
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index e9520afc2033..40cbba4ea4ba 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1027,6 +1027,8 @@ static int intel_lr_context_pin(struct drm_i915_gem_request *rq)
                 if (ret)
                         goto unpin_ctx_obj;
 
+                ctx_obj->dirty = true;
+
                 /* Invalidate GuC TLB. */
                 if (i915.enable_guc_submission)
                         I915_WRITE(GEN8_GTCR, GEN8_GTCR_INVALIDATE);
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index b1bd25e1e853..3f682a1a08ce 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -297,6 +297,7 @@ static void hsw_set_power_well(struct drm_i915_private *dev_priv,
         BIT(POWER_DOMAIN_PORT_DDI_C_4_LANES) |          \
         BIT(POWER_DOMAIN_PORT_DDI_D_2_LANES) |          \
         BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) |          \
+        BIT(POWER_DOMAIN_PORT_DDI_E_2_LANES) |          \
         BIT(POWER_DOMAIN_AUX_B) |                       \
         BIT(POWER_DOMAIN_AUX_C) |                       \
         BIT(POWER_DOMAIN_AUX_D) |                       \
@@ -316,6 +317,7 @@ static void hsw_set_power_well(struct drm_i915_private *dev_priv,
 #define SKL_DISPLAY_DDI_A_E_POWER_DOMAINS (             \
         BIT(POWER_DOMAIN_PORT_DDI_A_2_LANES) |          \
         BIT(POWER_DOMAIN_PORT_DDI_A_4_LANES) |          \
+        BIT(POWER_DOMAIN_PORT_DDI_E_2_LANES) |          \
         BIT(POWER_DOMAIN_INIT))
 #define SKL_DISPLAY_DDI_B_POWER_DOMAINS (               \
         BIT(POWER_DOMAIN_PORT_DDI_B_2_LANES) |          \