[git pull] drm final fixes