Backmerge to get at the new encoder_mask support in atomic helpers.
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>