Merge f78d76e7 ("Merge tag 'drm-fixes-2021-03-12-1' of...

Merge f78d76e7 ("Merge tag 'drm-fixes-2021-03-12-1' of git://anongit.freedesktop.org/drm/drm"

) into android-mainline

Steps on the way to 5.12-rc3

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4113f0df9343f358cb6dac646de20e906fc412aa