1 files changed, 21 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b9022fa053d6..c6e69e4cfa83 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -218,7 +218,7 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
 
         dev_priv->vbt.lvds_dither = lvds_options->pixel_dither;
 
-        ret = intel_opregion_get_panel_type(dev_priv->dev);
+        ret = intel_opregion_get_panel_type(dev_priv);
         if (ret >= 0) {
                 WARN_ON(ret > 0xf);
                 panel_type = ret;
@@ -323,6 +323,15 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,
                 return;
         }
 
+        dev_priv->vbt.backlight.type = INTEL_BACKLIGHT_DISPLAY_DDI;
+        if (bdb->version >= 191 &&
+            get_blocksize(backlight_data) >= sizeof(*backlight_data)) {
+                const struct bdb_lfp_backlight_control_method *method;
+
+                method = &backlight_data->backlight_control[panel_type];
+                dev_priv->vbt.backlight.type = method->type;
+        }
+
         dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
         dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm;
         dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
@@ -768,6 +777,16 @@ parse_mipi_config(struct drm_i915_private *dev_priv,
                 return;
         }
 
+        /*
+         * These fields are introduced from the VBT version 197 onwards,
+         * so making sure that these bits are set zero in the previous
+         * versions.
+         */
+        if (dev_priv->vbt.dsi.config->dual_link && bdb->version < 197) {
+                dev_priv->vbt.dsi.config->dl_dcs_cabc_ports = 0;
+                dev_priv->vbt.dsi.config->dl_dcs_backlight_ports = 0;
+        }
+
         /* We have mandatory mipi config blocks. Initialize as generic panel */
         dev_priv->vbt.dsi.panel_id = MIPI_DSI_GENERIC_PANEL_ID;
 }
@@ -1407,7 +1426,7 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size)
 int
 intel_bios_init(struct drm_i915_private *dev_priv)
 {
-        struct pci_dev *pdev = dev_priv->dev->pdev;
+        struct pci_dev *pdev = dev_priv->drm.pdev;
         const struct vbt_header *vbt = dev_priv->opregion.vbt;
         const struct bdb_header *bdb;
         u8 __iomem *bios = NULL;