Skip to contentSkip to conversation

drm/i915: Propagate invalid setcrtc cloning errors back to userspace

PATCH Applied Matt Roper 5 participants 7 messages Nov 17, 2014 – Nov 18, 2014

Subsystems (2)
lore
Share & tools
lore

Matt Roper

author
#0 lore raw

PATCH 1/1 drm/i915: Propagate invalid setcrtc cloning errors back to userspace

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.

Testcase: igt/kms_setmode

---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
index dda97b3..cf57b74 100644
@@ -11477,6 +11477,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 !=
Signature · 6 lines
1.8.5.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Matt Roper

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.

Testcase: igt/kms_setmode

---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +0 -0
index dda97b3..cf57b74 100644

drivers/gpu/drm/i915/intel_display.c static int intel_crtc_set_config(struct drm_mode_set *set) · line 11483

Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -11477,6 +11477,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 !=

Hmm. Unless I'm mistaken the problem appeared in

commit 50f5275698df4490046cc5b4ed2018abb642a803

Author: Jesse Barnes <[email protected]>
Date:   Fri Nov 7 13:11:00 2014 -0800

drm/i915: use compute_config in set_config v4

Quoted 7 lines
Signature · 6 lines
1.8.5.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
In reply to Matt Roper
Quoted 6 lines · Matt Roper

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.

Testcase: igt/kms_setmode

I guess this is a regression from

commit 50f5275698df4490046cc5b4ed2018abb642a803

Author: Jesse Barnes <[email protected]>
Date:   Fri Nov 7 13:11:00 2014 -0800

drm/i915: use compute_config in set_config v4

Is this the one we have a bugzilla for already? Jesse? -Daniel

Quoted 23 lines
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
index dda97b3..cf57b74 100644
@@ -11477,6 +11477,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 !=
Signature · 6 lines
1.8.5.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 6 lines · Matt Roper

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.

Testcase: igt/kms_setmode

I guess this is a regression from

Quoted 8 lines

commit 50f5275698df4490046cc5b4ed2018abb642a803

Author: Jesse Barnes <[email protected]>
Date:   Fri Nov 7 13:11:00 2014 -0800

drm/i915: use compute_config in set_config v4

Is this the one we have a bugzilla for already? Jesse? -Daniel

Looks like it might be this one:

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86226

Matt

Quoted 29 lines
Quoted 24 lines
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
index dda97b3..cf57b74 100644
@@ -11477,6 +11477,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 !=
Signature · 6 lines
1.8.5.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 9 lines
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by
#4 lore raw
Quoted 15 lines · On Mon, 17 Nov 2014 11:17:22 -0800 Matt Roper <[email protected]> wrote:
Quoted 14 lines · Daniel Vetter
Quoted 6 lines · Matt Roper

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.

Testcase: igt/kms_setmode

I guess this is a regression from

commit 50f5275698df4490046cc5b4ed2018abb642a803

Author: Jesse Barnes <[email protected]>
Date:   Fri Nov 7 13:11:00 2014 -0800
Quoted 8 lines
Quoted 4 lines

drm/i915: use compute_config in set_config v4

Is this the one we have a bugzilla for already? Jesse? -Daniel

Looks like it might be this one:

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86226

Ah you found it already? Nice.

Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 23 lines · Jesse Barnes
Quoted 20 lines · On Mon, 17 Nov 2014 11:17:22 -0800 Matt Roper <[email protected]> wrote:
Quoted 18 lines · Daniel Vetter
Quoted 6 lines · Matt Roper

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.

Testcase: igt/kms_setmode

I guess this is a regression from

commit 50f5275698df4490046cc5b4ed2018abb642a803

Author: Jesse Barnes <[email protected]>
Date:   Fri Nov 7 13:11:00 2014 -0800

drm/i915: use compute_config in set_config v4

Is this the one we have a bugzilla for already? Jesse? -Daniel

Quoted 7 lines
Quoted 3 lines

Looks like it might be this one:

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86226

Ah you found it already? Nice.

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#6 lore raw

Re: [PATCH] drm/i915: Propagate invalid setcrtc cloning

In reply to Matt Roper

-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->291/291
PNV: pass/total=356/356->356/356
ILK: pass/total=371/372->372/372
IVB: pass/total=545/546->546/546
SNB: pass/total=424/425->425/425
HSW: pass/total=579/579->579/579
BDW: pass/total=432/435->433/435
-------------------------------------Detailed-------------------------------------
test_platform: test_suite, test_case, result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count, machine_id)...
BYT: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, TIMEOUT(1, M36)PASS(3, M36) -> TIMEOUT(3, M36)PASS(1, M36)
ILK: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, TIMEOUT(1, M37)PASS(3, M37) -> TIMEOUT(3, M37)PASS(1, M37)
IVB: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, TIMEOUT(1, M21)PASS(3, M34) -> TIMEOUT(3, M34)PASS(1, M34)
SNB: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, TIMEOUT(1, M35)PASS(3, M35) -> TIMEOUT(3, M35)PASS(1, M35)
BDW: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, TIMEOUT(1, M28)PASS(3, M28) -> TIMEOUT(3, M28)PASS(1, M28)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx