diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-01-07 14:13:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-01-07 14:13:40 +1000 |
| commit | 3fcb2531073d29aad26a2fdb323a3c8c1c4307af (patch) | |
| tree | ff61ba66171c7cfbfa5d0146ec23d4e74748ff76 /drivers/gpu/drm/i915/display/intel_audio.h | |
| parent | 51a1809d7fcd03d74ad0f1294af559f2729aae42 (diff) | |
| parent | cb6846fbb83b574c85c2a80211b402a6347b60b1 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.17-merged
Trial merge with correct nouveau_fence.c fix
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_audio.h')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_audio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h index a3657c7a7ba2..63b22131dc45 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.h +++ b/drivers/gpu/drm/i915/display/intel_audio.h @@ -11,13 +11,15 @@ struct drm_i915_private; struct intel_crtc_state; struct intel_encoder; -void intel_init_audio_hooks(struct drm_i915_private *dev_priv); +void intel_audio_hooks_init(struct drm_i915_private *dev_priv); void intel_audio_codec_enable(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state); void intel_audio_codec_disable(struct intel_encoder *encoder, const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state); +void intel_audio_cdclk_change_pre(struct drm_i915_private *dev_priv); +void intel_audio_cdclk_change_post(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); |