Merge branch 'fix-pch-refclk' into foo

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
index b2ac20287f3b3c538efbc40d42e031a6524de5e5,98f2e0bf80decc70b63f1a7b6dccc58fd3f33dfd..0e777fdf9c61bd6ee783f0c706b374d084f476b7
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1301,10 -1302,11 +1302,11 @@@ extern int intel_modeset_vga_set_state(
  extern bool intel_fbc_enabled(struct drm_device *dev);
  extern void intel_disable_fbc(struct drm_device *dev);
  extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
+ extern void ironlake_init_pch_refclk(struct drm_device *dev);
  extern void ironlake_enable_rc6(struct drm_device *dev);
  extern void gen6_set_rps(struct drm_device *dev, u8 val);
 -extern void intel_detect_pch (struct drm_device *dev);
 -extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
 +extern void intel_detect_pch(struct drm_device *dev);
 +extern int intel_trans_dp_port_sel(struct drm_crtc *crtc);
  
  /* overlay */
  #ifdef CONFIG_DEBUG_FS

diff --cc drivers/gpu/drm/i915/intel_bios.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_bios.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge