On Thu, Jul 01, 2021 at 01:24:26PM -0700, Matt Roper wrote: > From: Animesh Manna <animesh.manna@xxxxxxxxx> > > In verify_mpllb_state() encoder is retrieved from best_encoder > of connector_state. As there will be only one connector_state > for bigjoiner and checking encoder may not be needed for > bigjoiner-slave. This code path related to mpll is done on dg2 > and need this fix to avoid null pointer dereference issue. > > Cc: Manasi Navare <manasi.d.navare@xxxxxxxxx> > Signed-off-by: Animesh Manna <animesh.manna@xxxxxxxxx> > Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx> Reviewed-by: Manasi Navare <manasi.d.navare@xxxxxxxxx> Manasi > --- > drivers/gpu/drm/i915/display/intel_display.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 9655f1b1b41b..3f4e811145b6 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -9153,6 +9153,9 @@ verify_mpllb_state(struct intel_atomic_state *state, > if (!new_crtc_state->hw.active) > return; > > + if (new_crtc_state->bigjoiner_slave) > + return; > + > encoder = intel_get_crtc_new_encoder(state, new_crtc_state); > intel_mpllb_readout_hw_state(encoder, &mpllb_hw_state); > > -- > 2.25.4 > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
