Attachment 130821 Details for Bug 100020 – Proposed fix - Rejected on the list

[patch] Proposed fix - Rejected on the list

0001-tests-kms_frontbuffer_tracking-Skip-if-CRTC-not-sele.patch (text/plain), 1.67 KB, created by krisman on 2017-04-13 05:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: krisman

Created: 2017-04-13 05:00:24 UTC

Size: 1.67 KB

patch

obsolete

>From 5e500de89474d0dddee0b06d910ab23ac611ee14 Mon Sep 17 00:00:00 2001
>From: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
>Date: Thu, 13 Apr 2017 01:37:14 -0300
>Subject: [PATCH] tests/kms_frontbuffer_tracking: Skip if CRTC not selected
>
>After Linux commit f7e9b004b8a3 ("drm/i915/fbc: inline
>intel_fbc_can_choose()"), no_fbc_reason will be updated to a new error
>message if we don't have a plane in the new state, which should make the
>test skip, but the test code doesn't catch that message and tries to
>execute the test, triggering a test failure.
>
>Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
>---
> tests/kms_frontbuffer_tracking.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
>diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
>index e75ea5497c4f..90a939863847 100644
>--- a/tests/kms_frontbuffer_tracking.c
>+++ b/tests/kms_frontbuffer_tracking.c
>@@ -921,6 +921,14 @@ static bool fbc_stride_not_supported(void)
> 	return strstr(buf, "FBC disabled: framebuffer stride not supported\n");
> }
> 
>+static bool fbc_crtc_not_chosen(void)
>+{
>+	char buf[128];
>+
>+	debugfs_read("i915_fbc_status", buf);
>+	return strstr(buf, "FBC disabled: no suitable CRTC for FBC\n");
>+}
>+
> static bool fbc_wait_until_enabled(void)
> {
> 	return igt_wait(fbc_is_enabled(), 2000, 1);
>@@ -1699,6 +1707,7 @@ static int adjust_assertion_flags(const struct test_mode *t, int flags)
> 	if (flags_ & ASSERT_FBC_ENABLED) {				\
> 		igt_require(!fbc_not_enough_stolen());			\
> 		igt_require(!fbc_stride_not_supported());		\
>+		igt_require(!fbc_crtc_not_chosen());			\
> 		if (!fbc_wait_until_enabled()) {			\
> 			fbc_print_status();				\
> 			igt_assert_f(false, "FBC disabled\n");		\
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 100020: 130000 | 130737 | 130821

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.