[PATCH 0/6] drm/i915 and drm/xe display integration cleanups

[Jani Nikula <jani.nikula@intel.com>]

Some cleanups on i915 side, and subsequent cleanups on xe side. I'd like
to merge all of these via drm-intel-next.

BR,
Jani.

Jani Nikula (6):
  drm/i915: use IS_JASPERLAKE()/IS_ELKHARTLAKE() instead of
    IS_PLATFORM()
  drm/i915/dmc: define firmware URL locally
  drm/i915: move i915_fixed.h to display/intel_fixed.h
  drm/xe/display: clean up a lot of cruft from compat i915_drv.h
  drm/xe/display: remove compat i915_gem.h
  drm/xe/display: clean up compat i915_vgpu.h

 .../drm/i915/display/intel_ddi_buf_trans.c    |  4 +--
 drivers/gpu/drm/i915/display/intel_dmc.c      |  4 ++-
 .../{i915_fixed.h => display/intel_fixed.h}   |  0
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 34 -------------------
 .../drm/xe/compat-i915-headers/i915_fixed.h   |  6 ----
 .../gpu/drm/xe/compat-i915-headers/i915_gem.h |  9 -----
 .../drm/xe/compat-i915-headers/i915_vgpu.h    | 26 --------------
 .../drm/xe/compat-i915-headers/intel_uc_fw.h  | 11 ------
 9 files changed, 6 insertions(+), 90 deletions(-)
 rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h

-- 
2.39.2