On Thu, 30 Sep 2021, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Unify how we check for -EDEADLK vs. other errors from > crtc vs. encoder compute_config() calls.
On the series, Reviewed-by: Jani Nikula <[email protected]> > > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index a4453dd1bb51..4fa0b7cfa888 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -7699,11 +7699,10 @@ intel_modeset_pipe_config(struct intel_atomic_state > *state, > > ret = encoder->compute_config(encoder, pipe_config, > connector_state); > + if (ret == -EDEADLK) > + return ret; > if (ret < 0) { > - if (ret != -EDEADLK) > - drm_dbg_kms(&i915->drm, > - "Encoder config failure: %d\n", > - ret); > + drm_dbg_kms(&i915->drm, "Encoder config failure: %d\n", > ret); > return ret; > } > } -- Jani Nikula, Intel Open Source Graphics Center
