Make pmdemand state opaque, convert pmdemand and global state to struct intel_display, and make pmdemand independent of i915_drv.h. This is what I'd like to be done to all global state management. All opaque, all converted to struct intel_display. BR, Jani. Jani Nikula (4): drm/i915/pmdemand: convert to_intel_pmdemand_state() to a function drm/i915/pmdemand: make struct intel_pmdemand_state opaque drm/i915/pmdemand: convert to struct intel_display drm/i915/display: convert global state to struct intel_display drivers/gpu/drm/i915/display/intel_bw.c | 3 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 3 +- .../drm/i915/display/intel_display_driver.c | 8 +- .../drm/i915/display/intel_display_power.c | 4 +- .../gpu/drm/i915/display/intel_global_state.c | 42 ++-- .../gpu/drm/i915/display/intel_global_state.h | 6 +- .../drm/i915/display/intel_modeset_setup.c | 17 +- drivers/gpu/drm/i915/display/intel_pmdemand.c | 195 ++++++++++-------- drivers/gpu/drm/i915/display/intel_pmdemand.h | 51 ++--- drivers/gpu/drm/i915/display/skl_watermark.c | 3 +- 10 files changed, 170 insertions(+), 162 deletions(-) -- 2.39.5