diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 16:34:15 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 17:05:04 +0300 |
| commit | 2844659842017c981f6e6f74aca3a7ebe10edebb (patch) | |
| tree | 0913d12fbf8ac2a58e8d29bec40a539e213c6d07 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 143875400b33fc20e9dd060e90034f2e9e9ffc98 (diff) | |
| parent | 87f77eff710db012a994ee319b5627c26a7b2204 (diff) | |
| download | linux-2844659842017c981f6e6f74aca3a7ebe10edebb.tar.xz | |
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_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 20b4b7924f51..499060a08d25 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -925,6 +925,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) mutex_init(&dev_priv->sb_lock); mutex_init(&dev_priv->modeset_restore_lock); mutex_init(&dev_priv->csr_lock); + mutex_init(&dev_priv->av_mutex); intel_pm_setup(dev); |