Hi all, Here's the locking patches respun with Maarten's review. I think that part is ready for merging. The deferred setup itself needs more thought, since both Maarten and Liviu are still unhappy with what happens between the deferred setup and fbcon. Cheers, Daniel Daniel Vetter (9): drm/i915: Drop FBDEV #ifdev in mst code drm/fb-helper: Push locking in fb_is_bound drm/fb-helper: Drop locking from the vsync wait ioctl code drm/fb-helper: Push locking into pan_display_atomic|legacy drm/fb-helper: Push locking into restore_fbdev_mode_atomic|legacy drm/fb-helper: Stop using mode_config.mutex for internals drm/fb-helper: Split dpms handling into legacy and atomic paths drm/fb-helper: Support deferred setup drm/i915: Protect against deferred fbdev setup Thierry Reding (4): drm/fb-helper: Push down modeset lock into FB helpers drm/fb-helper: Add top-level lock drm/exynos: Remove custom FB helper deferred setup drm/hisilicon: Remove custom FB helper deferred setup drivers/gpu/drm/drm_fb_helper.c | 359 ++++++++++++++---------- drivers/gpu/drm/drm_vblank.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 26 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/intel_dp_mst.c | 47 +--- drivers/gpu/drm/i915/intel_fbdev.c | 16 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 - include/drm/drm_fb_helper.h | 42 ++- 11 files changed, 297 insertions(+), 232 deletions(-) -- 2.13.2 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel