[git pull] drm/agp fixes