realign some of the i830 code from the i915
3 files changed