From 0cb9b4ead00e5359e543f9c88684970ccbaf5d25 Mon Sep 17 00:00:00 2001 From: Radhakrishna Sripada Date: Wed, 28 Feb 2024 13:32:34 -0800 Subject: [PATCH] drm/i915: Duplicate opregion vbt memory In the case of vbt residing in opregion, we simply remap the region into the kernel and pass the memory reference. Instead duplicate the memory to handle a saner cleanup in intel_bios_init. Cc: Jani Nikula Signed-off-by: Radhakrishna Sripada Reviewed-by: Jani Nikula Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20240228213235.2495611-6-radhakrishna.sripada@intel.com --- drivers/gpu/drm/i915/display/intel_bios.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index cbbef39c69cbe..51954deaf6441 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -3194,8 +3194,10 @@ void intel_bios_init(struct drm_i915_private *i915) oprom_vbt = firmware_get_vbt(i915, NULL); vbt = oprom_vbt; - if (!vbt) - vbt = intel_opregion_get_vbt(i915, NULL); + if (!vbt) { + oprom_vbt = intel_opregion_get_vbt(i915, NULL); + vbt = oprom_vbt; + } /* * If the OpRegion does not have VBT, look in SPI flash through MMIO or diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index 58dfecb617b07..68bd5101ec89c 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -1151,7 +1151,7 @@ const void *intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size) if (size) *size = opregion->vbt_size; - return opregion->vbt; + return kmemdup(opregion->vbt, opregion->vbt_size, GFP_KERNEL); } bool intel_opregion_headless_sku(struct drm_i915_private *i915) -- 2.30.2