drm: Sync a few bits with Linux 4.7.10