Daniel prepared this branch with a back-merge as git was getting very confused about changes in intel_display.c