Intel i915 DRM fixes

[Jonas B. <jo...@so...>]

I sent these patches last week, but as I had the wrong subject line on them
(DRM instead of DRM/i915), I'm afraid they may have gone unnoticed.  Here's
a resend just to make sure that they're seen by the right people.

Regards,
Jonas Bonn
South Pole Consulting AB
www.southpoleconsulting.com