Make debugfs vbt only shows valid vbt when read from ACPI opregion.
Make it work when read from firmware/spi/pci oprom cases.

v2: Extract getiing vbt from different sources to its own function.
    Protect sysfs write with vbt check(Jani)

Cc: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.srip...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c | 60 +++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c 
b/drivers/gpu/drm/i915/display/intel_bios.c
index e5229c41dbf7..80d1bbcc68df 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -3116,6 +3116,29 @@ static struct vbt_header *oprom_get_vbt(struct 
drm_i915_private *i915,
        return NULL;
 }
 
+static const struct vbt_header *intel_bios_get_vbt(struct drm_i915_private 
*i915,
+                                                  size_t *sizep)
+{
+       const struct vbt_header *vbt = NULL;
+
+       vbt = firmware_get_vbt(i915, sizep);
+
+       if (!vbt)
+               vbt = intel_opregion_get_vbt(i915, sizep);
+
+       /*
+        * If the OpRegion does not have VBT, look in SPI flash through MMIO or
+        * PCI mapping
+        */
+       if (!vbt && IS_DGFX(i915))
+               vbt = spi_oprom_get_vbt(i915, sizep);
+
+       if (!vbt)
+               vbt = oprom_get_vbt(i915, sizep);
+
+       return vbt;
+}
+
 /**
  * intel_bios_init - find VBT and initialize settings from the BIOS
  * @i915: i915 device instance
@@ -3127,7 +3150,6 @@ static struct vbt_header *oprom_get_vbt(struct 
drm_i915_private *i915,
 void intel_bios_init(struct drm_i915_private *i915)
 {
        const struct vbt_header *vbt;
-       struct vbt_header *oprom_vbt = NULL;
        const struct bdb_header *bdb;
 
        INIT_LIST_HEAD(&i915->display.vbt.display_devices);
@@ -3141,28 +3163,7 @@ void intel_bios_init(struct drm_i915_private *i915)
 
        init_vbt_defaults(i915);
 
-       oprom_vbt = firmware_get_vbt(i915, NULL);
-       vbt = oprom_vbt;
-
-       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
-        * PCI mapping
-        */
-       if (!vbt && IS_DGFX(i915)) {
-               oprom_vbt = spi_oprom_get_vbt(i915, NULL);
-               vbt = oprom_vbt;
-       }
-
-       if (!vbt) {
-               oprom_vbt = oprom_get_vbt(i915, NULL);
-               vbt = oprom_vbt;
-       }
-
+       vbt = intel_bios_get_vbt(i915, NULL);
        if (!vbt)
                goto out;
 
@@ -3194,7 +3195,7 @@ void intel_bios_init(struct drm_i915_private *i915)
        parse_sdvo_device_mapping(i915);
        parse_ddi_ports(i915);
 
-       kfree(oprom_vbt);
+       kfree(vbt);
 }
 
 static void intel_bios_init_panel(struct drm_i915_private *i915,
@@ -3724,13 +3725,12 @@ static int intel_bios_vbt_show(struct seq_file *m, void 
*unused)
        const void *vbt;
        size_t vbt_size;
 
-       /*
-        * FIXME: VBT might originate from other places than opregion, and then
-        * this would be incorrect.
-        */
-       vbt = intel_opregion_get_vbt(i915, &vbt_size);
-       if (vbt)
+       vbt = intel_bios_get_vbt(i915, &vbt_size);
+
+       if (vbt) {
                seq_write(m, vbt, vbt_size);
+               kfree(vbt);
+       }
 
        return 0;
 }
-- 
2.34.1

Reply via email to