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 <jani.nikula@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240228213235.2495611-6-radhakrishna.sripada@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index cbbef39c69cbe7778c4fb3bef7d3af9e7ca2dd63..51954deaf64415dc3b4f69f6df26e9bb1debe1a7 100644 (file)
--- 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 58dfecb617b07a076a7398ad59b39177c423e979..68bd5101ec89c0bd8e4b32f63c1c3e5e0dea9023 100644 (file)
--- 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)