[Intel-xe] [PATCH 0/8] drm/xe: clean up i915 includes both sides

[Lucas De Marchi]

On Thu, Mar 02, 2023 at 04:12:22PM +0200, Jani Nikula wrote:
>This probably needs to be rebased on top of "Encapsulate display" from
>Lucas. Sending to present some ideas anyway.
>
>1) Clean up changes to i915 that would not be accepted to upstream i915
>
>2) Never add top level i915 directory to include search path with -I,
>   not even when building with CONFIG_DRM_XE_DISPLAY=y
>
>3) Instead, add the handful of proxy headers under compat-headers/ so
>   that we have an explicit list of headers that we include from i915,
>   instead of hidden by the search path
>
>4) Currently compat-headers is added to search path unconditionally, but
>   after Lucas' changes we can move that to CONFIG_DRM_XE_DISPLAY=y
>

I think everything here is sane and I like where this is heading.
I left some comments on the patches. Particularly the last one needs
to be adapted as it conflicts now


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

for the series


thanks
Lucas De Marchi


>
>BR,
>Jani.
>
>
>[1] https://patchwork.freedesktop.org/series/114541/
>
>
>
>Jani Nikula (8):
>  drm/i915/display: don't use relative ../i915 includes
>  drm/i915/display: drop redundant display/ from includes
>  drm/xe: drop unnecessary include
>  drm/xe: drop redundant display/ from includes
>  drm/xe: drop redundant ../ from includes
>  drm/xe: move all top level i915 compat headers to a separate
>    subdirectory
>  drm/xe: remove unnecessary include
>  drm/xe: drop top level i915 from include path
>
> .../gpu/drm/i915/display/intel_backlight.c    |  2 +-
> drivers/gpu/drm/i915/display/intel_bw.c       |  2 +-
> drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +-
> drivers/gpu/drm/i915/display/intel_display.c  | 48 +++++++++----------
> .../drm/i915/display/intel_display_power.c    |  2 +-
> drivers/gpu/drm/i915/display/intel_gmbus.c    |  2 +-
> drivers/gpu/drm/i915/display/intel_opregion.c |  2 +-
> drivers/gpu/drm/i915/display/intel_psr.c      |  2 +-
> drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
> drivers/gpu/drm/xe/Makefile                   | 11 +++--
> .../i915_active_types.h                       |  0
> .../xe/{display => compat-headers}/i915_drv.h |  2 +-
> .../gpu/drm/xe/compat-headers/i915_fixed.h    |  1 +
> drivers/gpu/drm/xe/compat-headers/i915_reg.h  |  1 +
> .../gpu/drm/xe/compat-headers/i915_reg_defs.h |  1 +
> .../gpu/drm/xe/compat-headers/i915_utils.h    |  1 +
> .../xe/{display => compat-headers}/i915_vma.h |  0
> .../i915_vma_types.h                          |  0
> .../drm/xe/compat-headers/intel_mchbar_regs.h |  1 +
> .../drm/xe/compat-headers/intel_pci_config.h  |  1 +
> .../intel_pm_types.h                          |  2 -
> .../intel_runtime_pm.h                        |  0
> .../intel_wakeref.h                           |  0
> drivers/gpu/drm/xe/display/ext/i915_irq.c     | 18 +++----
> .../drm/xe/display/ext/intel_device_info.c    |  5 +-
> drivers/gpu/drm/xe/display/ext/intel_dram.c   |  2 +-
> drivers/gpu/drm/xe/display/ext/intel_pm.c     |  6 +--
> .../gpu/drm/xe/display/intel_display_core.h   |  2 +
> drivers/gpu/drm/xe/regs/xe_reg_defs.h         |  2 +-
> drivers/gpu/drm/xe/xe_display.c               | 26 +++++-----
> 30 files changed, 77 insertions(+), 71 deletions(-)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_active_types.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_drv.h (99%)
> create mode 100644 drivers/gpu/drm/xe/compat-headers/i915_fixed.h
> create mode 100644 drivers/gpu/drm/xe/compat-headers/i915_reg.h
> create mode 100644 drivers/gpu/drm/xe/compat-headers/i915_reg_defs.h
> create mode 100644 drivers/gpu/drm/xe/compat-headers/i915_utils.h
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_vma.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_vma_types.h (100%)
> create mode 100644 drivers/gpu/drm/xe/compat-headers/intel_mchbar_regs.h
> create mode 100644 drivers/gpu/drm/xe/compat-headers/intel_pci_config.h
> rename drivers/gpu/drm/xe/{display => compat-headers}/intel_pm_types.h (95%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/intel_runtime_pm.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/intel_wakeref.h (100%)
> create mode 100644 drivers/gpu/drm/xe/display/intel_display_core.h
>
>-- 
>2.39.1
>