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

We haven't backmerged for a while, let's start the -rc period by pulling
rc1.

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

diff --cc drivers/gpu/drm/arm/malidp_mw.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/dss/dss.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_txp.c
Simple merge