Manual merge of OpenBSD -current changes, kernel part, with:

git diff dc120473~..dc120473 openbsd/src/sys/dev/pci/drm | \
        patch -p2

    XXX Need to merge Xenocara changes.