]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'drm-vc4-fixes-2016-06-06' of github.com:anholt/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 9 Jun 2016 02:32:09 +0000 (12:32 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 9 Jun 2016 02:32:09 +0000 (12:32 +1000)
commit170fba306af798bc1249b6ba925cf9031f3b3806
tree0fb25c81f57b87fc8096a3f64b7ad3affca39e5d
parent85332739628fe4beafecdb713438c7cb1454c2f5
parent56d1fe0979dc9b73c1c12ee07722ac380d42a0c4
Merge tag 'drm-vc4-fixes-2016-06-06' of github.com:anholt/linux into drm-fixes

This pull request brings in vblank/pageflip fixes I had hoped to see
merged before 4.7rc1, plus two new fixes that have come in since then.

* tag 'drm-vc4-fixes-2016-06-06' of github.com:anholt/linux:
  drm/vc4: Make pageflip completion handling more robust.
  drm/vc4: Fix ioctl permissions for render nodes.
  drm/vc4: Return -EBUSY if there's already a pending flip event.
  drm/vc4: Fix drm_vblank_put/get imbalance in page flip path.
  drm/vc4: Fix get_vblank_counter with proper no-op for Linux 4.4+