Hi Dave, Here's an updated pull request that encapsulates my earlier -next-fixes PR. I've included the summary below for completeness. The vblank timestamp patch fixes a quite noticable regression, so it'd be nice to sneak this in before rc1 is cut. The other 2 patches in this pull will only be hit in edge cases. drm-misc-next-fixes-2017-07-10: 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@xxxxxxxxxxxxxx> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> Cc: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> drm-misc-next-fixes-2017-06-27 Core Changes: - bridge: return -ve errno in drm_panel_bridge_add (Eric) Driver Changes: - rockchip: ensure mm lock is held in error paths (Caesar) - dw-hdmi: fix formatting in input format table (Jonathan) Cc: Caesar Wang <wxt@xxxxxxxxxxxxxx> Cc: Eric Anholt <eric@xxxxxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Cheers, Sean The following changes since commit 6d61e70ccc21606ffb8a0a03bd3aba24f659502b: Backmerge tag 'v4.12-rc7' into drm-next (2017-06-27 08:28:30 +1000) are available in the git repository at: git://anongit.freedesktop.org/git/drm-misc tags/drm-misc-next-fixes-2017-07-10 for you to fetch changes up to 6f6e0b217a93011f8e11b9a2d5521a08fcf36990: drm/rockchip: fix NULL check on devm_kzalloc() return value (2017-07-10 14:13:00 -0400) ---------------------------------------------------------------- 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@xxxxxxxxxxxxxx> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> Cc: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> ---------------------------------------------------------------- Caesar Wang (1): drm/rockchip: gem: add the lacks lock and trivial changes Eric Anholt (1): bridge: Fix panel-bridge error return on !panel. Gustavo A. R. Silva (1): drm/rockchip: fix NULL check on devm_kzalloc() return value Jonathan Corbet (1): DRM: Fix an incorrectly formatted table Laurent Pinchart (1): drm: vblank: Fix vblank timestamp update Maarten Lankhorst (1): drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb Sean Paul (4): Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes Merge tag 'drm-misc-next-2017-06-19_0' of git://anongit.freedesktop.org/git/drm-misc into drm-misc-next-fixes Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes drivers/gpu/drm/bridge/panel.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 1 + drivers/gpu/drm/drm_vblank.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 5 ++- include/drm/bridge/dw_hdmi.h | 70 ++++++++++++++--------------- 7 files changed, 43 insertions(+), 41 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel