Update to 3.10.28
diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 332d2c9..31358ba 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.10.27
+3.10.28
diff --git a/patches.baytrail/0108-drm-i915-don-t-setup-hdmi-for-port-D-edp-in-ddi_init.patch b/patches.baytrail/0108-drm-i915-don-t-setup-hdmi-for-port-D-edp-in-ddi_init.patch
index 2690ef7..b8919e9 100644
--- a/patches.baytrail/0108-drm-i915-don-t-setup-hdmi-for-port-D-edp-in-ddi_init.patch
+++ b/patches.baytrail/0108-drm-i915-don-t-setup-hdmi-for-port-D-edp-in-ddi_init.patch
@@ -21,14 +21,12 @@
 	drivers/gpu/drm/i915/intel_ddi.c
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 23 +++++++++++------------
+ drivers/gpu/drm/i915/intel_ddi.c |   23 +++++++++++------------
  1 file changed, 11 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 832401312630..6953a971a4ea 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1490,16 +1490,6 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1496,16 +1496,6 @@ void intel_ddi_init(struct drm_device *d
  		return;
  	}
  
@@ -45,7 +43,7 @@
  	intel_encoder = &intel_dig_port->base;
  	encoder = &intel_encoder->base;
  
-@@ -1527,7 +1517,16 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1533,7 +1523,16 @@ void intel_ddi_init(struct drm_device *d
  	intel_encoder->cloneable = false;
  	intel_encoder->hot_plug = intel_ddi_hot_plug;
  
@@ -64,6 +62,3 @@
 +		intel_hdmi_init_connector(intel_dig_port, hdmi_connector);
 +	}
  }
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0129-drm-i915-only-disable-DDI-sound-if-intel_crtc-eld_vl.patch b/patches.baytrail/0129-drm-i915-only-disable-DDI-sound-if-intel_crtc-eld_vl.patch
index 3e3f8fc..4b0cafa 100644
--- a/patches.baytrail/0129-drm-i915-only-disable-DDI-sound-if-intel_crtc-eld_vl.patch
+++ b/patches.baytrail/0129-drm-i915-only-disable-DDI-sound-if-intel_crtc-eld_vl.patch
@@ -16,15 +16,13 @@
 (cherry picked from commit c77bf5659deb9405ef61080c148e47d2c8ee31e5)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c     | 11 +++++++----
- drivers/gpu/drm/i915/intel_display.c |  2 +-
+ drivers/gpu/drm/i915/intel_ddi.c     |   11 +++++++----
+ drivers/gpu/drm/i915/intel_display.c |    2 +-
  2 files changed, 8 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 6953a971a4ea..46181000f6bd 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1306,7 +1306,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
+@@ -1312,7 +1312,7 @@ static void intel_enable_ddi(struct inte
  		ironlake_edp_backlight_on(intel_dp);
  	}
  
@@ -33,7 +31,7 @@
  		tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
  		tmp |= ((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4));
  		I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp);
-@@ -1324,9 +1324,12 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
+@@ -1330,9 +1330,12 @@ static void intel_disable_ddi(struct int
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	uint32_t tmp;
  
@@ -49,11 +47,9 @@
  
  	if (type == INTEL_OUTPUT_EDP) {
  		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 7e3b4663e51d..f3d8e0915d7f 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -3864,8 +3864,8 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
+@@ -3864,8 +3864,8 @@ static void intel_crtc_disable(struct dr
  	/* crtc should still be enabled when we disable it. */
  	WARN_ON(!crtc->enabled);
  
@@ -63,6 +59,3 @@
  	intel_crtc_update_sarea(crtc, false);
  	dev_priv->display.off(crtc);
  
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch b/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch
index 414fe57..d2d52ec 100644
--- a/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch
+++ b/patches.baytrail/0169-drm-i915-add-encoder-get_config-function-v5.patch
@@ -27,22 +27,20 @@
 (cherry picked from commit 045ac3b5629d9711531a408e92f9074db6afe7ce)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_crt.c     | 23 ++++++++++++++++++++
- drivers/gpu/drm/i915/intel_ddi.c     | 23 ++++++++++++++++++++
- drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++---
- drivers/gpu/drm/i915/intel_dp.c      | 23 ++++++++++++++++++++
- drivers/gpu/drm/i915/intel_drv.h     |  4 ++++
- drivers/gpu/drm/i915/intel_dvo.c     | 21 ++++++++++++++++++
- drivers/gpu/drm/i915/intel_hdmi.c    | 23 ++++++++++++++++++++
- drivers/gpu/drm/i915/intel_lvds.c    | 26 ++++++++++++++++++++++
- drivers/gpu/drm/i915/intel_sdvo.c    | 42 ++++++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_crt.c     |   23 +++++++++++++++++++
+ drivers/gpu/drm/i915/intel_ddi.c     |   23 +++++++++++++++++++
+ drivers/gpu/drm/i915/intel_display.c |   20 ++++++++++++++--
+ drivers/gpu/drm/i915/intel_dp.c      |   23 +++++++++++++++++++
+ drivers/gpu/drm/i915/intel_drv.h     |    4 +++
+ drivers/gpu/drm/i915/intel_dvo.c     |   21 +++++++++++++++++
+ drivers/gpu/drm/i915/intel_hdmi.c    |   23 +++++++++++++++++++
+ drivers/gpu/drm/i915/intel_lvds.c    |   26 +++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_sdvo.c    |   42 +++++++++++++++++++++++++++++++++++
  9 files changed, 202 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index 66a0c6f0bb81..5e9f93e53255 100644
 --- a/drivers/gpu/drm/i915/intel_crt.c
 +++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -84,6 +84,28 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
+@@ -84,6 +84,28 @@ static bool intel_crt_get_hw_state(struc
  	return true;
  }
  
@@ -71,7 +69,7 @@
  /* Note: The caller is required to filter out dpms modes not supported by the
   * platform. */
  static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
-@@ -778,6 +800,7 @@ void intel_crt_init(struct drm_device *dev)
+@@ -778,6 +800,7 @@ void intel_crt_init(struct drm_device *d
  	crt->base.compute_config = intel_crt_compute_config;
  	crt->base.disable = intel_disable_crt;
  	crt->base.enable = intel_enable_crt;
@@ -79,11 +77,9 @@
  	if (I915_HAS_HOTPLUG(dev))
  		crt->base.hpd_pin = HPD_CRT;
  	if (HAS_DDI(dev))
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 7799de733917..af699def47f0 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1260,6 +1260,28 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
+@@ -1266,6 +1266,28 @@ static void intel_ddi_hot_plug(struct in
  		intel_dp_check_link_status(intel_dp);
  }
  
@@ -112,7 +108,7 @@
  static void intel_ddi_destroy(struct drm_encoder *encoder)
  {
  	/* HDMI has nothing special to destroy, so we can go with this. */
-@@ -1319,6 +1341,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1325,6 +1347,7 @@ void intel_ddi_init(struct drm_device *d
  	intel_encoder->disable = intel_disable_ddi;
  	intel_encoder->post_disable = intel_ddi_post_disable;
  	intel_encoder->get_hw_state = intel_ddi_get_hw_state;
@@ -120,11 +116,9 @@
  
  	intel_dig_port->port = port;
  	intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 7137d17f16b3..d2a01268443b 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -8071,6 +8071,15 @@ intel_pipe_config_compare(struct drm_device *dev,
+@@ -8071,6 +8071,15 @@ intel_pipe_config_compare(struct drm_dev
  	PIPE_CONF_CHECK_FLAGS(adjusted_mode.flags,
  			      DRM_MODE_FLAG_INTERLACE);
  
@@ -140,7 +134,7 @@
  	PIPE_CONF_CHECK_I(requested_mode.hdisplay);
  	PIPE_CONF_CHECK_I(requested_mode.vdisplay);
  
-@@ -8163,6 +8172,8 @@ intel_modeset_check_state(struct drm_device *dev)
+@@ -8163,6 +8172,8 @@ intel_modeset_check_state(struct drm_dev
  		bool enabled = false;
  		bool active = false;
  
@@ -149,7 +143,7 @@
  		DRM_DEBUG_KMS("[CRTC:%d]\n",
  			      crtc->base.base.id);
  
-@@ -8176,6 +8187,8 @@ intel_modeset_check_state(struct drm_device *dev)
+@@ -8176,6 +8187,8 @@ intel_modeset_check_state(struct drm_dev
  			enabled = true;
  			if (encoder->connectors_active)
  				active = true;
@@ -158,7 +152,7 @@
  		}
  		WARN(active != crtc->active,
  		     "crtc's computed active state doesn't match tracked active state "
-@@ -8184,7 +8197,6 @@ intel_modeset_check_state(struct drm_device *dev)
+@@ -8184,7 +8197,6 @@ intel_modeset_check_state(struct drm_dev
  		     "crtc's computed enabled state doesn't match tracked enabled state "
  		     "(expected %i, found %i)\n", enabled, crtc->base.enabled);
  
@@ -179,11 +173,9 @@
  		} else {
  			encoder->base.crtc = NULL;
  		}
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 848d3d436f7e..8c282c8af0ed 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1366,6 +1366,28 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,
+@@ -1366,6 +1366,28 @@ static bool intel_dp_get_hw_state(struct
  	return true;
  }
  
@@ -212,7 +204,7 @@
  static void intel_disable_dp(struct intel_encoder *encoder)
  {
  	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
-@@ -3204,6 +3226,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
+@@ -3204,6 +3226,7 @@ intel_dp_init(struct drm_device *dev, in
  	intel_encoder->disable = intel_disable_dp;
  	intel_encoder->post_disable = intel_post_disable_dp;
  	intel_encoder->get_hw_state = intel_dp_get_hw_state;
@@ -220,8 +212,6 @@
  	if (IS_VALLEYVIEW(dev))
  		intel_encoder->pre_pll_enable = intel_dp_pre_pll_enable;
  
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index 8ef7496b74ef..f0cae755a0a6 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
 @@ -139,6 +139,10 @@ struct intel_encoder {
@@ -235,11 +225,9 @@
  	int crtc_mask;
  	enum hpd_pin hpd_pin;
  };
-diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
-index 2c0be924e9a9..9e80d487b5cb 100644
 --- a/drivers/gpu/drm/i915/intel_dvo.c
 +++ b/drivers/gpu/drm/i915/intel_dvo.c
-@@ -136,6 +136,26 @@ static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,
+@@ -136,6 +136,26 @@ static bool intel_dvo_get_hw_state(struc
  	return true;
  }
  
@@ -266,7 +254,7 @@
  static void intel_disable_dvo(struct intel_encoder *encoder)
  {
  	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
-@@ -447,6 +467,7 @@ void intel_dvo_init(struct drm_device *dev)
+@@ -447,6 +467,7 @@ void intel_dvo_init(struct drm_device *d
  	intel_encoder->disable = intel_disable_dvo;
  	intel_encoder->enable = intel_enable_dvo;
  	intel_encoder->get_hw_state = intel_dvo_get_hw_state;
@@ -274,11 +262,9 @@
  	intel_connector->get_hw_state = intel_dvo_connector_get_hw_state;
  
  	/* Now, try to find a controller */
-diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
-index 2b727f0d201f..18f8ce0404c6 100644
 --- a/drivers/gpu/drm/i915/intel_hdmi.c
 +++ b/drivers/gpu/drm/i915/intel_hdmi.c
-@@ -658,6 +658,28 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
+@@ -658,6 +658,28 @@ static bool intel_hdmi_get_hw_state(stru
  	return true;
  }
  
@@ -307,7 +293,7 @@
  static void intel_enable_hdmi(struct intel_encoder *encoder)
  {
  	struct drm_device *dev = encoder->base.dev;
-@@ -1216,6 +1238,7 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
+@@ -1216,6 +1238,7 @@ void intel_hdmi_init(struct drm_device *
  	intel_encoder->enable = intel_enable_hdmi;
  	intel_encoder->disable = intel_disable_hdmi;
  	intel_encoder->get_hw_state = intel_hdmi_get_hw_state;
@@ -315,11 +301,9 @@
  	if (IS_VALLEYVIEW(dev)) {
  		intel_encoder->pre_enable = intel_hdmi_pre_enable;
  		intel_encoder->pre_pll_enable = intel_hdmi_pre_pll_enable;
-diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index fa7511143974..0b67e89cac9c 100644
 --- a/drivers/gpu/drm/i915/intel_lvds.c
 +++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -86,6 +86,31 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
+@@ -86,6 +86,31 @@ static bool intel_lvds_get_hw_state(stru
  	return true;
  }
  
@@ -351,7 +335,7 @@
  /* The LVDS pin pair needs to be on before the DPLLs are enabled.
   * This is an exception to the general rule that mode_set doesn't turn
   * things on.
-@@ -953,6 +978,7 @@ bool intel_lvds_init(struct drm_device *dev)
+@@ -953,6 +978,7 @@ bool intel_lvds_init(struct drm_device *
  	intel_encoder->compute_config = intel_lvds_compute_config;
  	intel_encoder->disable = intel_disable_lvds;
  	intel_encoder->get_hw_state = intel_lvds_get_hw_state;
@@ -359,11 +343,9 @@
  	intel_connector->get_hw_state = intel_connector_get_hw_state;
  
  	intel_connector_attach_encoder(intel_connector, intel_encoder);
-diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index 474fa8addab1..f8ad93bd7d9b 100644
 --- a/drivers/gpu/drm/i915/intel_sdvo.c
 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
-@@ -712,6 +712,13 @@ static bool intel_sdvo_set_timing(struct intel_sdvo *intel_sdvo, u8 cmd,
+@@ -712,6 +712,13 @@ static bool intel_sdvo_set_timing(struct
  		intel_sdvo_set_value(intel_sdvo, cmd + 1, &dtd->part2, sizeof(dtd->part2));
  }
  
@@ -377,7 +359,7 @@
  static bool intel_sdvo_set_input_timing(struct intel_sdvo *intel_sdvo,
  					 struct intel_sdvo_dtd *dtd)
  {
-@@ -726,6 +733,13 @@ static bool intel_sdvo_set_output_timing(struct intel_sdvo *intel_sdvo,
+@@ -726,6 +733,13 @@ static bool intel_sdvo_set_output_timing
  				     SDVO_CMD_SET_OUTPUT_TIMINGS_PART1, dtd);
  }
  
@@ -391,7 +373,7 @@
  static bool
  intel_sdvo_create_preferred_input_timing(struct intel_sdvo *intel_sdvo,
  					 uint16_t clock,
-@@ -1295,6 +1309,33 @@ static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder,
+@@ -1295,6 +1309,33 @@ static bool intel_sdvo_get_hw_state(stru
  	return true;
  }
  
@@ -425,7 +407,7 @@
  static void intel_disable_sdvo(struct intel_encoder *encoder)
  {
  	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
-@@ -2821,6 +2862,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
+@@ -2821,6 +2862,7 @@ bool intel_sdvo_init(struct drm_device *
  	intel_encoder->mode_set = intel_sdvo_mode_set;
  	intel_encoder->enable = intel_enable_sdvo;
  	intel_encoder->get_hw_state = intel_sdvo_get_hw_state;
@@ -433,6 +415,3 @@
  
  	/* In default case sdvo lvds is false */
  	if (!intel_sdvo_get_capabilities(intel_sdvo, &intel_sdvo->caps))
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0174-drm-i915-make-intel_ddi_get_cdclk_freq-return-values.patch b/patches.baytrail/0174-drm-i915-make-intel_ddi_get_cdclk_freq-return-values.patch
index 48dd343..d91a6d5 100644
--- a/patches.baytrail/0174-drm-i915-make-intel_ddi_get_cdclk_freq-return-values.patch
+++ b/patches.baytrail/0174-drm-i915-make-intel_ddi_get_cdclk_freq-return-values.patch
@@ -46,15 +46,13 @@
 (cherry picked from commit b2b877ffe37d699f77f45e993590b66010491c52)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 10 +++++-----
- drivers/gpu/drm/i915/intel_dp.c  |  3 ++-
+ drivers/gpu/drm/i915/intel_ddi.c |   10 +++++-----
+ drivers/gpu/drm/i915/intel_dp.c  |    3 ++-
  2 files changed, 7 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index af699def47f0..418b91c28ed6 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1154,14 +1154,14 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
+@@ -1160,14 +1160,14 @@ static void intel_disable_ddi(struct int
  int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
  {
  	if (I915_READ(HSW_FUSE_STRAP) & HSW_CDCLK_LIMIT)
@@ -73,7 +71,7 @@
  }
  
  void intel_ddi_pll_init(struct drm_device *dev)
-@@ -1174,7 +1174,7 @@ void intel_ddi_pll_init(struct drm_device *dev)
+@@ -1180,7 +1180,7 @@ void intel_ddi_pll_init(struct drm_devic
  	 * Don't even try to turn it on.
  	 */
  
@@ -82,11 +80,9 @@
  		      intel_ddi_get_cdclk_freq(dev_priv));
  
  	if (val & LCPLL_CD_SOURCE_FCLK)
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 8c282c8af0ed..73b97a1b2143 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -319,7 +319,8 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
+@@ -319,7 +319,8 @@ intel_dp_aux_ch(struct intel_dp *intel_d
  	 */
  	if (is_cpu_edp(intel_dp)) {
  		if (HAS_DDI(dev))
@@ -96,6 +92,3 @@
  		else if (IS_VALLEYVIEW(dev))
  			aux_clock_divider = 100;
  		else if (IS_GEN6(dev) || IS_GEN7(dev))
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0205-drm-i915-hw-state-readout-check-support-for-cpu_tran.patch b/patches.baytrail/0205-drm-i915-hw-state-readout-check-support-for-cpu_tran.patch
index 47ff673..80b9456 100644
--- a/patches.baytrail/0205-drm-i915-hw-state-readout-check-support-for-cpu_tran.patch
+++ b/patches.baytrail/0205-drm-i915-hw-state-readout-check-support-for-cpu_tran.patch
@@ -36,15 +36,13 @@
 (cherry picked from commit eccb140bca6727f2ef849e8811d5fe4c9fbfd5dd)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c     |  4 ++
- drivers/gpu/drm/i915/intel_display.c | 90 +++++++++++++-----------------------
+ drivers/gpu/drm/i915/intel_ddi.c     |    4 +
+ drivers/gpu/drm/i915/intel_display.c |   90 ++++++++++++-----------------------
  2 files changed, 37 insertions(+), 57 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 418b91c28ed6..74b372dc14a4 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1292,9 +1292,13 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder,
+@@ -1298,9 +1298,13 @@ static bool intel_ddi_compute_config(str
  				     struct intel_crtc_config *pipe_config)
  {
  	int type = encoder->type;
@@ -58,11 +56,9 @@
  	if (type == INTEL_OUTPUT_HDMI)
  		return intel_hdmi_compute_config(encoder, pipe_config);
  	else
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 0159fe522d0d..371cd327b6ea 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -3469,12 +3469,6 @@ static void ironlake_crtc_off(struct drm_crtc *crtc)
+@@ -3469,12 +3469,6 @@ static void ironlake_crtc_off(struct drm
  
  static void haswell_crtc_off(struct drm_crtc *crtc)
  {
@@ -75,7 +71,7 @@
  	intel_ddi_put_crtc_pll(crtc);
  }
  
-@@ -4925,6 +4919,8 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
+@@ -4925,6 +4919,8 @@ static bool i9xx_get_pipe_config(struct
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	uint32_t tmp;
  
@@ -84,7 +80,7 @@
  	tmp = I915_READ(PIPECONF(crtc->pipe));
  	if (!(tmp & PIPECONF_ENABLE))
  		return false;
-@@ -5647,8 +5643,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
+@@ -5647,8 +5643,6 @@ static int ironlake_crtc_mode_set(struct
  	WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)),
  	     "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev));
  
@@ -93,7 +89,7 @@
  	ok = ironlake_compute_clocks(crtc, adjusted_mode, &clock,
  				     &has_reduced_clock, &reduced_clock);
  	if (!ok) {
-@@ -5784,6 +5778,8 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
+@@ -5784,6 +5778,8 @@ static bool ironlake_get_pipe_config(str
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	uint32_t tmp;
  
@@ -102,7 +98,7 @@
  	tmp = I915_READ(PIPECONF(crtc->pipe));
  	if (!(tmp & PIPECONF_ENABLE))
  		return false;
-@@ -5860,11 +5856,6 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc,
+@@ -5860,11 +5856,6 @@ static int haswell_crtc_mode_set(struct
  		num_connectors++;
  	}
  
@@ -114,7 +110,7 @@
  	/* We are not sure yet this won't happen. */
  	WARN(!HAS_PCH_LPT(dev), "Unexpected PCH type %d\n",
  	     INTEL_PCH_TYPE(dev));
-@@ -5918,15 +5909,37 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
+@@ -5918,15 +5909,37 @@ static bool haswell_get_pipe_config(stru
  {
  	struct drm_device *dev = crtc->base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -155,7 +151,7 @@
  	if (!(tmp & PIPECONF_ENABLE))
  		return false;
  
-@@ -5935,7 +5948,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
+@@ -5935,7 +5948,7 @@ static bool haswell_get_pipe_config(stru
  	 * DDI E. So just check whether this pipe is wired to DDI E and whether
  	 * the PCH transcoder is on.
  	 */
@@ -164,7 +160,7 @@
  	if ((tmp & TRANS_DDI_PORT_MASK) == TRANS_DDI_SELECT_PORT(PORT_E) &&
  	    I915_READ(LPT_TRANSCONF) & TRANS_ENABLE) {
  		pipe_config->has_pch_encoder = true;
-@@ -7694,6 +7707,7 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
+@@ -7694,6 +7707,7 @@ intel_modeset_pipe_config(struct drm_crt
  
  	drm_mode_copy(&pipe_config->adjusted_mode, mode);
  	drm_mode_copy(&pipe_config->requested_mode, mode);
@@ -172,7 +168,7 @@
  
  	plane_bpp = pipe_config_set_bpp(crtc, fb, pipe_config);
  	if (plane_bpp < 0)
-@@ -7944,6 +7958,8 @@ intel_pipe_config_compare(struct drm_device *dev,
+@@ -7944,6 +7958,8 @@ intel_pipe_config_compare(struct drm_dev
  		return false; \
  	}
  
@@ -181,7 +177,7 @@
  	PIPE_CONF_CHECK_I(has_pch_encoder);
  	PIPE_CONF_CHECK_I(fdi_lanes);
  	PIPE_CONF_CHECK_I(fdi_m_n.gmch_m);
-@@ -8095,7 +8111,6 @@ intel_modeset_check_state(struct drm_device *dev)
+@@ -8095,7 +8111,6 @@ intel_modeset_check_state(struct drm_dev
  		     "crtc's computed enabled state doesn't match tracked enabled state "
  		     "(expected %i, found %i)\n", enabled, crtc->base.enabled);
  
@@ -189,7 +185,7 @@
  		active = dev_priv->display.get_pipe_config(crtc,
  							   &pipe_config);
  
-@@ -8163,12 +8178,10 @@ static int __intel_set_mode(struct drm_crtc *crtc,
+@@ -8163,12 +8178,10 @@ static int __intel_set_mode(struct drm_c
  	 * to set it here already despite that we pass it down the callchain.
  	 */
  	if (modeset_pipes) {
@@ -202,7 +198,7 @@
  	}
  
  	/* Only after disabling all output pipelines that will be changed can we
-@@ -8597,7 +8610,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -8597,7 +8610,6 @@ static void intel_crtc_init(struct drm_d
  	/* Swap pipes & planes for FBC on pre-965 */
  	intel_crtc->pipe = pipe;
  	intel_crtc->plane = pipe;
@@ -210,7 +206,7 @@
  	if (IS_MOBILE(dev) && IS_GEN3(dev)) {
  		DRM_DEBUG_KMS("swapping pipes & planes for FBC\n");
  		intel_crtc->plane = !pipe;
-@@ -9483,50 +9495,14 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
+@@ -9483,50 +9495,14 @@ void intel_modeset_setup_hw_state(struct
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	enum pipe pipe;
@@ -261,6 +257,3 @@
  
  		crtc->active = dev_priv->display.get_pipe_config(crtc,
  								 &crtc->config);
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0263-drm-i915-set-default-value-for-config-pixel_multipli.patch b/patches.baytrail/0263-drm-i915-set-default-value-for-config-pixel_multipli.patch
index 89cd106..0dc7e7c 100644
--- a/patches.baytrail/0263-drm-i915-set-default-value-for-config-pixel_multipli.patch
+++ b/patches.baytrail/0263-drm-i915-set-default-value-for-config-pixel_multipli.patch
@@ -17,16 +17,14 @@
 (cherry picked from commit ef1b460d1bab7e5b04c34f88c3dfa042528e7c27)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c     |  1 -
- drivers/gpu/drm/i915/intel_display.c | 29 ++++++++++-------------------
- drivers/gpu/drm/i915/intel_sdvo.c    |  1 +
+ drivers/gpu/drm/i915/intel_ddi.c     |    1 -
+ drivers/gpu/drm/i915/intel_display.c |   29 ++++++++++-------------------
+ drivers/gpu/drm/i915/intel_sdvo.c    |    1 +
  3 files changed, 11 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index fc31ffa497eb..6df049fe7462 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1280,7 +1280,6 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
+@@ -1286,7 +1286,6 @@ static void intel_ddi_get_config(struct
  		flags |= DRM_MODE_FLAG_NVSYNC;
  
  	pipe_config->adjusted_mode.flags |= flags;
@@ -34,8 +32,6 @@
  }
  
  static void intel_ddi_destroy(struct drm_encoder *encoder)
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index f8bfd510d2ff..7bd619db7cd6 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -3999,8 +3999,7 @@ retry:
@@ -48,7 +44,7 @@
  
  	lane = ironlake_get_lanes_required(fdi_dotclock, link_bw,
  					   pipe_config->pipe_bpp);
-@@ -4454,11 +4453,8 @@ static void vlv_update_pll(struct intel_crtc *crtc)
+@@ -4454,11 +4453,8 @@ static void vlv_update_pll(struct intel_
  	if (wait_for(((I915_READ(DPLL(pipe)) & DPLL_LOCK_VLV) == DPLL_LOCK_VLV), 1))
  		DRM_ERROR("DPLL %d failed to lock\n", pipe);
  
@@ -62,7 +58,7 @@
  	I915_WRITE(DPLL_MD(pipe), dpll_md);
  	POSTING_READ(DPLL_MD(pipe));
  
-@@ -4492,8 +4488,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,
+@@ -4492,8 +4488,7 @@ static void i9xx_update_pll(struct intel
  	else
  		dpll |= DPLLB_MODE_DAC_SERIAL;
  
@@ -72,7 +68,7 @@
  		dpll |= (crtc->config.pixel_multiplier - 1)
  			<< SDVO_MULTIPLIER_SHIFT_HIRES;
  	}
-@@ -4556,11 +4551,8 @@ static void i9xx_update_pll(struct intel_crtc *crtc,
+@@ -4556,11 +4551,8 @@ static void i9xx_update_pll(struct intel
  	udelay(150);
  
  	if (INTEL_INFO(dev)->gen >= 4) {
@@ -86,7 +82,7 @@
  		I915_WRITE(DPLL_MD(pipe), dpll_md);
  	} else {
  		/* The pixel multiplier can only be updated once the
-@@ -5613,10 +5605,8 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,
+@@ -5613,10 +5605,8 @@ static uint32_t ironlake_compute_dpll(st
  	else
  		dpll |= DPLLB_MODE_DAC_SERIAL;
  
@@ -99,7 +95,7 @@
  
  	if (is_sdvo)
  		dpll |= DPLL_DVO_HIGH_SPEED;
-@@ -7787,8 +7777,9 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
+@@ -7787,8 +7777,9 @@ intel_modeset_pipe_config(struct drm_crt
  		goto fail;
  
  encoder_retry:
@@ -110,11 +106,9 @@
  
  	/* Pass our mode to the connectors and the CRTC to give them a chance to
  	 * adjust it according to limitations or connector properties, and also
-diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index c55841937705..73179dfa5daa 100644
 --- a/drivers/gpu/drm/i915/intel_sdvo.c
 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
-@@ -1219,6 +1219,7 @@ static void intel_sdvo_mode_set(struct intel_encoder *intel_encoder)
+@@ -1219,6 +1219,7 @@ static void intel_sdvo_mode_set(struct i
  
  	switch (intel_crtc->config.pixel_multiplier) {
  	default:
@@ -122,6 +116,3 @@
  	case 1: rate = SDVO_CLOCK_RATE_MULT_1X; break;
  	case 2: rate = SDVO_CLOCK_RATE_MULT_2X; break;
  	case 4: rate = SDVO_CLOCK_RATE_MULT_4X; break;
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0336-drm-i915-propagate-errors-from-intel_dp_init_connect.patch b/patches.baytrail/0336-drm-i915-propagate-errors-from-intel_dp_init_connect.patch
index fa41dc0..9a40f34 100644
--- a/patches.baytrail/0336-drm-i915-propagate-errors-from-intel_dp_init_connect.patch
+++ b/patches.baytrail/0336-drm-i915-propagate-errors-from-intel_dp_init_connect.patch
@@ -23,16 +23,14 @@
 (cherry picked from commit 16c255335b0ec39b4e5e976f4b260978aeed5a68)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 3 ++-
- drivers/gpu/drm/i915/intel_dp.c  | 6 ++++--
- drivers/gpu/drm/i915/intel_drv.h | 2 +-
+ drivers/gpu/drm/i915/intel_ddi.c |    3 ++-
+ drivers/gpu/drm/i915/intel_dp.c  |    6 ++++--
+ drivers/gpu/drm/i915/intel_drv.h |    2 +-
  3 files changed, 7 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 6df049fe7462..73acdbae3301 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1360,7 +1360,8 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1366,7 +1366,8 @@ void intel_ddi_init(struct drm_device *d
  	intel_encoder->cloneable = false;
  	intel_encoder->hot_plug = intel_ddi_hot_plug;
  
@@ -42,11 +40,9 @@
  
  	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
  		hdmi_connector = kzalloc(sizeof(struct intel_connector),
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index b307befdbdb0..cd7a28762333 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -3046,7 +3046,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+@@ -3046,7 +3046,7 @@ static bool intel_edp_init_connector(str
  	return true;
  }
  
@@ -55,7 +51,7 @@
  intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
  			struct intel_connector *intel_connector)
  {
-@@ -3158,7 +3158,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
+@@ -3158,7 +3158,7 @@ intel_dp_init_connector(struct intel_dig
  	intel_dp_i2c_init(intel_dp, intel_connector, name);
  
  	if (!intel_edp_init_connector(intel_dp, intel_connector))
@@ -64,7 +60,7 @@
  
  	intel_dp_add_properties(intel_dp, connector);
  
-@@ -3170,6 +3170,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
+@@ -3170,6 +3170,8 @@ intel_dp_init_connector(struct intel_dig
  		u32 temp = I915_READ(PEG_BAND_GAP_DATA);
  		I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
  	}
@@ -73,11 +69,9 @@
  }
  
  void
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index 20396d624819..c7b93c61e467 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -586,7 +586,7 @@ extern void intel_lvds_init(struct drm_device *dev);
+@@ -586,7 +586,7 @@ extern void intel_lvds_init(struct drm_d
  extern bool intel_is_dual_link_lvds(struct drm_device *dev);
  extern void intel_dp_init(struct drm_device *dev, int output_reg,
  			  enum port port);
@@ -86,6 +80,3 @@
  				    struct intel_connector *intel_connector);
  extern void intel_dp_init_link_config(struct intel_dp *intel_dp);
  extern void intel_dp_start_link_train(struct intel_dp *intel_dp);
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0337-drm-i915-fix-the-ghost-eDP-connector-unwind-path.patch b/patches.baytrail/0337-drm-i915-fix-the-ghost-eDP-connector-unwind-path.patch
index f93279b..7d01f5b 100644
--- a/patches.baytrail/0337-drm-i915-fix-the-ghost-eDP-connector-unwind-path.patch
+++ b/patches.baytrail/0337-drm-i915-fix-the-ghost-eDP-connector-unwind-path.patch
@@ -27,15 +27,13 @@
 (cherry picked from commit b2f246a8998ccf9e00477c8829a62139804e9857)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 4 +++-
- drivers/gpu/drm/i915/intel_dp.c  | 9 ++++++---
+ drivers/gpu/drm/i915/intel_ddi.c |    4 +++-
+ drivers/gpu/drm/i915/intel_dp.c  |    9 ++++++---
  2 files changed, 9 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 73acdbae3301..c7cac2f9a053 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1360,8 +1360,10 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1366,8 +1366,10 @@ void intel_ddi_init(struct drm_device *d
  	intel_encoder->cloneable = false;
  	intel_encoder->hot_plug = intel_ddi_hot_plug;
  
@@ -47,11 +45,9 @@
  
  	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
  		hdmi_connector = kzalloc(sizeof(struct intel_connector),
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index cd7a28762333..7da84180d7ce 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -2998,7 +2998,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+@@ -2998,7 +2998,6 @@ static bool intel_edp_init_connector(str
  		/* if this fails, presume the device is a ghost */
  		DRM_INFO("failed to retrieve link info, disabling eDP\n");
  		intel_dp_encoder_destroy(&intel_dig_port->base.base);
@@ -59,7 +55,7 @@
  		return false;
  	}
  
-@@ -3157,8 +3156,11 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
+@@ -3157,8 +3156,11 @@ intel_dp_init_connector(struct intel_dig
  
  	intel_dp_i2c_init(intel_dp, intel_connector, name);
  
@@ -72,7 +68,7 @@
  
  	intel_dp_add_properties(intel_dp, connector);
  
-@@ -3217,5 +3219,6 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
+@@ -3217,5 +3219,6 @@ intel_dp_init(struct drm_device *dev, in
  	intel_encoder->cloneable = false;
  	intel_encoder->hot_plug = intel_dp_hot_plug;
  
@@ -80,6 +76,3 @@
 +	if (!intel_dp_init_connector(intel_dig_port, intel_connector))
 +		kfree(intel_connector);
  }
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0338-drm-i915-fix-the-ghost-eDP-encoder-unwind-path.patch b/patches.baytrail/0338-drm-i915-fix-the-ghost-eDP-encoder-unwind-path.patch
index 81be146..0bae060 100644
--- a/patches.baytrail/0338-drm-i915-fix-the-ghost-eDP-encoder-unwind-path.patch
+++ b/patches.baytrail/0338-drm-i915-fix-the-ghost-eDP-encoder-unwind-path.patch
@@ -30,15 +30,13 @@
 (cherry picked from commit 15b1d171d87e86366266255462e6b11d21b61c1c)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c |  2 ++
- drivers/gpu/drm/i915/intel_dp.c  | 13 +++++++++++--
+ drivers/gpu/drm/i915/intel_ddi.c |    2 ++
+ drivers/gpu/drm/i915/intel_dp.c  |   13 +++++++++++--
  2 files changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index c7cac2f9a053..0bf5be1bf5c9 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1361,6 +1361,8 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1367,6 +1367,8 @@ void intel_ddi_init(struct drm_device *d
  	intel_encoder->hot_plug = intel_ddi_hot_plug;
  
  	if (!intel_dp_init_connector(intel_dig_port, dp_connector)) {
@@ -47,11 +45,9 @@
  		kfree(dp_connector);
  		return;
  	}
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 7da84180d7ce..0cd390ef6f0e 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -2997,7 +2997,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+@@ -2997,7 +2997,6 @@ static bool intel_edp_init_connector(str
  	} else {
  		/* if this fails, presume the device is a ghost */
  		DRM_INFO("failed to retrieve link info, disabling eDP\n");
@@ -59,7 +55,7 @@
  		return false;
  	}
  
-@@ -3157,6 +3156,13 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
+@@ -3157,6 +3156,13 @@ intel_dp_init_connector(struct intel_dig
  	intel_dp_i2c_init(intel_dp, intel_connector, name);
  
  	if (!intel_edp_init_connector(intel_dp, intel_connector)) {
@@ -73,7 +69,7 @@
  		drm_sysfs_connector_remove(connector);
  		drm_connector_cleanup(connector);
  		return false;
-@@ -3219,6 +3225,9 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
+@@ -3219,6 +3225,9 @@ intel_dp_init(struct drm_device *dev, in
  	intel_encoder->cloneable = false;
  	intel_encoder->hot_plug = intel_dp_hot_plug;
  
@@ -84,6 +80,3 @@
  		kfree(intel_connector);
 +	}
  }
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0375-drm-i915-Preserve-the-DDI_A_4_LANES-bit-from-the-bio.patch b/patches.baytrail/0375-drm-i915-Preserve-the-DDI_A_4_LANES-bit-from-the-bio.patch
index be49c46..0951eab 100644
--- a/patches.baytrail/0375-drm-i915-Preserve-the-DDI_A_4_LANES-bit-from-the-bio.patch
+++ b/patches.baytrail/0375-drm-i915-Preserve-the-DDI_A_4_LANES-bit-from-the-bio.patch
@@ -24,14 +24,12 @@
 	drivers/gpu/drm/i915/intel_ddi.c
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 2 --
+ drivers/gpu/drm/i915/intel_ddi.c |    2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 0bf5be1bf5c9..b042ee5c4070 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1351,8 +1351,6 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1357,8 +1357,6 @@ void intel_ddi_init(struct drm_device *d
  	intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
  					  (DDI_BUF_PORT_REVERSAL |
  					   DDI_A_4_LANES);
@@ -40,6 +38,3 @@
  	intel_dig_port->dp.output_reg = DDI_BUF_CTL(port);
  
  	intel_encoder->type = INTEL_OUTPUT_UNKNOWN;
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0490-drm-i915-Hook-PSR-functionality.patch b/patches.baytrail/0490-drm-i915-Hook-PSR-functionality.patch
index 57d6919..d38663f 100644
--- a/patches.baytrail/0490-drm-i915-Hook-PSR-functionality.patch
+++ b/patches.baytrail/0490-drm-i915-Hook-PSR-functionality.patch
@@ -22,15 +22,13 @@
 (cherry picked from commit 4906557eb37b7fef84fad4304acef6dedf919880)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c     | 2 ++
- drivers/gpu/drm/i915/intel_display.c | 1 +
+ drivers/gpu/drm/i915/intel_ddi.c     |    2 ++
+ drivers/gpu/drm/i915/intel_display.c |    1 +
  2 files changed, 3 insertions(+)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index b042ee5c4070..931b4bb1f9dc 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1118,6 +1118,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
+@@ -1124,6 +1124,7 @@ static void intel_enable_ddi(struct inte
  			intel_dp_stop_link_train(intel_dp);
  
  		ironlake_edp_backlight_on(intel_dp);
@@ -38,7 +36,7 @@
  	}
  
  	if (intel_crtc->eld_vld && type != INTEL_OUTPUT_EDP) {
-@@ -1148,6 +1149,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
+@@ -1154,6 +1155,7 @@ static void intel_disable_ddi(struct int
  	if (type == INTEL_OUTPUT_EDP) {
  		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
  
@@ -46,11 +44,9 @@
  		ironlake_edp_backlight_off(intel_dp);
  	}
  }
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index e11d7426328f..55fcab85b7db 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -2274,6 +2274,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -2274,6 +2274,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  	}
  
  	intel_update_fbc(dev);
@@ -58,6 +54,3 @@
  	mutex_unlock(&dev->struct_mutex);
  
  	intel_crtc_update_sarea_pos(crtc, x, y);
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0547-drm-i915-ddi-use-the-native-encoder-mode_set-callbac.patch b/patches.baytrail/0547-drm-i915-ddi-use-the-native-encoder-mode_set-callbac.patch
index f715554..79f5f1d 100644
--- a/patches.baytrail/0547-drm-i915-ddi-use-the-native-encoder-mode_set-callbac.patch
+++ b/patches.baytrail/0547-drm-i915-ddi-use-the-native-encoder-mode_set-callbac.patch
@@ -10,14 +10,12 @@
 (cherry picked from commit c7d8be305aa28dd809dedd401adcd4da8e4f9144)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++-----------------------
+ drivers/gpu/drm/i915/intel_ddi.c |   39 ++++++++++++++++-----------------------
  1 file changed, 16 insertions(+), 23 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 931b4bb1f9dc..b361c0862373 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -281,25 +281,22 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
+@@ -281,25 +281,22 @@ void hsw_fdi_link_train(struct drm_crtc
  	DRM_ERROR("FDI link training failed!\n");
  }
  
@@ -52,7 +50,7 @@
  
  		intel_dp->DP = intel_dig_port->saved_port_bits |
  			       DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;
-@@ -307,17 +304,17 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
+@@ -307,17 +304,17 @@ static void intel_ddi_mode_set(struct dr
  
  		if (intel_dp->has_audio) {
  			DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",
@@ -73,7 +71,7 @@
  
  		if (intel_hdmi->has_audio) {
  			/* Proper support for digital audio needs a new logic
-@@ -325,14 +322,14 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
+@@ -325,14 +322,14 @@ static void intel_ddi_mode_set(struct dr
  			 * patch bombing.
  			 */
  			DRM_DEBUG_DRIVER("HDMI audio on pipe %c on DDI\n",
@@ -91,7 +89,7 @@
  	}
  }
  
-@@ -1311,10 +1308,6 @@ static const struct drm_encoder_funcs intel_ddi_funcs = {
+@@ -1317,10 +1314,6 @@ static const struct drm_encoder_funcs in
  	.destroy = intel_ddi_destroy,
  };
  
@@ -102,7 +100,7 @@
  void intel_ddi_init(struct drm_device *dev, enum port port)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -1339,9 +1332,9 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1345,9 +1338,9 @@ void intel_ddi_init(struct drm_device *d
  
  	drm_encoder_init(dev, encoder, &intel_ddi_funcs,
  			 DRM_MODE_ENCODER_TMDS);
@@ -113,6 +111,3 @@
  	intel_encoder->enable = intel_enable_ddi;
  	intel_encoder->pre_enable = intel_ddi_pre_enable;
  	intel_encoder->disable = intel_disable_ddi;
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0707-drm-i915-add-the-FCLK-case-to-intel_ddi_get_cdclk_fr.patch b/patches.baytrail/0707-drm-i915-add-the-FCLK-case-to-intel_ddi_get_cdclk_fr.patch
index 0cb7c95..d90f160 100644
--- a/patches.baytrail/0707-drm-i915-add-the-FCLK-case-to-intel_ddi_get_cdclk_fr.patch
+++ b/patches.baytrail/0707-drm-i915-add-the-FCLK-case-to-intel_ddi_get_cdclk_fr.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit a40066412cc2ace1c1299e7a4d7a81dc33395b6f)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 9 ++++++---
+ drivers/gpu/drm/i915/intel_ddi.c |    9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index b8c096b4a1de..63aca49d11a8 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1139,10 +1139,13 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
+@@ -1145,10 +1145,13 @@ static void intel_disable_ddi(struct int
  
  int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
  {
@@ -37,6 +35,3 @@
  		return 450000;
  	else if (IS_ULT(dev_priv->dev))
  		return 337500;
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0835-drm-i915-Add-support-for-pipe_bpp-readout.patch b/patches.baytrail/0835-drm-i915-Add-support-for-pipe_bpp-readout.patch
index 3080f22..54ab40b 100644
--- a/patches.baytrail/0835-drm-i915-Add-support-for-pipe_bpp-readout.patch
+++ b/patches.baytrail/0835-drm-i915-Add-support-for-pipe_bpp-readout.patch
@@ -20,15 +20,13 @@
 (cherry picked from commit 42571aefafb1d330ef84eb29418832f72e7dfb4c)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c     | 17 +++++++++++++++++
- drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_ddi.c     |   17 ++++++++++++++++
+ drivers/gpu/drm/i915/intel_display.c |   36 +++++++++++++++++++++++++++++++++++
  2 files changed, 53 insertions(+)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 6082ab2d2541..3bfdb8e5ed37 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1268,6 +1268,23 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
+@@ -1274,6 +1274,23 @@ static void intel_ddi_get_config(struct
  		flags |= DRM_MODE_FLAG_NVSYNC;
  
  	pipe_config->adjusted_mode.flags |= flags;
@@ -52,11 +50,9 @@
  }
  
  static void intel_ddi_destroy(struct drm_encoder *encoder)
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 1264aa52c80a..086a06250006 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -4997,6 +4997,22 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
+@@ -4997,6 +4997,22 @@ static bool i9xx_get_pipe_config(struct
  	if (!(tmp & PIPECONF_ENABLE))
  		return false;
  
@@ -79,7 +75,7 @@
  	intel_get_pipe_timings(crtc, pipe_config);
  
  	i9xx_get_pfit_config(crtc, pipe_config);
-@@ -5896,6 +5912,23 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
+@@ -5896,6 +5912,23 @@ static bool ironlake_get_pipe_config(str
  	if (!(tmp & PIPECONF_ENABLE))
  		return false;
  
@@ -103,7 +99,7 @@
  	if (I915_READ(PCH_TRANSCONF(crtc->pipe)) & TRANS_ENABLE) {
  		struct intel_shared_dpll *pll;
  
-@@ -8633,6 +8666,9 @@ intel_pipe_config_compare(struct drm_device *dev,
+@@ -8633,6 +8666,9 @@ intel_pipe_config_compare(struct drm_dev
  	PIPE_CONF_CHECK_X(dpll_hw_state.fp0);
  	PIPE_CONF_CHECK_X(dpll_hw_state.fp1);
  
@@ -113,6 +109,3 @@
  #undef PIPE_CONF_CHECK_X
  #undef PIPE_CONF_CHECK_I
  #undef PIPE_CONF_CHECK_FLAGS
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0836-drm-i915-Add-state-readout-and-checking-for-has_dp_e.patch b/patches.baytrail/0836-drm-i915-Add-state-readout-and-checking-for-has_dp_e.patch
index 2b56751..ce6101b 100644
--- a/patches.baytrail/0836-drm-i915-Add-state-readout-and-checking-for-has_dp_e.patch
+++ b/patches.baytrail/0836-drm-i915-Add-state-readout-and-checking-for-has_dp_e.patch
@@ -28,17 +28,15 @@
 	drm-intel-next"))
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c     | 14 +++++++
- drivers/gpu/drm/i915/intel_display.c | 76 +++++++++++++++++++++++++++++++-----
- drivers/gpu/drm/i915/intel_dp.c      |  4 ++
- drivers/gpu/drm/i915/intel_drv.h     |  2 +
+ drivers/gpu/drm/i915/intel_ddi.c     |   14 ++++++
+ drivers/gpu/drm/i915/intel_display.c |   76 ++++++++++++++++++++++++++++++-----
+ drivers/gpu/drm/i915/intel_dp.c      |    4 +
+ drivers/gpu/drm/i915/intel_drv.h     |    2 
  4 files changed, 86 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 3bfdb8e5ed37..04f68804834d 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1285,6 +1285,20 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
+@@ -1291,6 +1291,20 @@ static void intel_ddi_get_config(struct
  	default:
  		break;
  	}
@@ -59,11 +57,9 @@
  }
  
  static void intel_ddi_destroy(struct drm_encoder *encoder)
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 086a06250006..49487fc5992f 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -5858,20 +5858,64 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
+@@ -5858,20 +5858,64 @@ static int ironlake_crtc_mode_set(struct
  	return ret;
  }
  
@@ -138,7 +134,7 @@
  }
  
  static void ironlake_get_pfit_config(struct intel_crtc *crtc,
-@@ -8244,6 +8288,11 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
+@@ -8244,6 +8288,11 @@ static void intel_dump_pipe_config(struc
  		      pipe_config->fdi_m_n.gmch_m, pipe_config->fdi_m_n.gmch_n,
  		      pipe_config->fdi_m_n.link_m, pipe_config->fdi_m_n.link_n,
  		      pipe_config->fdi_m_n.tu);
@@ -150,7 +146,7 @@
  	DRM_DEBUG_KMS("requested mode:\n");
  	drm_mode_debug_printmodeline(&pipe_config->requested_mode);
  	DRM_DEBUG_KMS("adjusted mode:\n");
-@@ -8614,6 +8663,13 @@ intel_pipe_config_compare(struct drm_device *dev,
+@@ -8614,6 +8663,13 @@ intel_pipe_config_compare(struct drm_dev
  	PIPE_CONF_CHECK_I(fdi_m_n.link_n);
  	PIPE_CONF_CHECK_I(fdi_m_n.tu);
  
@@ -164,11 +160,9 @@
  	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hdisplay);
  	PIPE_CONF_CHECK_I(adjusted_mode.crtc_htotal);
  	PIPE_CONF_CHECK_I(adjusted_mode.crtc_hblank_start);
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 61e5c76c2376..afd055e21b90 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1455,6 +1455,10 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
+@@ -1455,6 +1455,10 @@ static void intel_dp_get_config(struct i
  
  	pipe_config->adjusted_mode.flags |= flags;
  
@@ -179,11 +173,9 @@
  	if (dp_to_dig_port(intel_dp)->port == PORT_A) {
  		if ((I915_READ(DP_A) & DP_PLL_FREQ_MASK) == DP_PLL_FREQ_160MHZ)
  			pipe_config->port_clock = 162000;
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index c8d334a3c352..09dea5834c1c 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -802,6 +802,8 @@ extern void hsw_pc8_disable_interrupts(struct drm_device *dev);
+@@ -802,6 +802,8 @@ extern void hsw_pc8_disable_interrupts(s
  extern void hsw_pc8_restore_interrupts(struct drm_device *dev);
  extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv);
  extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv);
@@ -192,6 +184,3 @@
  extern void i915_disable_vga_mem(struct drm_device *dev);
  
  #endif /* __INTEL_DRV_H__ */
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch b/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch
index 39458c9..3b29bcb 100644
--- a/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch
+++ b/patches.baytrail/0900-drm-i915-use-pointer-k-cmz.-alloc-sizeof-pointer-.-p.patch
@@ -96,7 +96,7 @@
  		return;
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1337,11 +1337,11 @@ void intel_ddi_init(struct drm_device *d
+@@ -1343,11 +1343,11 @@ void intel_ddi_init(struct drm_device *d
  	struct intel_connector *hdmi_connector = NULL;
  	struct intel_connector *dp_connector = NULL;
  
@@ -110,7 +110,7 @@
  	if (!dp_connector) {
  		kfree(intel_dig_port);
  		return;
-@@ -1381,7 +1381,7 @@ void intel_ddi_init(struct drm_device *d
+@@ -1387,7 +1387,7 @@ void intel_ddi_init(struct drm_device *d
  	}
  
  	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
diff --git a/patches.baytrail/0909-drm-i915-don-t-init-DP-or-HDMI-when-not-supported-by.patch b/patches.baytrail/0909-drm-i915-don-t-init-DP-or-HDMI-when-not-supported-by.patch
index 4aa0445..56e5160 100644
--- a/patches.baytrail/0909-drm-i915-don-t-init-DP-or-HDMI-when-not-supported-by.patch
+++ b/patches.baytrail/0909-drm-i915-don-t-init-DP-or-HDMI-when-not-supported-by.patch
@@ -19,13 +19,11 @@
 (cherry picked from commit 311a20949f047a70935d6591010f42336f5402e7)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/i915_drv.h   |  4 ++++
- drivers/gpu/drm/i915/intel_bios.c | 13 ++++++++++++-
- drivers/gpu/drm/i915/intel_ddi.c  | 20 ++++++++++++++++----
+ drivers/gpu/drm/i915/i915_drv.h   |    4 ++++
+ drivers/gpu/drm/i915/intel_bios.c |   13 ++++++++++++-
+ drivers/gpu/drm/i915/intel_ddi.c  |   20 ++++++++++++++++----
  3 files changed, 32 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 2eca286b57ff..b1485a008b04 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -1059,6 +1059,10 @@ enum modeset_restore {
@@ -39,11 +37,9 @@
  };
  
  struct intel_vbt_data {
-diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
-index 7ce1c3c2f0f1..0492b6fff10d 100644
 --- a/drivers/gpu/drm/i915/intel_bios.c
 +++ b/drivers/gpu/drm/i915/intel_bios.c
-@@ -632,6 +632,10 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
+@@ -632,6 +632,10 @@ static void parse_ddi_port(struct drm_i9
  	is_hdmi = is_dvi && (child->common.device_type & (1 << 11)) == 0;
  	is_edp = is_dp && (child->common.device_type & (1 << 12));
  
@@ -54,7 +50,7 @@
  	DRM_DEBUG_KMS("Port %c VBT info: DP:%d HDMI:%d DVI:%d EDP:%d CRT:%d\n",
  		      port_name(port), is_dp, is_hdmi, is_dvi, is_edp, is_crt);
  
-@@ -792,8 +796,15 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
+@@ -792,8 +796,15 @@ init_vbt_defaults(struct drm_i915_privat
  	DRM_DEBUG_KMS("Set default to SSC at %dMHz\n", dev_priv->vbt.lvds_ssc_freq);
  
  	for (port = PORT_A; port < I915_MAX_PORTS; port++) {
@@ -71,11 +67,9 @@
  	}
  }
  
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 963245a104e4..7e9fa53a1477 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1356,6 +1356,17 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1362,6 +1362,17 @@ void intel_ddi_init(struct drm_device *d
  	struct drm_encoder *encoder;
  	struct intel_connector *hdmi_connector = NULL;
  	struct intel_connector *dp_connector = NULL;
@@ -93,7 +87,7 @@
  
  	intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
  	if (!intel_dig_port)
-@@ -1393,19 +1404,20 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1399,19 +1410,20 @@ void intel_ddi_init(struct drm_device *d
  	intel_encoder->cloneable = false;
  	intel_encoder->hot_plug = intel_ddi_hot_plug;
  
@@ -118,6 +112,3 @@
  
  		intel_dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port);
  		intel_hdmi_init_connector(intel_dig_port, hdmi_connector);
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch b/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch
index c08d19d..aaae073 100644
--- a/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch
+++ b/patches.baytrail/0924-drm-i915-Add-HSW-CRT-output-readout-support.patch
@@ -21,16 +21,14 @@
 (cherry picked from commit 6801c18c0a43386bb44712cbc028a7e05adb9f0d)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_crt.c | 34 ++++++++++++++++++++++++++++------
- drivers/gpu/drm/i915/intel_ddi.c |  4 ++--
- drivers/gpu/drm/i915/intel_drv.h |  2 ++
+ drivers/gpu/drm/i915/intel_crt.c |   34 ++++++++++++++++++++++++++++------
+ drivers/gpu/drm/i915/intel_ddi.c |    4 ++--
+ drivers/gpu/drm/i915/intel_drv.h |    2 ++
  3 files changed, 32 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index f9a5f3d1f0cd..019c4cea7bb0 100644
 --- a/drivers/gpu/drm/i915/intel_crt.c
 +++ b/drivers/gpu/drm/i915/intel_crt.c
-@@ -83,13 +83,11 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
+@@ -83,13 +83,11 @@ static bool intel_crt_get_hw_state(struc
  	return true;
  }
  
@@ -45,7 +43,7 @@
  
  	tmp = I915_READ(crt->adpa_reg);
  
-@@ -103,16 +101,37 @@ static void intel_crt_get_config(struct intel_encoder *encoder,
+@@ -103,16 +101,37 @@ static void intel_crt_get_config(struct
  	else
  		flags |= DRM_MODE_FLAG_NVSYNC;
  
@@ -85,7 +83,7 @@
  /* Note: The caller is required to filter out dpms modes not supported by the
   * platform. */
  static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
-@@ -804,7 +823,10 @@ void intel_crt_init(struct drm_device *dev)
+@@ -804,7 +823,10 @@ void intel_crt_init(struct drm_device *d
  	crt->base.mode_set = intel_crt_mode_set;
  	crt->base.disable = intel_disable_crt;
  	crt->base.enable = intel_enable_crt;
@@ -97,11 +95,9 @@
  	if (I915_HAS_HOTPLUG(dev))
  		crt->base.hpd_pin = HPD_CRT;
  	if (HAS_DDI(dev))
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 7e9fa53a1477..a43ac3a17bdc 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1269,8 +1269,8 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
+@@ -1275,8 +1275,8 @@ static void intel_ddi_hot_plug(struct in
  		intel_dp_check_link_status(intel_dp);
  }
  
@@ -112,11 +108,9 @@
  {
  	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
  	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index fb38ef10ac5d..e7fe5f1f72df 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -828,5 +828,7 @@ extern void ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe
+@@ -828,5 +828,7 @@ extern void ironlake_check_encoder_dotcl
  
  extern bool intel_crtc_active(struct drm_crtc *crtc);
  extern void i915_disable_vga_mem(struct drm_device *dev);
@@ -124,6 +118,3 @@
 +				 struct intel_crtc_config *pipe_config);
  
  #endif /* __INTEL_DRV_H__ */
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/1010-drm-i915-dp-get-rid-of-intel_dp-link_configuration.patch b/patches.baytrail/1010-drm-i915-dp-get-rid-of-intel_dp-link_configuration.patch
index c3241c7..c3087e5 100644
--- a/patches.baytrail/1010-drm-i915-dp-get-rid-of-intel_dp-link_configuration.patch
+++ b/patches.baytrail/1010-drm-i915-dp-get-rid-of-intel_dp-link_configuration.patch
@@ -23,16 +23,14 @@
 	'airlied/drm-next' into drm-intel-next"))
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c |  5 +----
- drivers/gpu/drm/i915/intel_dp.c  | 34 ++++++++++++----------------------
- drivers/gpu/drm/i915/intel_drv.h |  3 ---
+ drivers/gpu/drm/i915/intel_ddi.c |    5 +----
+ drivers/gpu/drm/i915/intel_dp.c  |   34 ++++++++++++----------------------
+ drivers/gpu/drm/i915/intel_drv.h |    3 ---
  3 files changed, 13 insertions(+), 29 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index a43ac3a17bdc..6d335f8ca343 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -316,9 +316,6 @@ static void intel_ddi_mode_set(struct intel_encoder *encoder)
+@@ -316,9 +316,6 @@ static void intel_ddi_mode_set(struct in
  			DRM_DEBUG_DRIVER("DP audio: write eld information\n");
  			intel_write_eld(&encoder->base, adjusted_mode);
  		}
@@ -42,7 +40,7 @@
  	} else if (type == INTEL_OUTPUT_HDMI) {
  		struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
  
-@@ -1222,7 +1219,7 @@ void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder)
+@@ -1228,7 +1225,7 @@ void intel_ddi_prepare_link_retrain(stru
  
  	val = DP_TP_CTL_ENABLE | DP_TP_CTL_MODE_SST |
  	      DP_TP_CTL_LINK_TRAIN_PAT1 | DP_TP_CTL_SCRAMBLE_DISABLE;
@@ -51,8 +49,6 @@
  		val |= DP_TP_CTL_ENHANCED_FRAME_ENABLE;
  	I915_WRITE(DP_TP_CTL(port), val);
  	POSTING_READ(DP_TP_CTL(port));
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 0c9f4764ed92..4f52ec75b39f 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
 @@ -884,21 +884,6 @@ found:
@@ -77,7 +73,7 @@
  static void ironlake_set_pll_cpu_edp(struct intel_dp *intel_dp)
  {
  	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
-@@ -971,8 +956,6 @@ static void intel_dp_mode_set(struct intel_encoder *encoder)
+@@ -971,8 +956,6 @@ static void intel_dp_mode_set(struct int
  		intel_write_eld(&encoder->base, adjusted_mode);
  	}
  
@@ -86,7 +82,7 @@
  	/* Split out the IBX/CPU vs CPT settings */
  
  	if (port == PORT_A && IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) {
-@@ -982,7 +965,7 @@ static void intel_dp_mode_set(struct intel_encoder *encoder)
+@@ -982,7 +965,7 @@ static void intel_dp_mode_set(struct int
  			intel_dp->DP |= DP_SYNC_VS_HIGH;
  		intel_dp->DP |= DP_LINK_TRAIN_OFF_CPT;
  
@@ -95,7 +91,7 @@
  			intel_dp->DP |= DP_ENHANCED_FRAMING;
  
  		intel_dp->DP |= crtc->pipe << 29;
-@@ -996,7 +979,7 @@ static void intel_dp_mode_set(struct intel_encoder *encoder)
+@@ -996,7 +979,7 @@ static void intel_dp_mode_set(struct int
  			intel_dp->DP |= DP_SYNC_VS_HIGH;
  		intel_dp->DP |= DP_LINK_TRAIN_OFF;
  
@@ -104,7 +100,7 @@
  			intel_dp->DP |= DP_ENHANCED_FRAMING;
  
  		if (crtc->pipe == 1)
-@@ -2474,14 +2457,21 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)
+@@ -2474,14 +2457,21 @@ intel_dp_start_link_train(struct intel_d
  	uint8_t voltage;
  	int voltage_tries, loop_tries;
  	uint32_t DP = intel_dp->DP;
@@ -129,8 +125,6 @@
  
  	DP |= DP_PORT_EN;
  
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index 922c5d752cc3..eaf0003ddfd9 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
 @@ -436,13 +436,11 @@ struct intel_hdmi {
@@ -147,7 +141,7 @@
  	bool has_audio;
  	enum hdmi_force_audio force_audio;
  	uint32_t color_range;
-@@ -685,7 +683,6 @@ void i915_disable_vga_mem(struct drm_device *dev);
+@@ -685,7 +683,6 @@ void i915_disable_vga_mem(struct drm_dev
  void intel_dp_init(struct drm_device *dev, int output_reg, enum port port);
  bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
  			     struct intel_connector *intel_connector);
@@ -155,6 +149,3 @@
  void intel_dp_start_link_train(struct intel_dp *intel_dp);
  void intel_dp_complete_link_train(struct intel_dp *intel_dp);
  void intel_dp_stop_link_train(struct intel_dp *intel_dp);
--- 
-1.8.5.rc3
-
diff --git a/patches.baytrail/1056-drm-i915-don-t-leak-dp_connector-at-intel_ddi_init.patch b/patches.baytrail/1056-drm-i915-don-t-leak-dp_connector-at-intel_ddi_init.patch
index fcc2243..4331bc7 100644
--- a/patches.baytrail/1056-drm-i915-don-t-leak-dp_connector-at-intel_ddi_init.patch
+++ b/patches.baytrail/1056-drm-i915-don-t-leak-dp_connector-at-intel_ddi_init.patch
@@ -21,14 +21,12 @@
 (cherry picked from commit 4a28ae58c0abad2d45a45db21e86c7166b2b4462)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/gpu/drm/i915/intel_ddi.c | 62 +++++++++++++++++++++++++++-------------
+ drivers/gpu/drm/i915/intel_ddi.c |   62 ++++++++++++++++++++++++++-------------
  1 file changed, 42 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 6d335f8ca343..31f4fe271388 100644
 --- a/drivers/gpu/drm/i915/intel_ddi.c
 +++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1345,6 +1345,41 @@ static const struct drm_encoder_funcs intel_ddi_funcs = {
+@@ -1351,6 +1351,41 @@ static const struct drm_encoder_funcs in
  	.destroy = intel_ddi_destroy,
  };
  
@@ -70,7 +68,7 @@
  void intel_ddi_init(struct drm_device *dev, enum port port)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -1369,12 +1404,6 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1375,12 +1410,6 @@ void intel_ddi_init(struct drm_device *d
  	if (!intel_dig_port)
  		return;
  
@@ -83,7 +81,7 @@
  	intel_encoder = &intel_dig_port->base;
  	encoder = &intel_encoder->base;
  
-@@ -1394,29 +1423,22 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
+@@ -1400,29 +1429,22 @@ void intel_ddi_init(struct drm_device *d
  	intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
  					  (DDI_BUF_PORT_REVERSAL |
  					   DDI_A_4_LANES);
@@ -120,6 +118,3 @@
 +		kfree(intel_dig_port);
  	}
  }
--- 
-1.8.5.rc3
-
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index 30e986b..673bad8 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 10
- SUBLEVEL = 27
+ SUBLEVEL = 28
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = TOSSUG Baby Fish