[git pull] drm fixes for rc4