github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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
This commit is contained in:
Jani Nikula 2021-09-30 12:32:29 +03:00
parent 7d8de8cabb
commit a23299bb9a
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/display/intel_display.c
View File

@ -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

2
drivers/gpu/drm/i915/display/intel_fdi.c
View File

@ -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;
}

1
drivers/gpu/drm/i915/display/intel_fdi.h
View File

@ -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,