Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_pm.c

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

diff --cc drivers/gpu/drm/i915/i915_drv.h
index a7fbefaa1c4a6d152c2ee715b32c5fbaffff67cf,82ea281b2182f1c185d8ccdc9b3189772eeac0f6..f31a1b0adbda96c4218b16d8823eab13b620a344
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1624,10 -1672,15 +1672,16 @@@ void i915_hangcheck_elapsed(unsigned lo
  void i915_handle_error(struct drm_device *dev, bool wedged);
  
  extern void intel_irq_init(struct drm_device *dev);
 +extern void intel_pm_init(struct drm_device *dev);
  extern void intel_hpd_init(struct drm_device *dev);
- extern void intel_gt_init(struct drm_device *dev);
- extern void intel_gt_sanitize(struct drm_device *dev);
+ extern void intel_pm_init(struct drm_device *dev);
+ 
+ extern void intel_uncore_sanitize(struct drm_device *dev);
+ extern void intel_uncore_early_sanitize(struct drm_device *dev);
+ extern void intel_uncore_init(struct drm_device *dev);
+ extern void intel_uncore_reset(struct drm_device *dev);
+ extern void intel_uncore_clear_errors(struct drm_device *dev);
+ extern void intel_uncore_check_errors(struct drm_device *dev);
  
  void
  i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);

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

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

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

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