From: Jani Nikula <jani.nikula@intel.com>
Date: Wed, 17 Mar 2021 16:36:44 +0000 (+0200)
Subject: drm/i915/bios: limit default outputs by platform on missing VBT
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=e20e4037fcb6e3ee647324a88bced6e243e646a7;p=kernel.git

drm/i915/bios: limit default outputs by platform on missing VBT

Pre-DDI and non-CHV aren't using the information created here anyway, so
don't bother setting the defaults for them. This should be a
non-functional change, but is separated here to catch any regressions in
a single commit.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/41526a4eee5fb0de8d7f1ffe4c09965b63ccbaa8.1615998927.git.jani.nikula@intel.com
---

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 38084589c105c..be3dc3363444e 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2082,6 +2082,9 @@ init_vbt_missing_defaults(struct drm_i915_private *i915)
 {
 	enum port port;
 
+	if (!HAS_DDI(i915) && !IS_CHERRYVIEW(i915))
+		return;
+
 	for_each_port(port) {
 		struct ddi_vbt_port_info *info =
 			&i915->vbt.ddi_port_info[port];