From fef1930bf30b8182fe8e6e26b8f722ee8995da71 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 14 Jan 2014 13:41:21 +0100 Subject: [PATCH] tests/prime_nv_pcopy: disable swizzle tests It's pure luck that nv can detile some of the intel layouts since one of the video MC formats matches it. Since we can't possible fix this comment the test out. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73538 Acked-by: Maarten Lankhorst Signed-off-by: Daniel Vetter --- tests/prime_nv_pcopy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/prime_nv_pcopy.c b/tests/prime_nv_pcopy.c index 12578f76..59807926 100644 --- a/tests/prime_nv_pcopy.c +++ b/tests/prime_nv_pcopy.c @@ -870,6 +870,7 @@ static int check1_swizzle(uint32_t *p, uint32_t pitch, uint32_t lines, return 0; } +#if 0 /* nv can't deswizzle into all possible versions of Intel BO objects ... */ /* Create a new bo, set tiling to y, and see if macro swizzling is done correctl */ static int test1_swizzle(void) { @@ -952,6 +953,7 @@ out: drm_intel_bo_unreference(test_intel_bo); return ret; } +#endif /* test 2, see if we can copy from linear to intel X format safely * Seems nvidia lacks a method to do it, so just keep this test @@ -1291,7 +1293,7 @@ igt_main xtest(test1_macro); xtest(test1_micro); - xtest(test1_swizzle); + //xtest(test1_swizzle); xtest(test2); xtest(test3_1); xtest(test3_2);