From patchwork Fri Nov 2 19:35:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10666073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF5DD17D4 for ; Fri, 2 Nov 2018 19:36:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0A862BD1E for ; Fri, 2 Nov 2018 19:36:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94C482C2D8; Fri, 2 Nov 2018 19:36:02 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 35F4E2BD1E for ; Fri, 2 Nov 2018 19:36:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFE566E5CE; Fri, 2 Nov 2018 19:36:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-DM3-obe.outbound.protection.outlook.com (mail-dm3nam05on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe51::610]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A2A76E5C7; Fri, 2 Nov 2018 19:35:59 +0000 (UTC) Received: from SN1PR12CA0052.namprd12.prod.outlook.com (2603:10b6:802:20::23) by CY1PR12MB0426.namprd12.prod.outlook.com (2a01:111:e400:5191::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Fri, 2 Nov 2018 19:35:56 +0000 Received: from CO1NAM03FT060.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::202) by SN1PR12CA0052.outlook.office365.com (2603:10b6:802:20::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1294.25 via Frontend Transport; Fri, 2 Nov 2018 19:35:55 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by CO1NAM03FT060.mail.protection.outlook.com (10.152.81.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1294.14 via Frontend Transport; Fri, 2 Nov 2018 19:35:55 +0000 Received: from ubuntu-1604-test.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 2 Nov 2018 14:35:53 -0500 From: Andrey Grodzovsky To: , Subject: [PATCH libdrm] amdgpu/test: Disable deadlock tests for all non gfx8/9 ASICs. Date: Fri, 2 Nov 2018 15:35:42 -0400 Message-ID: <1541187342-1412-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)(136003)(396003)(346002)(376002)(39860400002)(2980300002)(428003)(199004)(189003)(86362001)(53936002)(97736004)(53416004)(68736007)(2906002)(50226002)(8936002)(50466002)(8676002)(26005)(110136005)(48376002)(81156014)(81166006)(5660300001)(316002)(51416003)(54906003)(7696005)(16586007)(486006)(44832011)(14444005)(104016004)(6666004)(356004)(72206003)(305945005)(105586002)(106466001)(478600001)(186003)(36756003)(336012)(2616005)(126002)(476003)(4326008)(426003)(77096007)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0426; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT060; 1:IVOfXsEbY1/WSTP1Ox+RIr1V29COlshpynl/aY92h9lzSdVApbMkdiMYg79ODB57fDdWFFZJ7REHrsrNG/VA/TVJrA8N3e4nd7I1gGNHmlrJuzygqIqyDsk5oCGGroot X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2ec425f-7498-4f68-f667-08d640fa682d X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:CY1PR12MB0426; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 3:R8qwaA0WM/l2xGVb3YhMj2Me6YTjusImho1QxRpV28gAIO+0LTsV9Qi3BB+NCAcwaptbTsTosyO43WVXECSsa1v2qu3Rsd+Q+JNMF89TqvK9wf3FlR9BoVl8U502lk60BNat141KC9ievVwnfgNa8i6ciqf4qSWY0ckHtGGgaSwlgwPTo/1GdI2kVbjpTOyasema6FhE3xVS8QoA1BAAoR1596ghofMZTZze+hnLcGle6+TOLI7xLyf9P0NmBcccM7Qv0dFO2ITTyvO2EaiQyEE7gMJjCX6ja0XaCkWFWi2XKELfbRCBco8PwCmmgMYSd64uS7E4uDmxgaYpMBx/i99PzDJoUOTwDrS0AKmnCR8=; 25:3BQKDzrjH85Pp2y7QRq3to4dNUuVjZhW+lqSIaBzHwmOaadRueypCUf3q7kt++oGmzTrvUH+jVnekE12WuKzJCxv5dz/NmAaZzsNeHI8g0zXC8vX+4n0/vZ4Q03wz/fY+yh8cmjD+Ce+Xe+68ULh7szsQUEw+8bWtoSTMITY7Pyf3h5mhM88nlj4+fmMXxuG8qv2uJYo7cdkHwQgZAmrlhG4XAXypw+QWOCjgZ8BRg68rrxA0GjFXFjWLeSFafRdlOrrngvv47O+gvVpPnvLvMsD8ZZGKN2K/FzWQESZC7UQdl7KvLH6UOPtD3XG4DlDXs1Fg+y54ZajUJr9XkoIqg== X-MS-TrafficTypeDiagnostic: CY1PR12MB0426: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 31:nB3ycsPHxb786f96X8j4KkM/Xx53RCGbrhoGM+6CfbTYFIh92XeIBhnmNQJ29OJdmT/yuNB32yVGrg+t7UF2gITXMcNNqOhGDvdjzvtded7UObzYthm9j2nkXb+8IBq/kM65pD5QOJPpA801Egmem0mtoWsLuQklc5cAeTC1mE9+hjWFa87TgbRey+ASJpQA1fRDI5g3iRkY+gDM0lfkprDzylG6k7UYQfddFseXNQo=; 20:UK5B+c/iDhnHoydcsDD9G2agtp70/1VImpGJxkzwevkd91Tunu7e7qVK7yHkh4uJFrzYlFpAC+q4zF+azGoyZiltnHP9nAStAoixEmVb7XgXDSaMVCCi/2CSbZhMLwWYA9w/xbft1NG3JdFS1nja0wJ1fSs4cB7IYWOx/QmHNSJuKka+dgiJ6txGUnFyy+UcoRndmMgWlLmnzXvODMnqsUFn8HSO1yWlYdfWJ3L6+bCgnV+UXVwGRrNOSAd05N5dSlJVuPpR2hOMv17kbZiltZuHmByYU4wi6PS7SAtYXJ+iLf/DDP8eLKFkG2llduuC3aqOTU70ErqSSb86gaSfOXp/zuVSMFQMjkR3Ta/NNnsqFC+t+kfo4++uwbGIgrlnNF8VjLngCtHMjzYJuu3yACcxbEUoAPlWfpU1X/KAR++k9yMCqHTkL7vlMMtdoHxTTocjsbXICDV2EuBCod6qDLfLZHOFJbuOuqpllcAKKZSwd2vLnB0T0pXNNdJrIU7q X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93003095)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0426; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0426; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 4:ToJTL/PWjrd06zkUY8dwq7hHfLGfp0g8a15/NXvIQHiUfV1dbR4AMtUo/nRlEn7zHVoA7FVUA2XUu8Pp/FT0p4OYJ5Bl5fywnsDViRL/yYafWQ4VKbQrZrhCVYBYTI1nTn5L81oYwtRXQf2zrFM5fwuKU34hZfvDfzPGHPkk6yMBX2PKl7lJEuM9FEuj/urYk58e5+5VWCV5ac2C7L9qrwmlzb75Zz4PK7LObfRE7NZX4KxHNvQJxbzco/5Wl4j9bg3NMmgBQtZ+hoPQnIqDCoCzJ38M8kaZ4kSaV/SnSWxTq7NKP8hhn7+hQnv3TS4f X-Forefront-PRVS: 08444C7C87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0426; 23:EY6iT5dKIpNkwZ5FTUxt6j7J4CVGmkvxKQhQh6D8W?= 6Wv/gA1Hjq90lUsUcAQyMLUMznBFQwxplI3uUMP5r017rTip4hr/Fe8gQkgeDqT9vrhKCdpfrmXuFf9LwWlU8fykPox3CctbNhHRMVs+AAo6+F6dy2QCLkjOKVPSe2lH+zwApYKTMnZA7W29cMQJUw11Ltn40UbpH/06MDMcGbuqLmh1mj6x8QngkDbXSe4FbOVakq1YslYrsvBa6mpb7zHhx5pJ+gplUADf67+AzBstQkl0NujIgChFfNEw8VYDDIQTZwQccByZlP/AK+IiZfAOhLzsKhYvHhg8ASi3cCfWIXPRgWHaUr+hh9h15LSalnMNzZmfCCeui4kJGZqHUnIABFV60E9d0XqzzzCtpsR1povtZS/BCLzECybS2ZQG6t1echM1ISlb/OXpm0xgrpv7ZBSww44eAHI1IMP7Eg/M6VBDjSNhg8jMRvUnNt8+UqvltQ8iockffuiRsIghMM28pEE30XJexZUW/KznHz1g3zoakJKn8Z9pIf6yHdYaGjcDbQQTcz67qr9yyl/dFOI0raCWtgFKQ5MU8GhaeeGTgzujz8FTFh2w5ZBx82/r5eYAKC7zahfueoNKFHgmyMPUcLCQkrlX1VTOFpU5+AzkUTEj/Zn5qeJg1LFWgqDhVnVmeEKXIuw70FtqXHQo+l55wpkzjbOlSgVUN2ILSKLR42Z3z8heAhBzIq7iL7XBTvRxcCEJh4TwbMFVxRD7PoW11kAx35o8yWVpxczqtAXsNLeEWSGErpcxIKPhl/hbV7fDGeTZWPg8l6d0Nc0jED02LEJJ7GxELAYMx/5hig/snJh7ShkQQBP6+OIdVRXSN9LulWRm3RkDuPCGerEv8bwfzlbVFxqgHMyhzoh+YGVGTZHzUyqkO2F+aCpMEORql7BOSqiSWSCKujz1/VsuSmd4W/kgfBJ3FIVhVx+b97G1CnCeyTEWaYBH14+ZyFJs3sPcdXq31SdGnaIJFh7JdFLQxXmHJlNt+nilxZJufB27IU0mVf2pXh5+Z9khWJ2HujugRYSi/EPNOnDFXYQbWMQMPWv3e6JflOeFa1G7ISMb6OAfDBcIHO9uLEmZZ6/+Fg91My3fCCflRnwD6PZdCea X-Microsoft-Antispam-Message-Info: uzDxRH4OXTUyZ3h4iYxSPCrdnUVIdJWNe8Csp4mPyOElFSe2vBGxuxTXPghQSguBO6ijzCkqhXkbbVec3oGRkOL/PT3Rl8av5+W+g7Gf1Tso5Pax+X88u4BKBhVEo9R+/iYLQuQE1rhqRbjnQxrjNl5scWPNnUh/zQCdaJtTzBv2JEg3mxDGT29xEvKo9ZV+0+tadSH40O37SdCWpfeoFkQMkY75jwi/+mc0lrBVwor7Xk3joUyBnpb94APtTzLPpXEIUcgr6G5gZ1Oo3OODGLt7Eqo+HqaoDQFlHDJOgmD0jEXYen7RwTlNAnS5escJIdmFZBmjk2QPPRFub2HWrWN6YkbprCsKppHlSQuxwq8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 6:gdCAEhE8TDqRMf1y3A0GtGnQ+meFeb1gu/f07oDiqPU4HqeIbR/o1p6PBjV2gSXT5dFtxiKjZt10Px7aPu3KO9Mj8YjmH2pF3VrvPQFOvUh2p7GCkqUogpVmZv7pFothBG8fI5n/vL9vScXZdD9MtHzAokwb/28d698OseS7Y8aHapIZhdckNnR5/0Ll0TeG65m3plmv3LU1tWwADMSVHMCFllqOxSES2a1OHvFckjpYaxlNr0idB2IxGn5zE5rVO7HNNRMvy8px1StjYK/71ZKKK5uLneGwbIQA8no2K8rKg/WdOF7B3twPjP2p4rrIqmDcm55VcO2SP9dR4ekePqNZiWwS97X8nc7YODQI4MVvO6RGNncf61shNNViXlQeeBRoau+zJzDySiCErNW8ytDunM4ORuTPRi7r8njj6Va2rl4BqDvUVa52KwE0t8ZWjx6iAERBZ/VrlqfSzv7lzQ==; 5:Yz+DYbAbpFhy0GKZVkglWyoO39fKoiUjSDoA9AVHhrDhByDxIedv3xHNkt8pnT119q1w5/u06dp1cwPULjyGSKMijIUHlWtvYnmzPo4eSYIwAGWcibNcd22JqqQT9MY+15m3uu9nmE0OLoC8M+MLPRTGVY+QgB/mvf1s+jKwLnY=; 7:ZiZoMqCOHrJUzi5vA3byVjWKy1y76DQE8SK0yl6I1wWOtW+2sgSiJRk+8rvCqUo6eRo0Ybock8tFo9Qpqn3AB906b/GVq1iUF14s/RzI/NwsMiLM1sYUTA/H5viNAXeBr6SDx7rQGSzZ1tZ7g8e4jA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 20:qsZqodCDF1kNZKiWchc4JqgGNkhXLKxo810lj1xc2CL2a0MYCKeTtvsrixkRsJJ1Ayv57vhBDhANmM8DKbleo1881oYa2RdwDGB625ja3dYBD6Nw9WJ8HGYVrneBgduyL3IebXGfL/ilWB19LjY3bCHmQdkQ3JMBhrfUwYeNxtursSElGGXteend9PIi3dyWu4JtcCSQcOqtyhp/eeoseu9tDqjBtuvDLC2j3vvDSfk13j7ehnpUflZqhdAnElHT X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2018 19:35:55.1160 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2ec425f-7498-4f68-f667-08d640fa682d 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0426 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander.Deucher@amd.com, michel@daenzer.net, christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since only for those ASICs gpu reset is enabled by deafult. Also update disable message and fix identation . Signed-off-by: Andrey Grodzovsky Reviewed-by: Alex Deucher --- tests/amdgpu/deadlock_tests.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c index 04600a7..00a17ca 100644 --- a/tests/amdgpu/deadlock_tests.c +++ b/tests/amdgpu/deadlock_tests.c @@ -119,11 +119,13 @@ CU_BOOL suite_deadlock_tests_enable(void) &minor_version, &device_handle)) return CU_FALSE; - if (device_handle->info.family_id == AMDGPU_FAMILY_SI || - device_handle->info.family_id == AMDGPU_FAMILY_CZ || - device_handle->info.family_id == AMDGPU_FAMILY_RV || - device_handle->info.family_id == AMDGPU_FAMILY_KV) { - printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n"); + /* + * Only enable for ASICs supporting GPU reset and for which it's enabled + * by default (currently GFX8/9 dGPUS + */ + if (device_handle->info.family_id != AMDGPU_FAMILY_VI && + device_handle->info.family_id != AMDGPU_FAMILY_AI) { + printf("\n\nGPU reset is not enabled for the ASIC, deadlock suite disabled\n"); enable = CU_FALSE; }