Yes, both intel_display and intel_hdmi get too overcomplex with those patches :(.

I haven't done the split in those series because I thought that the plan was to land those VLV/HSW patches before doing the big display refactoring we discussed some weeks ago. But I could certainly start doing it.

Daniel, what do you think would best from your dinq maintainership point of view - refactor those bits here and in other big patches of this series (fdi and hdmi ones) and then resend all the patches; or have them as is and do the big refactoring for everything after that?