[git pull] drm fixes for 5.18-rc4 (part 2)