[git pull] drm fixes + one fbcon one