Since VBT 228 is from this block that PSR and other power saving
features configuration should be read from.
This new block have a DRRS field but block 40 is not obsolete and
it have information about what DRRS mode is supported so not using
the information on this new block.

v2:
Added information about why DRRS is not used from this new block

Cc: Matt Roper <[email protected]>
Cc: Gwan-gyeong Mun <[email protected]>
Signed-off-by: José Roberto de Souza <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_bios.c     | 19 +++++++++++-
 drivers/gpu/drm/i915/display/intel_vbt_defs.h | 29 +++++++++++++++++++
 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 f6a9a5ccb556..28f12f06a99d 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -668,7 +668,23 @@ parse_driver_features(struct drm_i915_private *dev_priv,
         */
        if (!driver->drrs_enabled)
                dev_priv->vbt.drrs_type = DRRS_NOT_SUPPORTED;
-       dev_priv->vbt.psr.enable = driver->psr_enabled;
+       if (bdb->version < 228)
+               dev_priv->vbt.psr.enable = driver->psr_enabled;
+}
+
+static void
+parse_power_conservation_features(struct drm_i915_private *dev_priv,
+                                 const struct bdb_header *bdb)
+{
+       const struct bdb_lfp_power *power;
+       u8 panel_type = dev_priv->vbt.panel_type;
+
+       power = find_section(bdb, BDB_LVDS_POWER);
+       if (!power)
+               return;
+
+       if (bdb->version >= 228)
+               dev_priv->vbt.psr.enable = power->psr & (1 << panel_type);
 }
 
 static void
@@ -1973,6 +1989,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
        parse_lfp_backlight(dev_priv, bdb);
        parse_sdvo_panel_data(dev_priv, bdb);
        parse_driver_features(dev_priv, bdb);
+       parse_power_conservation_features(dev_priv, bdb);
        parse_edp(dev_priv, bdb);
        parse_psr(dev_priv, bdb);
        parse_mipi_config(dev_priv, bdb);
diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h 
b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
index f0338da3a82a..98b71dc32d2a 100644
--- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
@@ -793,6 +793,35 @@ struct bdb_lfp_backlight_data {
        struct lfp_backlight_control_method backlight_control[16];
 } __packed;
 
+/*
+ * Block 44 - LFP Power Conservation Features Block
+ */
+
+struct als_data_entry {
+       u16 backlight_adjust;
+       u16 lux;
+} __packed;
+
+struct agressiveness_profile_entry {
+       u8 dpst_agressiveness : 4;
+       u8 lace_agressiveness : 4;
+} __packed;
+
+struct bdb_lfp_power {
+       u8 lfp_feature_bits;
+       struct als_data_entry als[5];
+       u8 lace_aggressiveness_profile;
+       u16 dpst;
+       u16 psr;
+       u16 drrs;
+       u16 lace_support;
+       u16 adt;
+       u16 dmrrs;
+       u16 adb;
+       u16 lace_enabled_status;
+       struct agressiveness_profile_entry aggressivenes[16];
+} __packed;
+
 /*
  * Block 52 - MIPI Configuration Block
  */
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to