Now that i915 is fully atomic it's time to make the waits interruptible. This can be done by making sure prepare_plane_fb is always called, because it's the logical place to put such waits in. This also cleans up the disabled_planes hack, the disabling planes case is now handled by prepare_plane_fb correctly. Maarten Lankhorst (5): drm/i915: Handle return value in intel_pin_and_fence_fb_obj. drm/atomic: Make prepare_fb/cleanup_fb only take state. drm/i915: Make prepare_plane_fb fully interruptible. drm/i915: Remove wait_for_pending_flips from disable_noatomic. drm/i915: Make wait_for_flips interruptible. drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 4 +- drivers/gpu/drm/drm_atomic_helper.c | 21 +--- drivers/gpu/drm/drm_plane_helper.c | 6 +- drivers/gpu/drm/i915/intel_atomic.c | 2 - drivers/gpu/drm/i915/intel_display.c | 144 +++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 5 - drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 10 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 9 +- drivers/gpu/drm/omapdrm/omap_plane.c | 10 +- drivers/gpu/drm/sti/sti_drm_plane.c | 2 - drivers/gpu/drm/tegra/dc.c | 2 - include/drm/drm_plane_helper.h | 2 - 12 files changed, 97 insertions(+), 120 deletions(-) -- 2.1.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx