Under the hood, intel_wakeref_t is just struct ref_tracker *. Use the
actual underlying type both for clarity (we *are* using intel_wakeref_t
as a pointer though it doesn't look like one) and to help i915, xe and
display coexistence without custom types.

Reduce intel_wakeref_t usage a bit first by declaring the variables
within the with_*() macros.


Jani Nikula (5):
  drm/i915/pps: drop wakeref parameter from with_intel_pps_lock()
  drm/i915/pps: convert intel_wakeref_t to struct ref_tracker *
  drm/i915/power: drop wakeref parameter from
    with_intel_display_power*()
  drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  drm/{i915,xe}/display: drop intel_wakeref.h usage

 drivers/gpu/drm/i915/display/g4x_dp.c         |  5 +-
 drivers/gpu/drm/i915/display/g4x_hdmi.c       |  2 +-
 drivers/gpu/drm/i915/display/i9xx_plane.c     |  2 +-
 drivers/gpu/drm/i915/display/icl_dsi.c        |  4 +-
 drivers/gpu/drm/i915/display/intel_audio.c    |  6 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +-
 drivers/gpu/drm/i915/display/intel_cmtg.c     |  3 +-
 drivers/gpu/drm/i915/display/intel_crt.c      |  6 +-
 drivers/gpu/drm/i915/display/intel_cursor.c   |  4 +-
 drivers/gpu/drm/i915/display/intel_cx0_phy.c  | 18 +++---
 drivers/gpu/drm/i915/display/intel_ddi.c      | 16 ++---
 drivers/gpu/drm/i915/display/intel_display.c  | 23 +++----
 .../gpu/drm/i915/display/intel_display_core.h |  2 +-
 .../drm/i915/display/intel_display_debugfs.c  |  2 +-
 .../drm/i915/display/intel_display_power.c    | 29 +++++----
 .../drm/i915/display/intel_display_power.h    | 45 +++++++------
 .../drm/i915/display/intel_display_types.h    |  6 +-
 drivers/gpu/drm/i915/display/intel_dmc.c      |  2 +-
 drivers/gpu/drm/i915/display/intel_dp.c       |  3 +-
 drivers/gpu/drm/i915/display/intel_dp_aux.c   |  4 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 18 +++---
 drivers/gpu/drm/i915/display/intel_dpll_mgr.h |  4 +-
 drivers/gpu/drm/i915/display/intel_dsi.h      |  7 ++-
 drivers/gpu/drm/i915/display/intel_gmbus.c    |  4 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c     |  4 +-
 drivers/gpu/drm/i915/display/intel_hotplug.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_lt_phy.c   | 14 ++---
 drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
 .../drm/i915/display/intel_modeset_setup.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_pipe_crc.c |  2 +-
 drivers/gpu/drm/i915/display/intel_pps.c      | 63 ++++++-------------
 drivers/gpu/drm/i915/display/intel_pps.h      | 14 +++--
 drivers/gpu/drm/i915/display/intel_sprite.c   |  6 +-
 drivers/gpu/drm/i915/display/intel_tc.c       | 40 +++++-------
 drivers/gpu/drm/i915/display/intel_vdsc.c     |  2 +-
 .../drm/i915/display/skl_universal_plane.c    |  2 +-
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c        |  2 +-
 .../xe/compat-i915-headers/intel_wakeref.h    | 10 ---
 drivers/gpu/drm/xe/display/xe_display_rpm.c   |  3 +
 40 files changed, 177 insertions(+), 212 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h

-- 
2.47.3

Reply via email to