]> www.infradead.org Git - nvme.git/commitdiff
drm/i915: Pass size to spi_oprom_get_vbt
authorRadhakrishna Sripada <radhakrishna.sripada@intel.com>
Wed, 28 Feb 2024 21:32:31 +0000 (13:32 -0800)
committerJani Nikula <jani.nikula@intel.com>
Mon, 11 Mar 2024 10:37:21 +0000 (12:37 +0200)
spi_oprom_get_vbt will later be used to show the contents of vbt for
which the size of vbt is needed.

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-3-radhakrishna.sripada@intel.com
drivers/gpu/drm/i915/display/intel_bios.c

index 71b80ff88c38eaa3af826b4f8842a3f1c9296b98..419ef15144c6398c0bc8fbb92e6ca0d4eb6d161e 100644 (file)
@@ -3007,7 +3007,8 @@ static u32 intel_spi_read(struct intel_uncore *uncore, u32 offset)
        return intel_uncore_read(uncore, PRIMARY_SPI_TRIGGER);
 }
 
-static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915)
+static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915,
+                                           size_t *size)
 {
        u32 count, data, found, store = 0;
        u32 static_region, oprom_offset;
@@ -3050,6 +3051,9 @@ static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915)
 
        drm_dbg_kms(&i915->drm, "Found valid VBT in SPI flash\n");
 
+       if (size)
+               *size = vbt_size;
+
        return (struct vbt_header *)vbt;
 
 err_free_vbt:
@@ -3155,7 +3159,7 @@ void intel_bios_init(struct drm_i915_private *i915)
         * PCI mapping
         */
        if (!vbt && IS_DGFX(i915)) {
-               oprom_vbt = spi_oprom_get_vbt(i915);
+               oprom_vbt = spi_oprom_get_vbt(i915, NULL);
                vbt = oprom_vbt;
        }