drm/i915/fdi: use -EAGAIN instead of local special return value

Using standard -EAGAIN should be perfectly fine instead of using a
special case value.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210930093229.28598-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 4e9a6c9c2deb6e6d710dd2cd4e95b051f9dd6bd9..5f8f233f0e3cc1e87ea4e55779b049a0d3c27908 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7555,12 +7555,7 @@ encoder_retry:
        ret = intel_crtc_compute_config(to_intel_crtc(crtc), pipe_config);
        if (ret == -EDEADLK)
                return ret;
-       if (ret < 0) {
-               drm_dbg_kms(&i915->drm, "CRTC fixup failed\n");
-               return ret;
-       }
-
-       if (ret == I915_DISPLAY_CONFIG_RETRY) {
+       if (ret == -EAGAIN) {
                if (drm_WARN(&i915->drm, !retry,
                             "loop in pipe configuration computation\n"))
                        return -EINVAL;
@@ -7569,6 +7564,10 @@ encoder_retry:
                retry = false;
                goto encoder_retry;
        }
+       if (ret < 0) {
+               drm_dbg_kms(&i915->drm, "CRTC fixup failed\n");
+               return ret;
+       }
 
        /* Dithering seems to not pass-through bits correctly when it should, so
         * only enable it on 6bpc panels and when its not a compliance

diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c
index 02d3294bad7ba5ee1198fd7268c0746f7550f2cc..51d6f810e69b9dc71d64d135bd701d1c9587559a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fdi.c
+++ b/drivers/gpu/drm/i915/display/intel_fdi.c
@@ -267,7 +267,7 @@ retry:
        }
 
        if (needs_recompute)
-               return I915_DISPLAY_CONFIG_RETRY;
+               return -EAGAIN;
 
        return ret;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_fdi.h b/drivers/gpu/drm/i915/display/intel_fdi.h
index d557fc603d7d135f3c228fb97520ba062e27ef26..640d6585c137538cd41771a71c96a9e69adc01ab 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fdi.h
+++ b/drivers/gpu/drm/i915/display/intel_fdi.h
@@ -12,7 +12,6 @@ struct intel_crtc;
 struct intel_crtc_state;
 struct intel_encoder;
 
-#define I915_DISPLAY_CONFIG_RETRY 1
 int intel_fdi_link_freq(struct drm_i915_private *i915,
                        const struct intel_crtc_state *pipe_config);
 int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,