Commit 9533fd80 authored by Manasi Navare's avatar Manasi Navare
Browse files

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: 4e3cdb45 ("drm/i915/dp: Master/Slave enable/disable sequence for bigjoiner")
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201119232615.23231-1-manasi.d.navare@intel.com
parent afd4cf78

drivers/gpu/drm/i915/display/intel_display.c

+3 −5
Original line number Diff line number Diff line
@@ -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))













	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);

















































































CRA Git | Maintained and supported by SUSTech CRA and CCSE