From patchwork Tue Nov 14 14:07:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10057709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A99BF601D3 for ; Tue, 14 Nov 2017 14:07:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E444297F4 for ; Tue, 14 Nov 2017 14:07:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8281F29759; Tue, 14 Nov 2017 14:07:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E250329759 for ; Tue, 14 Nov 2017 14:07:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61E3E89C80; Tue, 14 Nov 2017 14:07:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0067.outbound.protection.outlook.com [104.47.40.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id C31D089C80; Tue, 14 Nov 2017 14:07:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=UFmaYVxjGaBQ1oHphh7+e5WZSaVFmqvb4gQkRGzTNUI=; b=hMpSLTO/vJIPopamH6IHWAV6bY/5yvYhutXXclT1yIlA7zq03bZfZik0hMi0JT6sNtbP5EyO4hKJy4u42KrLFaRI6I1mvxsO7E4U9GamjVqxj7toy6tZe6VtcHUli+JZH3qK4RxgURkyNam7MZIeCt6+eU22HM+PY7dxH84c4+E= Received: from BN6PR1201CA0024.namprd12.prod.outlook.com (10.174.238.34) by CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Tue, 14 Nov 2017 14:07:50 +0000 Received: from BY2NAM03FT036.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::208) by BN6PR1201CA0024.outlook.office365.com (2603:10b6:405:4c::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.239.5 via Frontend Transport; Tue, 14 Nov 2017 14:07:50 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT036.mail.protection.outlook.com (10.152.85.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12 via Frontend Transport; Tue, 14 Nov 2017 14:07:49 +0000 Received: from ubuntu-1604-test.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.361.1; Tue, 14 Nov 2017 08:07:48 -0600 From: Andrey Grodzovsky To: Subject: [PATCH libdrm] amdgpu: Disable deadlock test suite for Vega 10 Date: Tue, 14 Nov 2017 09:07:35 -0500 Message-ID: <1510668455-4979-1-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(2980300002)(428002)(189002)(199003)(101416001)(53416004)(5003940100001)(189998001)(4326008)(305945005)(97736004)(450100002)(356003)(53936002)(72206003)(50986999)(2906002)(478600001)(47776003)(86362001)(8936002)(54906003)(6916009)(16586007)(316002)(5660300001)(81166006)(50226002)(105586002)(81156014)(106466001)(8676002)(48376002)(33646002)(77096006)(104016004)(68736007)(50466002)(36756003)(2351001)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1447; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT036; 1:c2HSPvwm7BztJu3pNgM+XfiZMJaRxzNfAERStvJQshKHgFNlUygreUVw2NtylD50h/WiiwemvqjRJScZfoEtrfD9xXu0PRknDie98UyFfi55WbsS84Il8yKO833bg6X+ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84f7139d-d1e7-4435-f329-08d52b6916cc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 3:XbrXQ7BS7KqtBeGrBFVLJAE8h+83FLfoKKyVqLItk4DvgWAIAUJxHqGxxTA7oiuQrTVHt0eocNHRy8Ytn/HkiR53YNN9XlO2iJfyTgIICUtfCiOh3pDMg2xang6Dq6bFTbY46kYVEreIDbDQhLwbJzbWPYdrn77IY+lKwsZ3BllWEJ7AAUmK0v97nWpe4QyxmkeR9yo2mDh07VhSsf+E2bzH+ECyoAxRHxF4jRxCE1nV3vb2BpLyth7ztKNpdk7/LZn6CurrSlMVdq0XheEv2k+nxKTZPhroCaMF/nrycVl/9Sfg9jp2H3sDuZpEGMYZOcVPulFfMAWg6HTpmsLZQRSCSMawNVkNjd7XIws6oRU=; 25:cyIUklobzBu08caPqrvrINC4k/f6EevaU4MUaKdNWYZmU3xS/flw7qNykM8c352rrxPifSGJ7ic6oEPVbeU0+6GYZwJ0oqRRlw+nyjys7yzlm3xj8BCwwkRLqcMwTCkbUF0/j3BDOQL4ibrm6GN1Oxw1oQvlA7lXjyp1VIsF715JPM5uxtzjuQ3oqRkhSUuxUapDNnooKMmfNHm2Nu0b1tnD5RIA6do9X4pYwM6FEWgIrMWXjuiLYUo/S786+ck2HkX+HV4Lpc04gcRetZ8f+2IYoLL5u5bh3Jm2/IDWXwIXVSOgDi6cDHxgJ/O1huYcsbQVZ4Kxv1IShmBPTKVriA== X-MS-TrafficTypeDiagnostic: CY4PR12MB1447: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 31:9p1VWJpOipkb5H3xuErBK1mIkaT/gut2obEJMl9TnSNgBQ8hcmYHnRr4ViL/DPLWu6TMJ8LrRm7g6RCGdbzVmiXBR6xPyhWPwB8fI+mPEFyZuSAqsTQylN/EkX4g4+QYwZm6V7vFR53eZ9mnrd8qV5LVnAvsfxZef0jJz18n+Z8C865wyUuy9GP7g+CJM4yNxVkaxpZc3Nq12VW4gSfigSi9WpOokurhf9s1whlhY/g=; 20:tyXit6zf+tJyX1RdMd1p1HO9IyLE53JCW4otah58SYdZ8Vtivn/oNzsydnrgd+Bd8osvECvFoyRkeDYzg5RZRo8kR+okjN2QOtVTOaNv7EzFCq/Lu9u7Uz6PDNOm4sB/FmKbqBOcWHm5CEvq9CNo2XTgdbfowZs6fmZo4Ys2ToeKAniOAeyr966F9ijz+A9xaVtPZeb1fOhmFxdOujLv+K8by/+OoE7qe+u5r80/gG8mr7GdnFXujhk5h80BV6NfRJQdxbWRpkFVmTKjBBUGyvUBLidh1U5wN4G0wFPCc9V8aeXO/BvOEliMoIt1+8fDrW8NUSzXBkEo/uk5C95s7kADnDN82YuNP5PnhIxn4vTNKFCJ+sJU94sOBdVR0VTziDgGDxvjEhTjLh02faSBfZjaUysA+VLE1mdMvNsDFJZnuPQ9mDPqACX1LHjp7gSL0H4bVqG1SvRH1CTqtxOMM7pZKnKcO9r4DDDiuY8UI22oIQGXi+rM1ylmcVQ9s9UD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93003095)(100000703101)(100105400095)(3002001)(3231022)(6055026)(6041248)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR12MB1447; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 4:0OOClL8Szz9UeMPvKCwub63UG9YkwWeEI5Ww80rzFrbjjBlIzZE1c8pQkJjEAJO6nCMsjShpk6h+Do92fSFzNbLb5wPeHxM9mhkpb0Q/jZ0C9pHdZSLFLcGbTJlb2X2d6juXa2XJiFJRBG7YpognkOJavOu9tQamPye1CFEawGeWfJJi6Lnm9hUJFWEpxDfgxyV7NtvcUNjbT+UpuPx7sx+TM8l22GtwVEzm9X16eMJVU1VKwz/ck+jnptKedfzousQcaABkrlQ+CVN4spQSTUh1VPUwQwxyYmf+o/QiKbNsCtY4cu/EM1z4fWbZDJ76 X-Forefront-PRVS: 04916EA04C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1447; 23:KUIlK/M0h4KGVMMv4NC145yduQEQ1GdUwza/GLFRK?= =?us-ascii?Q?BlIorPDOFTI2gyzXEWZAFUA0Iy7pXdCKY5HFnjwCZErtZV+WtekGZDOZ50Fe?= =?us-ascii?Q?3+yz4lFQqH3ptItU3LT/Xmp7+oyhvmlq2onWiQ1DnE+zqqr0AHSw8gt3kBj9?= =?us-ascii?Q?K4PybZj2RC0ylPSApfK9+gO4obmogPTqEzsSvadd9/m3stvMMeVxfRVQYx2L?= =?us-ascii?Q?EMyIqtP9NCizYOvSQXT1e7weZMqy4CcWqiv/Bz/3v4PYppqNoa57hPLMBy2l?= =?us-ascii?Q?p9dGVphiO7FpSqqemsyE7fCTijO6Nq42PV6voPIQHRTUOLhC96Kf3k4cfG78?= =?us-ascii?Q?Vkc5nx/LMeG1N7zRmNGTmBKqn7+IdJE7n1Dg6v7fZlbesaFtO/B7TW/bNoLv?= =?us-ascii?Q?1m9Kz/z0iEi/5wu6Pny25ew8yHH75jjEAlqwLdfBwmh9F5rs3HoX44J/+5AS?= =?us-ascii?Q?ydUA5cYZ0Z+VOZ90OUoaOjQn12nZvfcOMEVQybjARDD63nrIRuR/95loEkrH?= =?us-ascii?Q?axk3pIPKArC41PP3l1DR60eH+8dpXtXUkm6TKxc1KtbmBLa1PFoouWVha0cS?= =?us-ascii?Q?scn+PzQlmosKoBEddPhb7BmRCL8NhTmrH9RBWM232w+2sg+gMtmL/JSy8AkX?= =?us-ascii?Q?ci/CaRv5ZnaI2V0MlYUB17pX1LT7vsXV1t+I1MKB1w39RjA697E5eQX19aHi?= =?us-ascii?Q?+ElO6TNrA5U/4F7449shl7mEccmR/xmbLI6jrzSrB7BMFVsOqv7BDEmROz0O?= =?us-ascii?Q?g24r9ZQ8SKWP6ScHDllOFPzI5xqPUOTf14yusW+yY+HHGpDUCpttgsZozZvF?= =?us-ascii?Q?5gO1aSHgtus/eNORsG9d7YPzYbfgCv5/nlo8eiFPOpppv91h8G0U4M0vNPLu?= =?us-ascii?Q?Wl5ZBTILOZWUTtMrASA5sEj3Sf1I4tQXeaAws4Swb4Y3kI7ebOfebE3G05ws?= =?us-ascii?Q?FaPQqiTFEzKrAyzn1tikxYHMJJken1NcSiiVFi7ITR6IFpT0y58xlMl4KzQv?= =?us-ascii?Q?/nkQRGKXenOJpVKE3Wh9pQKrkJNuKsv68IvG3Dn1Sk1cwYUIha6/5T4o6Czc?= =?us-ascii?Q?BG8mV+PErctzrg5opocWms0n6J2?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 6:ahUW3g4dQyj4IRQtfe41rfu9q1ZhO9ZQgw91QERpHXwiZ6TkCInRRK9PPpC5bAv+icmI5+wYFs3mE6drNQgOzRoRXQidipGR+k8pV5O4L6z9Q7vmo4AGVFS52ag0VSd2vFXNY0MlCPvGUdGRTJ3Kl3Bng4j2tBg9kkzqZkv+0itHlL1e0mfQMbT7mlWl8yphRbehrK5zNo68/eaES63V3xYirF2pt8/rwBEWZGjf/Re5teW7qvOxOE3tNzi4BQwsZyRxLwXpze/0lGTlMesQYcB5pL/yOVlBu53SW0ThOLQAFhFGtSHPxz7PA1DMmzcqfq9jro8iKg9WtKFmNR/BLb6E6voVxNOOzk52JBSufCE=; 5:b+720g2bdZnSAgR3jgDTMUzIyctxb7LvJxZ86TWZRElL9DVVd6EXPWwmiWHIkI7MRdQs7Uk0LzH99FzsX1SduyG450CU+EjTdAO4Gu+iGU/f0hksJFesnbWpkflL9aWA4f8FRXVUhOvNDIu1CaNnJUnzdor0tUbcyqfI2gyVvJM=; 24:EiMp3NsGi6ngLVBbh7XnX/7kmjjYhFL235IHyMFMPu3tVUvc7BCDFXtxjxOGMOzLvQAZnLrFCuDkotr3GBqrdphVygvmxx0paAt8wt2YhXE=; 7:fBKY0htlK9RzX1H0tNsXVPsDk3/p+TPB9lxFmhleRjXoBnsnFpeSw6VxF7a/W9wokoLYTcyccERVCNGtqlanjcUXaGUJk6VTtiRNG6HHkA3Vqj3WYcVXccwymCp6j0N3o7jxmj2BXHKvRnVX9/6qaFmr1DgtQpkzd9du15khAWvMrh75bSAv5+sXCSLhrbuRufkW5xLJJ1PbeTvZ6+h7SFwbxuj3aU/ozPlHeM4fjcnq/4nwLpMetHXGgPda+kes SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 20:NX+3cI49lbEbo09V23udH7MU2mtj7Pt4PJ4NjnjkR5G6QNYlPgXj5jUaHrGMte3KcUNvikqRDT7riHLrlwML2e2ZiI4VujfbcC1tR81WuqDgIpvw3Ov5ngE7u8sJo/d0xeO51E8fR1W/IlJM7V3RLnT2W6WEzO+3OMpt2ja1i/Y3+7yIwwz0wtQQOLDXph5tJHvRrB+xeEXpfN7zzQQmjt62IzPWlSULR6ttUTAMzQw6SvMMbBEaKDrvt6VN704d X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2017 14:07:49.5321 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84f7139d-d1e7-4435-f329-08d52b6916cc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1447 Cc: Alvin.Huan@amd.com, Ken.Wang@amd.com, Christian.Koenig@amd.com, amd-gfx@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The suite stalls the CP, until RCA is done the suite is disabled to not disrupt regression testing. Signed-off-by: Andrey Grodzovsky Reviewed-by: Christian König --- tests/amdgpu/amdgpu_test.c | 2 +- tests/amdgpu/amdgpu_test.h | 5 +++++ tests/amdgpu/deadlock_tests.c | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c index 91010dc..ee64152 100644 --- a/tests/amdgpu/amdgpu_test.c +++ b/tests/amdgpu/amdgpu_test.c @@ -162,7 +162,7 @@ static Suites_Active_Status suites_active_stat[] = { }, { .pName = DEADLOCK_TESTS_STR, - .pActive = always_active, + .pActive = suite_deadlock_tests_enable, }, { .pName = VM_TESTS_STR, diff --git a/tests/amdgpu/amdgpu_test.h b/tests/amdgpu/amdgpu_test.h index dd236ed..414fcb8 100644 --- a/tests/amdgpu/amdgpu_test.h +++ b/tests/amdgpu/amdgpu_test.h @@ -160,6 +160,11 @@ int suite_deadlock_tests_init(); int suite_deadlock_tests_clean(); /** + * Decide if the suite is enabled by default or not. + */ +CU_BOOL suite_deadlock_tests_enable(void); + +/** * Tests in uvd enc test suite */ extern CU_TestInfo deadlock_tests[]; diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c index f5c4552..84f4deb 100644 --- a/tests/amdgpu/deadlock_tests.c +++ b/tests/amdgpu/deadlock_tests.c @@ -36,6 +36,7 @@ #include "amdgpu_test.h" #include "amdgpu_drm.h" +#include "amdgpu_internal.h" #include @@ -87,6 +88,24 @@ static void amdgpu_deadlock_helper(unsigned ip_type); static void amdgpu_deadlock_gfx(void); static void amdgpu_deadlock_compute(void); +CU_BOOL suite_deadlock_tests_enable(void) +{ + if (amdgpu_device_initialize(drm_amdgpu[0], &major_version, + &minor_version, &device_handle)) + return CU_FALSE; + + if (amdgpu_device_deinitialize(device_handle)) + return CU_FALSE; + + + if (device_handle->info.family_id == AMDGPU_FAMILY_AI) { + printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n"); + return CU_FALSE; + } + + return CU_TRUE; +} + int suite_deadlock_tests_init(void) { struct amdgpu_gpu_info gpu_info = {0};