Manual merge of OpenBSD -current changes, Xenocara xf86-video-intel part, with:

git diff dc120473~..dc120473 openbsd/xenocara/driver/xf86-video-intel | \
        patch -d xsrc/external/mit/xf86-video-intel/dist -p5