Hi Dave and Sima, We'd like to include this extra display clean-up towards the 6.12. Hence this extra pull-request on top of what I declared as our last one last week. It only delayed because it touches both Xe and i915 and it depended on xe changes that propagated through drm-xe-next last week + backmerge after that. Thanks, Rodrigo. drm-intel-next-2024-09-03: - Fix probe on 'nomodeset and deprecate i915.modeset=0 (Jani) - Update new entries in VBT BDB block definitions (Dnyaneshwar) - Fix clang build (Andy Shevchenko) - More clean up on drvdata usage in display code (Jani) - Increase fastwake DP sync pulse count as a quirk (Jouni) The following changes since commit 6d0ebb3904853d18eeec7af5e8b4ca351b6f9025: Merge tag 'drm-intel-next-2024-08-29' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next (2024-08-30 13:41:32 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/drm/i915/kernel.git tags/drm-intel-next-2024-09-03 for you to fetch changes up to 963ed4efe0c6416f5a2f61e107ee3a27f0bb757d: drm/i915/dp: hide dp_to_i915() inside intel_dp.c (2024-09-03 17:11:25 +0300) ---------------------------------------------------------------- - Fix probe on 'nomodeset and deprecate i915.modeset=0 (Jani) - Update new entries in VBT BDB block definitions (Dnyaneshwar) - Fix clang build (Andy Shevchenko) - More clean up on drvdata usage in display code (Jani) - Increase fastwake DP sync pulse count as a quirk (Jouni) ---------------------------------------------------------------- Andy Shevchenko (2): drm/i915/fence: Mark debug_fence_init_onstack() with __maybe_unused drm/i915/fence: Mark debug_fence_free() with __maybe_unused Dnyaneshwar Bhadane (1): drm/i915/bios: Update new entries in VBT BDB block definitions Jani Nikula (19): drm/i915: fail module probe on nomodeset and i915.modeset=0 drm/i915: deprecate the i915.modeset module parameter drm/i915 & drm/xe: save struct drm_device to drvdata drm/i915: support struct device and pci_dev in to_intel_display() drm/i915/audio: migrate away from kdev_to_i915() drm/i915/hdcp: migrate away from kdev_to_i915() in bind/unbind drm/i915/hdcp: migrate away from kdev_to_i915() in GSC messaging drm/xe/display: remove unused compat kdev_to_i915() and pdev_to_i915() drm/xe/display: use xe && 0 to avoid warnings about unused variables drm/i915/hdmi: convert to struct intel_display drm/i915/dp: convert g4x_dp.[ch] to struct intel_display drm/i915/dp: convert intel_dp_tunnel.[ch] to struct intel_display drm/i915/dp: convert intel_dp_aux.[ch] to struct intel_display drm/i915/dp: convert intel_dp_link_training.[ch] to struct intel_display drm/i915/pps: pass intel_dp to pps_name() drm/i915/pps: convert intel_pps.[ch] to struct intel_display drm/i915/psr: convert intel_psr.[ch] to struct intel_display drm/i915/ddi: stop using dp_to_i915() drm/i915/dp: hide dp_to_i915() inside intel_dp.c Jouni Högander (2): drm/i915/display: Add mechanism to use sink model when applying quirk drm/i915/display: Increase Fast Wake Sync length as a quirk Rodrigo Vivi (1): Merge drm/drm-next into drm-intel-next drivers/gpu/drm/i915/display/g4x_dp.c | 152 ++-- drivers/gpu/drm/i915/display/intel_alpm.c | 2 +- drivers/gpu/drm/i915/display/intel_audio.c | 34 +- drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- .../gpu/drm/i915/display/intel_display_driver.c | 8 +- drivers/gpu/drm/i915/display/intel_display_irq.c | 13 +- .../drm/i915/display/intel_display_power_well.c | 15 +- drivers/gpu/drm/i915/display/intel_display_reset.c | 7 +- drivers/gpu/drm/i915/display/intel_display_types.h | 14 +- drivers/gpu/drm/i915/display/intel_dp.c | 6 + drivers/gpu/drm/i915/display/intel_dp_aux.c | 130 ++-- drivers/gpu/drm/i915/display/intel_dp_aux.h | 6 +- .../gpu/drm/i915/display/intel_dp_link_training.c | 105 +-- drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 77 +- drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 11 +- drivers/gpu/drm/i915/display/intel_dpll.c | 9 +- drivers/gpu/drm/i915/display/intel_frontbuffer.c | 7 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 10 +- .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 67 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 500 ++++++------ drivers/gpu/drm/i915/display/intel_hdmi.h | 1 - drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- drivers/gpu/drm/i915/display/intel_pch_display.c | 3 +- drivers/gpu/drm/i915/display/intel_pps.c | 563 +++++++------- drivers/gpu/drm/i915/display/intel_pps.h | 10 +- drivers/gpu/drm/i915/display/intel_psr.c | 848 +++++++++++---------- drivers/gpu/drm/i915/display/intel_psr.h | 8 +- drivers/gpu/drm/i915/display/intel_quirks.c | 68 ++ drivers/gpu/drm/i915/display/intel_quirks.h | 6 + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 37 +- drivers/gpu/drm/i915/i915_driver.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- drivers/gpu/drm/i915/i915_module.c | 9 +- drivers/gpu/drm/i915/i915_params.c | 3 +- drivers/gpu/drm/i915/i915_sw_fence.c | 8 +- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 13 +- drivers/gpu/drm/xe/xe_device.h | 8 +- drivers/gpu/drm/xe/xe_pci.c | 2 +- 41 files changed, 1546 insertions(+), 1252 deletions(-)
