From: Ville Syrjälä Date: Thu, 30 Sep 2021 10:41:31 +0000 (+0300) Subject: drm/i915: Use standard form -EDEADLK check X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=048a57fc0d6ab76174eebe7e0c993a370bf516c1;p=linux.git drm/i915: Use standard form -EDEADLK check Unify how we check for -EDEADLK vs. other errors from crtc vs. encoder compute_config() calls. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20210930104133.30854-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 5f8f233f0e3cc..59bb346aa36ec 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7537,11 +7537,10 @@ encoder_retry: 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; } }