[git pull] drm minor fixes