drm/i915/edp: postpone MSO init until after EDID read

MSO will require segment pixel overlap information from the
EDID. Postpone MSO init until after we've read and cached the EDID.

Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7a360fca01be0f971337b3635f4e4752922ffebe.1630419362.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 161c33b2c869ac85af68ea5146959752b4f89d88..9015ed76d5fd2a6d3f9cf4b8ec96fc6b8528ac9f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2568,8 +2568,6 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)
         */
        intel_edp_init_source_oui(intel_dp, true);
 
-       intel_edp_mso_init(intel_dp);
-
        return true;
 }
 
@@ -4848,6 +4846,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
        if (fixed_mode)
                downclock_mode = intel_drrs_init(intel_connector, fixed_mode);
 
+       /* MSO requires information from the EDID */
+       intel_edp_mso_init(intel_dp);
+
        /* multiply the mode clock and horizontal timings for MSO */
        intel_edp_mso_mode_fixup(intel_connector, fixed_mode);
        intel_edp_mso_mode_fixup(intel_connector, downclock_mode);