Store all VS/PE-O relevant metadata inside anonymous struct in
intel_vbt_data.

Name the field as vspeo: an abomination from VS/PE-O, which in turn
could be expanded to VSwing / Pre-Emphasis Override.

Signed-off-by: Michał Grzelak <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_bios.c         |  8 ++++----
 drivers/gpu/drm/i915/display/intel_display_core.h | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c 
b/drivers/gpu/drm/i915/display/intel_bios.c
index 12275738299f..d071f0e5d438 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2204,10 +2204,10 @@ parse_vswing_preemph_override(struct intel_display 
*display)
        if (!block)
                return;
 
-       display->vbt.tables = block->tables;
-       display->vbt.num_tables = block->num_tables;
-       display->vbt.num_columns = block->num_columns;
-       display->vbt.num_rows = vswing_preemph_num_rows(display);
+       display->vbt.vspeo.tables = block->tables;
+       display->vbt.vspeo.num_tables = block->num_tables;
+       display->vbt.vspeo.num_columns = block->num_columns;
+       display->vbt.vspeo.num_rows = vswing_preemph_num_rows(display);
 }
 
 static u8 translate_iboost(struct intel_display *display, u8 val)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h 
b/drivers/gpu/drm/i915/display/intel_display_core.h
index c0530a54abb6..061bf479458f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -242,10 +242,12 @@ struct intel_vbt_data {
        struct list_head display_devices;
        struct list_head bdb_blocks;
 
-       const u32 *tables;
-       int num_tables;
-       int num_columns;
-       int num_rows;
+       struct {
+               const u32 *tables;
+               int num_tables;
+               int num_columns;
+               int num_rows;
+       } vspeo;
 
        struct sdvo_device_mapping {
                u8 initialized;
-- 
2.45.2

Reply via email to