Merge branch 'drm-intel-fixes' into drm-intel-next

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_tiling.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge