A rough idea what making struct intel_display opaque towards i915 and xe core code looks like. This is by no means ready, and patch 4 is still way too big. We need to do more regular struct drm_i915_private to struct intel_display conversions before this is feasible. But we're getting closer. BR, Jani. Jani Nikula (7): drm/i915/hdmi: remove inline to_i915() drm/i915/hotplug: use container_of() to get struct intel_display drm/i915: convert i915 and xe display members into pointers drm/i915: scripted conversion to i915->display pointer drm/i915: allocate struct intel_display dynamically drm/i915: stop including display/intel_display_core.h from i915_drv.h drm/xe: drop intel_display_core/device.h include from xe_device_types.h drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 + drivers/gpu/drm/i915/display/i9xx_wm.c | 223 +++++++++--------- drivers/gpu/drm/i915/display/intel_atomic.c | 9 +- drivers/gpu/drm/i915/display/intel_bios.c | 1 + drivers/gpu/drm/i915/display/intel_bw.c | 88 +++---- .../gpu/drm/i915/display/intel_connector.c | 9 +- drivers/gpu/drm/i915/display/intel_crtc.c | 1 + .../drm/i915/display/intel_crtc_state_dump.c | 3 +- drivers/gpu/drm/i915/display/intel_ddi.c | 34 +-- .../i915/display/intel_display_conversion.c | 3 +- .../drm/i915/display/intel_display_driver.c | 1 + .../gpu/drm/i915/display/intel_display_irq.c | 150 ++++++------ .../drm/i915/display/intel_display_reset.c | 1 + .../gpu/drm/i915/display/intel_display_rps.c | 1 + drivers/gpu/drm/i915/display/intel_dpll.c | 52 ++-- drivers/gpu/drm/i915/display/intel_dpt.c | 3 +- .../gpu/drm/i915/display/intel_dpt_common.c | 4 +- drivers/gpu/drm/i915/display/intel_dsb.c | 2 +- .../gpu/drm/i915/display/intel_dsb_buffer.c | 1 + drivers/gpu/drm/i915/display/intel_dsi.c | 3 +- .../i915/display/intel_dsi_dcs_backlight.c | 1 + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- drivers/gpu/drm/i915/display/intel_dvo.c | 4 +- drivers/gpu/drm/i915/display/intel_encoder.c | 2 +- drivers/gpu/drm/i915/display/intel_fb.c | 1 + drivers/gpu/drm/i915/display/intel_fb_bo.c | 1 + drivers/gpu/drm/i915/display/intel_fb_pin.c | 1 + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +- drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 1 + .../gpu/drm/i915/display/intel_frontbuffer.c | 35 +-- .../gpu/drm/i915/display/intel_global_state.c | 1 + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 3 +- .../drm/i915/display/intel_hdcp_gsc_message.c | 1 + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 150 ++++++------ .../gpu/drm/i915/display/intel_hotplug_irq.c | 98 ++++---- drivers/gpu/drm/i915/display/intel_lvds.c | 10 +- .../drm/i915/display/intel_modeset_setup.c | 20 +- .../drm/i915/display/intel_modeset_verify.c | 1 + drivers/gpu/drm/i915/display/intel_opregion.c | 1 + .../gpu/drm/i915/display/intel_pch_display.c | 8 +- .../gpu/drm/i915/display/intel_pch_refclk.c | 12 +- .../drm/i915/display/intel_plane_initial.c | 1 + .../gpu/drm/i915/display/intel_sprite_uapi.c | 1 + drivers/gpu/drm/i915/display/intel_tc.c | 10 +- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 +- drivers/gpu/drm/i915/display/intel_wm.c | 61 ++--- drivers/gpu/drm/i915/display/skl_watermark.c | 98 ++++---- drivers/gpu/drm/i915/display/vlv_dsi.c | 6 +- .../i915/gem/i915_gem_object_frontbuffer.h | 2 +- .../i915/gem/selftests/i915_gem_client_blt.c | 1 + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 5 +- drivers/gpu/drm/i915/gt/intel_reset.c | 4 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 7 +- drivers/gpu/drm/i915/gvt/display.c | 11 +- drivers/gpu/drm/i915/gvt/edid.c | 1 + drivers/gpu/drm/i915/gvt/fb_decoder.c | 7 +- drivers/gpu/drm/i915/gvt/handlers.c | 13 +- drivers/gpu/drm/i915/i915_driver.c | 56 +++-- drivers/gpu/drm/i915/i915_drv.h | 7 +- drivers/gpu/drm/i915/i915_getparam.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/i915_switcheroo.c | 1 + drivers/gpu/drm/i915/intel_clock_gating.c | 3 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + drivers/gpu/drm/i915/intel_uncore.c | 1 + .../gpu/drm/i915/selftests/mock_gem_device.c | 1 + drivers/gpu/drm/i915/soc/intel_dram.c | 1 + drivers/gpu/drm/i915/soc/intel_gmch.c | 1 + drivers/gpu/drm/i915/soc/intel_pch.c | 1 + drivers/gpu/drm/xe/display/xe_display.c | 48 ++-- drivers/gpu/drm/xe/display/xe_fb_pin.c | 5 +- drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 3 +- drivers/gpu/drm/xe/display/xe_plane_initial.c | 1 + drivers/gpu/drm/xe/display/xe_tdf.c | 1 + drivers/gpu/drm/xe/xe_device_types.h | 4 +- 78 files changed, 693 insertions(+), 634 deletions(-) -- 2.39.5