Merge a4849f60 ("Merge tag 'drm-fixes-2021-11-26' of...

Merge a4849f60 ("Merge tag 'drm-fixes-2021-11-26' of git://anongit.freedesktop.org/drm/drm"

) into android-mainline

Steps on the way to 5.16-rc3

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