Some shuffling to reduce dependencies on i915 headers. Jani Nikula (2): drm/i915: relocate intel_plane_ggtt_offset() to intel_atomic_plane.c drm/i915: split out i915_gtt_view_types.h from i915_vma_types.h drivers/gpu/drm/i915/display/intel_acpi.c | 2 + .../gpu/drm/i915/display/intel_atomic_plane.c | 8 +- .../gpu/drm/i915/display/intel_atomic_plane.h | 2 + .../i915/display/intel_display_power_map.c | 2 + .../drm/i915/display/intel_display_types.h | 9 +-- .../drm/i915/display/intel_dp_aux_backlight.c | 2 + .../drm/i915/display/intel_dp_link_training.c | 1 + drivers/gpu/drm/i915/display/intel_dp_test.c | 2 + .../gpu/drm/i915/display/intel_dp_tunnel.c | 1 + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 + .../gpu/drm/i915/display/intel_frontbuffer.c | 1 + drivers/gpu/drm/i915/display/intel_link_bw.c | 1 + drivers/gpu/drm/i915/display/intel_panel.c | 1 + drivers/gpu/drm/i915/display/intel_pfit.c | 2 + drivers/gpu/drm/i915/display/intel_quirks.c | 2 + drivers/gpu/drm/i915/i915_gtt_view_types.h | 59 +++++++++++++++ drivers/gpu/drm/i915/i915_vma_types.h | 52 +------------ .../compat-i915-headers/i915_gtt_view_types.h | 7 ++ .../xe/compat-i915-headers/i915_vma_types.h | 74 ------------------- drivers/gpu/drm/xe/display/xe_fb_pin.c | 1 + 20 files changed, 99 insertions(+), 132 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gtt_view_types.h create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h -- 2.39.5