Merge tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm...
authorDave Airlie <airlied@redhat.com>
Thu, 13 Jul 2017 01:22:34 +0000 (11:22 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 13 Jul 2017 01:22:34 +0000 (11:22 +1000)
commit0355e22a4b4a36d982178ecea2676ee9e480b20f
treec46cc48085b11b1859ddce6a502af0979ab076cd
parentcaa164e37374609056c4d25255a6c7bef7a7f43b
parent6f6e0b217a93011f8e11b9a2d5521a08fcf36990
Merge tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm-misc into drm-next

Core Changes:
- Fix empty timestamps on hw without vlbank counter (Laurent)
- Clear atomic state before retrying ww/mutex acquisition in remove_fb (Maarten)

Driver Changes:
- rockchip: Fix incorrect NULL pointer check after allocation (Gustavo)

Cc: Gustavo A. R. Silva <garsilva@embeddedor.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
* tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm-misc:
  drm/rockchip: fix NULL check on devm_kzalloc() return value
  drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
  drm: vblank: Fix vblank timestamp update
  DRM: Fix an incorrectly formatted table
  bridge: Fix panel-bridge error return on !panel.
  drm/rockchip: gem: add the lacks lock and trivial changes