Hi,
On 11/19/20 8:13 AM, Manasi Navare wrote:
> This should fix the boot oops for dsi
>
> Fixes: 4e3cdb4535e7 ("drm/i915/dp: Master/Slave enable/disable sequence for bigjoiner")
> Signed-off-by: Manasi Navare <manasi.d.navare@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 5c07c74d4397..739be96e998d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7211,7 +7211,7 @@ 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 (!new_crtc_state->bigjoiner_slave && !transcoder_is_dsi(cpu_transcoder)) {
> if (!transcoder_is_dsi(cpu_transcoder))
This condition is now always true so this nested if can be dropped now and the
code it guards can be executed unconditionally now (within the parent if).
Regards,
Hans
> intel_set_transcoder_timings(new_crtc_state);
>
> @@ -7224,7 +7224,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
> intel_cpu_transcoder_set_m_n(new_crtc_state,
> &new_crtc_state->fdi_m_n, NULL);
>
> - hsw_set_frame_start_delay(new_crtc_state);
> + hsw_set_frame_start_delay(new_crtc_state);
> }
>
> if (!transcoder_is_dsi(cpu_transcoder))
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
