[PATCH 00/15] drm/i915: drop __to_intel_display() transitional macro

Jani Nikula jani.nikula at intel.com
Wed Aug 6 16:55:01 UTC 2025


Switch to passing struct intel_display to all the macros that use
__to_intel_display(), and once that's done, remove __to_intel_display().

We'll still need to get rid of struct intel_display usage like this
outside of display, but explicit is better than implicit, and this
prevents new accidental struct drm_i915_private usages from cropping up.

Jani Nikula (15):
  drm/i915/display: pass display to HAS_PCH_*() macros
  drm/i915/fb: pass display to HAS_GMCH() and DISPLAY_VER()
  drm/i915/clockgating: pass display to for_each_pipe()
  drm/i915/clockgating: pass display to HAS_PCH_*() macros
  drm/i915/clockgating: pass display to DSPCNTR and DSPSURF register
    macros
  drm/i915/irq: pass display to macros that expect display
  drm/i915/dram: pass display to macros that expect display
  drm/i915/gmch: pass display to DISPLAY_VER()
  drm/i915/gem: pass display to HAS_DISPLAY()
  drm/i915/switcheroo: pass display to HAS_DISPLAY()
  drm/i915/drv: pass display to HAS_DISPLAY()
  drm/i915/uncore: pass display to HAS_FPGA_DBG_UNCLAIMED()
  drm/i915/gvt: convert mmio table to struct intel_display
  drm/i915/reg: separate VLV_DSPCLK_GATE_D from DSPCLK_GATE_D
  drm/i915/display: drop __to_intel_display() usage

 .../i915/display/intel_display_conversion.c   |   2 +-
 .../i915/display/intel_display_conversion.h   |  12 -
 .../drm/i915/display/intel_display_device.h   |   7 +-
 .../gpu/drm/i915/display/intel_display_irq.c  |   9 +-
 .../i915/display/intel_display_power_well.c   |   2 +-
 drivers/gpu/drm/i915/display/intel_fb_pin.c   |   4 +-
 drivers/gpu/drm/i915/display/intel_gmbus.c    |   2 +-
 drivers/gpu/drm/i915/display/intel_overlay.c  |   5 +-
 drivers/gpu/drm/i915/display/intel_pch.h      |   4 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c        |   4 +-
 .../i915/gem/selftests/i915_gem_client_blt.c  |   3 +-
 drivers/gpu/drm/i915/i915_driver.c            |  14 +-
 drivers/gpu/drm/i915/i915_irq.c               |  13 +-
 drivers/gpu/drm/i915/i915_reg.h               |   3 +-
 drivers/gpu/drm/i915/i915_switcheroo.c        |   6 +-
 drivers/gpu/drm/i915/intel_clock_gating.c     |  35 ++-
 drivers/gpu/drm/i915/intel_gvt_mmio_table.c   | 266 +++++++++---------
 drivers/gpu/drm/i915/intel_uncore.c           |   3 +-
 drivers/gpu/drm/i915/selftests/intel_uncore.c |   8 +-
 drivers/gpu/drm/i915/soc/intel_dram.c         |   5 +-
 drivers/gpu/drm/i915/soc/intel_gmch.c         |   3 +-
 21 files changed, 206 insertions(+), 204 deletions(-)

-- 
2.39.5



More information about the Intel-xe mailing list