From: Ville Syrjälä <ville.syrj...@linux.intel.com>

We need to start parsing stuff from the tail end of the LFP data block.
This is made awkward by the fact that the fp_timing table has variable
size. So we must use a bit more finesse to get the tail end, and to
make sure we allocate enough memory for it to make sure our struct
representation fits.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c     | 31 ++++++++++++++++++-
 drivers/gpu/drm/i915/display/intel_vbt_defs.h | 17 ++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c 
b/drivers/gpu/drm/i915/display/intel_bios.c
index b34f8a77712a..3d56fd440c0b 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -517,6 +517,28 @@ get_lvds_fp_timing(const struct bdb_lvds_lfp_data *data,
        return (const void *)data + ptrs->ptr[index].fp_timing.offset;
 }
 
+static const struct bdb_lvds_lfp_data_tail *
+get_lfp_data_tail(const struct bdb_lvds_lfp_data *data,
+                 const struct bdb_lvds_lfp_data_ptrs *ptrs)
+{
+       if (ptrs->panel_name.table_size)
+               return (const void *)data + ptrs->panel_name.offset;
+       else
+               return NULL;
+}
+
+static size_t lfp_data_min_size(const struct bdb_lvds_lfp_data_ptrs *ptrs)
+{
+       size_t size;
+
+       size = sizeof(struct bdb_lvds_lfp_data);
+       if (ptrs->panel_name.table_size)
+               size = max(size, ptrs->panel_name.offset +
+                          sizeof(struct bdb_lvds_lfp_data_tail));
+
+       return size;
+}
+
 /* Parse general panel options */
 static void
 parse_panel_options(struct drm_i915_private *i915,
@@ -624,6 +646,7 @@ parse_lfp_data(struct drm_i915_private *i915,
               const struct bdb_header *bdb)
 {
        const struct bdb_lvds_lfp_data *data;
+       const struct bdb_lvds_lfp_data_tail *tail;
        const struct bdb_lvds_lfp_data_ptrs *ptrs;
 
        ptrs = find_section(i915, bdb, BDB_LVDS_LFP_DATA_PTRS,
@@ -632,12 +655,18 @@ parse_lfp_data(struct drm_i915_private *i915,
                return;
 
        data = find_section(i915, bdb, BDB_LVDS_LFP_DATA,
-                           sizeof(*data));
+                           lfp_data_min_size(ptrs));
        if (!data)
                return;
 
        if (!i915->vbt.lfp_lvds_vbt_mode)
                parse_lfp_panel_dtd(i915, data, ptrs);
+
+       tail = get_lfp_data_tail(data, ptrs);
+       if (!tail)
+               return;
+
+       (void)tail;
 }
 
 static void
diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h 
b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
index e4a11c3e3f3e..64551d206aeb 100644
--- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
@@ -783,6 +783,23 @@ struct lvds_lfp_panel_name {
        u8 name[13];
 } __packed;
 
+struct lvds_lfp_black_border {
+       u8 top; /*  227 */
+       u8 bottom; /*  227 */
+       u8 left; /* 238 */
+       u8 right; /* 238 */
+} __packed;
+
+struct bdb_lvds_lfp_data_tail {
+       struct lvds_lfp_panel_name panel_name[16]; /* 156-163? */
+       u16 scaling_enable; /* 187 */
+       u8 seamless_drrs_min_refresh_rate[16]; /* 188 */
+       u8 pixel_overlap_count[16]; /* 208 */
+       struct lvds_lfp_black_border black_border[16]; /* 227 */
+       u16 dual_lfp_port_sync_enable; /* 231 */
+       u16 gpu_dithering_for_banding_artifacts; /* 245 */
+} __packed;
+
 /*
  * Block 43 - LFP Backlight Control Data Block
  */
-- 
2.34.1

Reply via email to