51b44eb17b
backmerge to get vmwgfx locking changes into next as the conflict with per-plane locking.
backmerge to get vmwgfx locking changes into next as the conflict with per-plane locking.