The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 75800e2e4203ea83bbc9d4f63ad97ea582244a08 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061926-chasing-national-1d51@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 75800e2e4203 ("drm/i915: Fix audio component initialization") bd738d859e71 ("drm/i915: Prevent modesets during driver init/shutdown") 1ef28d86bea9 ("drm/i915: Suspend the framebuffer console earlier during system suspend") 24b412b1bfeb ("drm/i915: Disable intel HPD poll after DRM poll init/enable") a1a0e8630711 ("drm/i915: Move audio deinit after disabling polling") 6a18ae51d265 ("drm/i915/display: Print display info inside driver display initialization") 40053823baad ("drm/i915/display: move modeset probe/remove functions to intel_display_driver.c") 15e4f0b541d4 ("drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer()") ff2c80be1a00 ("drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch]") 77316e755213 ("drm/i915/display: start high level display driver file") d670c78ea756 ("drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]") 673515ba0249 ("drm/i915/opregion: Register display debugfs later, after initialization steps") 893a6c224a24 ("drm/i915/pm: drop intel_suspend_hw()") d3708182cbc3 ("drm/i915/pm: drop intel_pm_setup()") 3dadb4a17035 ("drm/i915/wm: move ILK watermark sanitization to i9xx_wm.[ch]") 94b49d53acec ("drm/i915/wm: move remaining watermark code out of intel_pm.c") 1b2146de7c5b ("drm/i915: move memory frequency detection to intel_dram.c") 2bf91341ee42 ("drm/i915: Move display power initialization during driver probing later") e5e43d3363d7 ("drm/i915/display: Pass drm_i915_private as param to i915 funcs") 7ee6f99dbc45 ("drm/i915: Replace wm.max_levels with wm.num_levels and use it everywhere") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
