Merge drm-misc/drm-misc-next-fixes into drm-misc-fixes

There's a patch left in drm-misc-next-fixes, let's bring it into
drm-misc-fixes.

Signed-off-by: Maxime Ripard <mripard@kernel.org>