Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: NDave Airlie <airlied@redhat.com>