Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next to get at all the good stuff in drm-misc. We need
that because:

- drm_connector_list_iter conversion for i915 needs the core patches.
- Maarten's patches to use the new atomic state iterators also need
  the core patches.
- We need the new link status property to complete the DP retraining
  work, merging through 2 branches wasn't a good idea and we had to
  partially backtrack.
- Chris needs reservation_object_trylock and we want to roll out
  kref_read everywhere.

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

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_drv.h
index 3c8b452,0f766f8..3af20c1
--- 1/drivers/gpu/drm/i915/intel_drv.h
--- 2/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -1264,12 -1265,10 +1265,14 @@@ void intel_audio_codec_enable(struct in
  void intel_audio_codec_disable(struct intel_encoder *encoder);
  void i915_audio_component_init(struct drm_i915_private *dev_priv);
  void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);
+ void intel_audio_init(struct drm_i915_private *dev_priv);
+ void intel_audio_deinit(struct drm_i915_private *dev_priv);
  
  /* intel_cdclk.c */
 +void skl_init_cdclk(struct drm_i915_private *dev_priv);
 +void skl_uninit_cdclk(struct drm_i915_private *dev_priv);
 +void bxt_init_cdclk(struct drm_i915_private *dev_priv);
 +void bxt_uninit_cdclk(struct drm_i915_private *dev_priv);
  void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv);
  void intel_update_max_cdclk(struct drm_i915_private *dev_priv);
  void intel_update_cdclk(struct drm_i915_private *dev_priv);