diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 15:34:15 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 16:05:04 +0200 |
commit | 2844659842017c981f6e6f74aca3a7ebe10edebb (patch) | |
tree | 0913d12fbf8ac2a58e8d29bec40a539e213c6d07 /drivers/gpu/drm/i915/i915_drv.h | |
parent | 143875400b33fc20e9dd060e90034f2e9e9ffc98 (diff) | |
parent | 87f77eff710db012a994ee319b5627c26a7b2204 (diff) |
Merge remote-tracking branch 'takashi/topic/drm-sync-audio-rate' into drm-intel-next-queued
Pull in the i915/hda changes for N/CTS setting so I can apply the
follow-up documentation work for drm/i915.
Some conflicts because ofc we had to rework i915 while that N/CTS work
was going on. But not more than adjacent changes really.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 85c4894241c7..1626f3d79a6f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1888,6 +1888,11 @@ struct drm_i915_private { /* hda/i915 audio component */ struct i915_audio_component *audio_component; bool audio_component_registered; + /** + * av_mutex - mutex for audio/video sync + * + */ + struct mutex av_mutex; uint32_t hw_context_size; struct list_head context_list; |