diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
| commit | bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch) | |
| tree | 1731a322d153ee18017822a8fd66295a0ec7a4e2 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | cadd16ea33a938d49aee99edd4758cc76048b399 (diff) | |
| parent | 2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff) | |
| download | linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.gz linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.bz2 linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.zip | |
Merge branch 'for-next' into for-linus
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 ab37d1121be8..990f656e6ab0 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -832,6 +832,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); |