From: Daniel Vetter Date: Wed, 8 Mar 2017 09:54:45 +0000 (+0100) Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued X-Git-Tag: v4.12-rc1~86^2~29^2~111 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7ffe939dd9c71e149f31817394b70b52b4067304;p=linux-2.6-block.git 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 --- 7ffe939dd9c71e149f31817394b70b52b4067304 diff --cc drivers/gpu/drm/i915/intel_drv.h index 3c8b4522ae66,0f766f83a31b..3af20c1f2ba8 --- a/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);