[RESEND,0/6] drm/i915/display: make all i915_drv.h includes explicit

Message

Jani Nikula Nov. 20, 2024, 12:03 p.m. UTC

Drop all implicit includes of i915_drv.h via other headers in display
code, and make the includes explicit.

With this, we can use:

$ git grep '#include "i915_drv.h"' -- drivers/gpu/drm/i915/display/

to track the progress of struct drm_i915_private -> struct intel_display
conversion, and in general the progress of breaking ties with everything
that comes out of i915_drv.h. Before this, removing the i915_drv.h
includes was meaningless, because we'd always get it through some other
route.

BR,
Jani.

Jani Nikula (6):
  drm/i915/gvt: always pass struct intel_display * to register macros
  drm/i915: extract intel_uncore_trace.[ch]
  drm/i915/display: add intel_display_conversion.c to hide stuff better
  drm/i915/uncore: add to_intel_uncore() and use it
  drm/i915/display: add struct drm_device to struct intel_display
    conversion function
  drm/i915/display: drop i915_drv.h include from intel_display_trace.h

 drivers/gpu/drm/i915/Makefile                 |  2 +
 drivers/gpu/drm/i915/display/g4x_dp.c         |  1 +
 drivers/gpu/drm/i915/display/g4x_hdmi.c       |  1 +
 drivers/gpu/drm/i915/display/i9xx_plane.c     |  1 +
 drivers/gpu/drm/i915/display/icl_dsi.c        |  1 +
 drivers/gpu/drm/i915/display/intel_alpm.c     |  1 +
 .../gpu/drm/i915/display/intel_atomic_plane.c |  1 +
 .../gpu/drm/i915/display/intel_backlight.c    |  1 +
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  1 +
 drivers/gpu/drm/i915/display/intel_color.c    |  1 +
 .../gpu/drm/i915/display/intel_combo_phy.c    |  1 +
 drivers/gpu/drm/i915/display/intel_crtc.c     |  1 +
 drivers/gpu/drm/i915/display/intel_cursor.c   |  1 +
 drivers/gpu/drm/i915/display/intel_cx0_phy.c  |  2 +
 drivers/gpu/drm/i915/display/intel_de.h       |  8 +-
 .../i915/display/intel_display_conversion.c   | 14 ++++
 .../i915/display/intel_display_conversion.h   | 10 ++-
 .../drm/i915/display/intel_display_debugfs.c  |  1 +
 .../drm/i915/display/intel_display_trace.h    |  2 +-
 .../drm/i915/display/intel_display_types.h    |  3 +-
 drivers/gpu/drm/i915/display/intel_dmc_wl.c   |  1 +
 drivers/gpu/drm/i915/display/intel_dp_aux.c   |  2 +-
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c  |  1 +
 drivers/gpu/drm/i915/display/intel_dpio_phy.c |  1 +
 drivers/gpu/drm/i915/display/intel_dpll.c     |  1 +
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c |  1 +
 .../gpu/drm/i915/display/intel_dpt_common.c   |  1 +
 drivers/gpu/drm/i915/display/intel_fdi.c      |  1 +
 drivers/gpu/drm/i915/display/intel_lspcon.c   |  1 +
 .../gpu/drm/i915/display/intel_pch_display.c  |  1 +
 .../gpu/drm/i915/display/intel_pch_refclk.c   |  1 +
 drivers/gpu/drm/i915/display/intel_pipe_crc.c |  1 +
 drivers/gpu/drm/i915/display/intel_snps_phy.c |  1 +
 drivers/gpu/drm/i915/display/skl_scaler.c     |  1 +
 drivers/gpu/drm/i915/gvt/cmd_parser.c         | 17 ++--
 drivers/gpu/drm/i915/gvt/display.c            | 80 ++++++++++---------
 drivers/gpu/drm/i915/gvt/fb_decoder.c         | 21 ++---
 drivers/gpu/drm/i915/gvt/handlers.c           | 44 +++++-----
 drivers/gpu/drm/i915/i915_trace.h             | 28 -------
 drivers/gpu/drm/i915/intel_uncore.c           |  7 +-
 drivers/gpu/drm/i915/intel_uncore.h           |  2 +
 drivers/gpu/drm/i915/intel_uncore_trace.c     |  7 ++
 drivers/gpu/drm/i915/intel_uncore_trace.h     | 49 ++++++++++++
 drivers/gpu/drm/i915/vlv_suspend.c            |  1 +
 drivers/gpu/drm/xe/Makefile                   |  1 +
 .../drm/xe/compat-i915-headers/intel_uncore.h |  5 ++
 .../{i915_trace.h => intel_uncore_trace.h}    |  0
 47 files changed, 221 insertions(+), 110 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_conversion.c
 create mode 100644 drivers/gpu/drm/i915/intel_uncore_trace.c
 create mode 100644 drivers/gpu/drm/i915/intel_uncore_trace.h
 rename drivers/gpu/drm/xe/compat-i915-headers/{i915_trace.h => intel_uncore_trace.h} (100%)