diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-09-30 13:41:31 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-10-01 16:04:34 +0300 |
| commit | 048a57fc0d6ab76174eebe7e0c993a370bf516c1 (patch) | |
| tree | 39033bf7fdc9a6fd634678d3ac8855d6f038b8f1 /drivers/gpu/drm/i915/display | |
| parent | drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() (diff) | |
| download | linux-dev-048a57fc0d6ab76174eebe7e0c993a370bf516c1.tar.xz linux-dev-048a57fc0d6ab76174eebe7e0c993a370bf516c1.zip | |
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ä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210930104133.30854-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 7 |
1 files 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 5f8f233f0e3c..59bb346aa36e 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; } } |