From bba1cd0091b3e8e987f15dac1f38d233b5b0ee78 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Tue, 14 Oct 2014 13:52:58 -0300 Subject: tests/kms_cursor_crc: HSW/BDW only have square cursors When I look at cursor_size_ok() (from the Kernel's intel_display.c), I see that only 845g and i865g support non-square cursors, so SKIP the tests on HSW/BDW instead of failing them. This problem happened because support for non-square cursors was being developed for HSW/BDW, but it ended up not being merged due to a small problem and priority changes. Let's make those tests SKIP until we have proper support on the Kernel: after that, we can revert this patch. v2: Improve commit message. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84268 Signed-off-by: Paulo Zanoni --- tests/kms_cursor_crc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests/kms_cursor_crc.c') diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c index 92d1ce65..87b4f649 100644 --- a/tests/kms_cursor_crc.c +++ b/tests/kms_cursor_crc.c @@ -371,10 +371,7 @@ static bool has_nonsquare_cursors(uint32_t devid) * Test non-square cursors a bit on the platforms * that support such things. */ - return devid == PCI_CHIP_845_G || - devid == PCI_CHIP_I865_G || - (IS_GEN7(devid) && !IS_VALLEYVIEW(devid)) || - (IS_GEN8(devid) && !IS_CHERRYVIEW(devid)); + return devid == PCI_CHIP_845_G || devid == PCI_CHIP_I865_G; } static void test_cursor_size(data_t *data) -- cgit v1.2.3