[git pull] drm final fixes for 5.16