Merge d99676af ("Merge tag 'drm-next-2021-02-19' of...

Merge d99676af ("Merge tag 'drm-next-2021-02-19' of git://anongit.freedesktop.org/drm/drm"

) into android-mainline

Steps on the way to 5.12-rc1

Resolves conflicts in:
        include/drm/drm_prime.h

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