> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Jouni Högander > Sent: Tuesday, June 20, 2023 2:18 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH] drm/i915/psr: Use hw.adjusted mode when calculating io/fast wake times > > Encoder compute config is changing hw.adjusted mode. Uapi.adjusted mode doesn't get updated before psr compute config > gets called. This causes io and fast wake line calculation using adjusted mode containing values before encoder adjustments. Fix > this by using hw.adjusted mode instead of uapi.adjusted mode. > > Cc: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx> > Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx> > Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx> > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8475 > Fixes: cb42e8ede5b4 ("drm/i915/psr: Use calculated io and fast wake lines") > --- > drivers/gpu/drm/i915/display/intel_psr.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index df517c395da7..04ab034a8d57 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1044,9 +1044,9 @@ static bool _compute_psr2_wake_times(struct intel_dp *intel_dp, > } > > io_wake_lines = intel_usecs_to_scanlines( > - &crtc_state->uapi.adjusted_mode, io_wake_time); > + &crtc_state->hw.adjusted_mode, io_wake_time); > fast_wake_lines = intel_usecs_to_scanlines( > - &crtc_state->uapi.adjusted_mode, fast_wake_time); > + &crtc_state->hw.adjusted_mode, fast_wake_time); > > if (io_wake_lines > max_wake_lines || > fast_wake_lines > max_wake_lines) > -- > 2.34.1
