Merge tag 'drm-misc-fixes-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc...
authorDave Airlie <airlied@redhat.com>
Thu, 10 Aug 2017 00:07:13 +0000 (10:07 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 Aug 2017 00:07:13 +0000 (10:07 +1000)
commit9157822b9d7282611093886acd237168691de383
tree4a53ff820197143d965412c1118a9104cb615e05
parentdb488ab0f5e6653b256d8af60033c363c2f0a9d6
parent80c471ea040ad9006ebff6d64221a04e8fa1b7f6
Merge tag 'drm-misc-fixes-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes

Core Changes:
- dma-buf: Allow multiple sync_files to wrap a single dma-fence (Chris)

Driver Changes:
- rockchip: misc fixes to vop driver from the downstream rockchip tree (Mark)
- Error path cleanups to tc358767 & host1x (Lucas & Paul, respectively)

* tag 'drm-misc-fixes-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc:
  drm/rockchip: vop: report error when check resource error
  drm/rockchip: vop: round_up pitches to word align
  drm/rockchip: vop: fix NV12 video display error
  drm/rockchip: vop: fix iommu page fault when resume
  dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence
  drm/bridge: tc358767: fix probe without attached output node