Commit a23299bb authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210930093229.28598-1-jani.nikula@intel.com
parent 7d8de8ca

drivers/gpu/drm/i915/display/intel_display.c

+5 −6
Original line number Diff line number Diff line
@@ -7555,12 +7555,7 @@ intel_modeset_pipe_config(struct intel_atomic_state *state, 
	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 @@ intel_modeset_pipe_config(struct intel_atomic_state *state, 
		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

drivers/gpu/drm/i915/display/intel_fdi.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ int ilk_fdi_compute_config(struct intel_crtc *crtc, 
	}



	if (needs_recompute)

		return I915_DISPLAY_CONFIG_RETRY;

		return -EAGAIN;



	return ret;

}

drivers/gpu/drm/i915/display/intel_fdi.h

+0 −1
Original line number Diff line number Diff line
@@ -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,