[git pull] drm fixes for 5.12 final