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@vger.kernel.org.
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 0289507609dcb7690e45e79fbcc3680d9298ec77 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2024100818-doorstop-clone-45d6@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
0289507609dc ("drm/i915/bios: fix printk format width") 9aec6f76a28c ("drm/i915/bios: convert to struct intel_display") 769b081c18b9 ("drm/i915/opregion: convert to struct intel_display") b7f317e62968 ("drm/i915/opregion: unify intel_encoder/intel_connector naming") f7303ab29d08 ("drm/i915/acpi: convert to struct intel_display") 4c288f56030f ("drm/i915/bios: remove stale and useless comments") 6f4e43a2f771 ("drm/xe: Fix opregion leak") bc3ca4d94369 ("drm/i915: Make I2C terminology more inclusive") fd5a9b950ea8 ("drm/i915/fbc: Convert to intel_display, mostly") bc34d310b578 ("drm/i915/fbc: Extract intel_fbc_has_fences()") d754ed2821fd ("Merge drm/drm-next into drm-intel-next")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0289507609dcb7690e45e79fbcc3680d9298ec77 Mon Sep 17 00:00:00 2001 From: Jani Nikula jani.nikula@intel.com Date: Thu, 5 Sep 2024 14:25:19 +0300 Subject: [PATCH] drm/i915/bios: fix printk format width
s/0x04%x/0x%04x/ to use 0 prefixed width 4 instead of printing 04 verbatim.
Fixes: 51f5748179d4 ("drm/i915/bios: create fake child devices on missing VBT") Cc: stable@vger.kernel.org # v5.13+ Reviewed-by: Vandita Kulkarni vandita.kulkarni@intel.com Link: https://patchwork.freedesktop.org/patch/msgid/20240905112519.4186408-1-jani.... Signed-off-by: Jani Nikula jani.nikula@intel.com (cherry picked from commit 54df34c5a2439b481f066476e67bfa21a0a640e5) Signed-off-by: Joonas Lahtinen joonas.lahtinen@linux.intel.com
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index d49435af62c7..bed485374ab0 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2948,7 +2948,7 @@ init_vbt_missing_defaults(struct intel_display *display) list_add_tail(&devdata->node, &display->vbt.display_devices);
drm_dbg_kms(display->drm, - "Generating default VBT child device with type 0x04%x on port %c\n", + "Generating default VBT child device with type 0x%04x on port %c\n", child->device_type, port_name(port)); }