summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/display/intel_pps.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2022-05-10 12:42:32 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2022-05-27 19:23:10 +0200
commit89fcdf4305996f869eb39eb8f14a989e9a289611 (patch)
treee3511a79c0391be29b07886642a9a4001990f1d7 /drivers/gpu/drm/i915/display/intel_pps.c
parentdrm/i915/pps: Introduce pps_delays_valid() (diff)
downloadlinux-89fcdf4305996f869eb39eb8f14a989e9a289611.tar.xz
linux-89fcdf4305996f869eb39eb8f14a989e9a289611.zip
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ä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220510104242.6099-6-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_pps.c')
-rw-r--r--drivers/gpu/drm/i915/display/intel_pps.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 2ef6502703c2..80f8edb0d36d 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