diff options
| author | Tianjia Zhang <tianjia.zhang@linux.alibaba.com> | 2020-08-02 19:15:35 +0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-08-17 16:16:42 -0400 |
| commit | 66b51b801d05ee54a0f23628cb8220189adb715e (patch) | |
| tree | 6cb4e0e559442bf4d059a86f9e9633256b1995f6 /drivers/gpu/drm | |
| parent | e714977eef8fb40ea8234527d1b0c9d238bf1661 (diff) | |
| download | linux-stable-66b51b801d05ee54a0f23628cb8220189adb715e.tar.gz linux-stable-66b51b801d05ee54a0f23628cb8220189adb715e.tar.bz2 linux-stable-66b51b801d05ee54a0f23628cb8220189adb715e.zip | |
drm/i915: Fix wrong return value in intel_atomic_check()
In the case of calling check_digital_port_conflicts() failed, a
negative error code -EINVAL should be returned.
Fixes: bf5da83e4bd80 ("drm/i915: Move check_digital_port_conflicts() earier")
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200802111535.5200-1-tianjia.zhang@linux.alibaba.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index db2a5a1a9b35..522c772a2111 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -14940,7 +14940,7 @@ static int intel_atomic_check(struct drm_device *dev, if (any_ms && !check_digital_port_conflicts(state)) { drm_dbg_kms(&dev_priv->drm, "rejecting conflicting digital port configuration\n"); - ret = EINVAL; + ret = -EINVAL; goto fail; } |