drm/i915: Propagate invalid setcrtc cloning errors back to userspace
authorMatt Roper <matthew.d.roper@intel.com>
Mon, 17 Nov 2014 17:59:28 +0000 (09:59 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 17 Nov 2014 20:20:49 +0000 (21:20 +0100)
When invalid cloning configurations were detected during modeset, we
never copied the error code into the return value variable, leading us
to return 0 (success) to userspace.

This regression has been introduced in

commit 50f5275698df4490046cc5b4ed2018abb642a803
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Nov 7 13:11:00 2014 -0800

    drm/i915: use compute_config in set_config v4

Testcase: igt/kms_setmode
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86226
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 2632f2adc319b7e2f5aba9ae1c2dc34e2d931d76..f84738d5820e2eef59d2c21d5045e99a2d8970c2 100644 (file)
@@ -11469,6 +11469,7 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
                                                   &prepare_pipes,
                                                   &disable_pipes);
        if (IS_ERR(pipe_config)) {
+               ret = PTR_ERR(pipe_config);
                goto fail;
        } else if (pipe_config) {
                if (to_intel_crtc(set->crtc)->new_config->has_audio !=