From: Ville Syrjälä Date: Tue, 10 May 2022 10:42:32 +0000 (+0300) Subject: drm/i915/pps: Don't apply quirks/etc. to the VBT PPS delays if they haven't been... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=89fcdf4305996f869eb39eb8f14a989e9a289611;p=linux.git drm/i915/pps: Don't apply quirks/etc. to the VBT PPS delays if they haven't been initialized 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ä Link: https://patchwork.freedesktop.org/patch/msgid/20220510104242.6099-6-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c index 2ef6502703c29..80f8edb0d36d3 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