drm/i915: Fix problems reported by kib@