Merge remote-tracking branch 'takashi/topic/drm-sync-audio-rate' into drm-intel-next...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 7 Oct 2015 13:34:15 +0000 (15:34 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 7 Oct 2015 14:05:04 +0000 (16:05 +0200)
commit2844659842017c981f6e6f74aca3a7ebe10edebb
tree0913d12fbf8ac2a58e8d29bec40a539e213c6d07
parent143875400b33fc20e9dd060e90034f2e9e9ffc98
parent87f77eff710db012a994ee319b5627c26a7b2204
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>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_audio.c