drm/i915: Do not call hsw_set_frame_start_delay for dsi

This should fix the boot oops for dsi

v2:
* Fix indent (Manasi)
v3:
* Remove redundant condition (Matt Roper)

Fixes: 4e3cdb4535e7 ("drm/i915/dp: Master/Slave enable/disable sequence for bigjoiner")
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201119232615.23231-1-manasi.d.navare@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 1a0f00f37ca96cc584ef084199a21ef4e0c872c0..0038f14c8bfbcbeb090f7e00f00d21e6da6c05bd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7211,12 +7211,10 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
        if (INTEL_GEN(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
                bdw_set_pipemisc(new_crtc_state);
 
-       if (!new_crtc_state->bigjoiner_slave || !transcoder_is_dsi(cpu_transcoder)) {
-               if (!transcoder_is_dsi(cpu_transcoder))
-                       intel_set_transcoder_timings(new_crtc_state);
+       if (!new_crtc_state->bigjoiner_slave && !transcoder_is_dsi(cpu_transcoder)) {
+               intel_set_transcoder_timings(new_crtc_state);
 
-               if (cpu_transcoder != TRANSCODER_EDP &&
-                   !transcoder_is_dsi(cpu_transcoder))
+               if (cpu_transcoder != TRANSCODER_EDP)
                        intel_de_write(dev_priv, PIPE_MULT(cpu_transcoder),
                                       new_crtc_state->pixel_multiplier - 1);