From: Ville Syrjälä <[email protected]>

Skip QUIRK_INCREASE_T12_DELAY and the t11_t12 adjustment of the
VBT PPS delays if we've not yet initialized them. Will be important
later when the PPS delay init can happen before VBT parsing.

Signed-off-by: Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_pps.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_pps.c 
b/drivers/gpu/drm/i915/display/intel_pps.c
index d1ce7dafce10..25f1962dbddf 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -1184,6 +1184,9 @@ static void pps_init_delays_vbt(struct intel_dp *intel_dp,
 
        *vbt = dev_priv->vbt.edp.pps;
 
+       if (!pps_delays_valid(vbt))
+               return;
+
        /* On Toshiba Satellite P50-C-18C system the VBT T12 delay
         * of 500ms appears to be too short. Ocassionally the panel
         * just fails to power back on. Increasing the delay to 800ms
-- 
2.35.1

Reply via email to