summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/display
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-01-07 16:03:22 +0300
committerChris Wilson <chris@chris-wilson.co.uk>2020-01-07 14:04:31 +0000
commit953cac3ec55fbf53f66e95e9c9bbd261da68fff1 (patch)
tree132a658c8d5193d5da2d316ccb919d6a00a1a79f /drivers/gpu/drm/i915/display
parent62bf5465b26d1f502430b9c654be7d16bf2e242d (diff)
downloadlinux-stable-953cac3ec55fbf53f66e95e9c9bbd261da68fff1.tar.gz
linux-stable-953cac3ec55fbf53f66e95e9c9bbd261da68fff1.tar.bz2
linux-stable-953cac3ec55fbf53f66e95e9c9bbd261da68fff1.zip
drm/i915: fix an error code in intel_modeset_all_tiles()
There is a cut and paste bug so we return the wrong error code. Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20200107130322.gdk5b6jurifr26c2@kili.mountain
Diffstat (limited to 'drivers/gpu/drm/i915/display')
-rw-r--r--drivers/gpu/drm/i915/display/intel_display.c2
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 2642475e4851..a83df43ef648 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14568,7 +14568,7 @@ intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id)
crtc_state = drm_atomic_get_crtc_state(&state->base,
conn_state->crtc);
if (IS_ERR(crtc_state)) {
- ret = PTR_ERR(conn_state);
+ ret = PTR_ERR(crtc_state);
break;
}
crtc_state->mode_changed = true;