From patchwork Wed Mar 20 02:46:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flora Cui X-Patchwork-Id: 10860739 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 3DD6714DE for ; Wed, 20 Mar 2019 02:47:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AA3B298C0 for ; Wed, 20 Mar 2019 02:47:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BF8C29974; Wed, 20 Mar 2019 02:47:04 +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=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 D7AB5298C0 for ; Wed, 20 Mar 2019 02:47:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 057F689B9F; Wed, 20 Mar 2019 02:47:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760041.outbound.protection.outlook.com [40.107.76.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 05FCE89BB0; Wed, 20 Mar 2019 02:46:59 +0000 (UTC) Received: from MN2PR12MB3312.namprd12.prod.outlook.com (20.179.83.160) by MN2PR12MB2925.namprd12.prod.outlook.com (20.179.81.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.14; Wed, 20 Mar 2019 02:46:57 +0000 Received: from MN2PR12MB3312.namprd12.prod.outlook.com ([fe80::a167:e2df:c3f0:e00c]) by MN2PR12MB3312.namprd12.prod.outlook.com ([fe80::a167:e2df:c3f0:e00c%3]) with mapi id 15.20.1709.015; Wed, 20 Mar 2019 02:46:57 +0000 From: "Cui, Flora" To: "amd-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" Subject: [PATCH libdrm] tests/amdgpu: minor fix for dispatch/draw test Thread-Topic: [PATCH libdrm] tests/amdgpu: minor fix for dispatch/draw test Thread-Index: AQHU3scuuOM71enGYEiRO+GqCYFzpw== Date: Wed, 20 Mar 2019 02:46:56 +0000 Message-ID: <1553050000-7288-1-git-send-email-flora.cui@amd.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [180.167.199.189] x-clientproxiedby: HK0P153CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::23) To MN2PR12MB3312.namprd12.prod.outlook.com (2603:10b6:208:106::32) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c0ec812c-cef9-43cc-df6f-08d6acde5137 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MN2PR12MB2925; x-ms-traffictypediagnostic: MN2PR12MB2925: x-microsoft-antispam-prvs: x-forefront-prvs: 098291215C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(366004)(346002)(396003)(199004)(189003)(2906002)(6436002)(102836004)(4326008)(256004)(316002)(110136005)(476003)(2616005)(81156014)(81166006)(36756003)(6512007)(66066001)(8676002)(386003)(6506007)(450100002)(26005)(72206003)(86362001)(478600001)(68736007)(25786009)(14454004)(3846002)(106356001)(105586002)(6116002)(486006)(5660300002)(97736004)(2501003)(53936002)(305945005)(52116002)(186003)(8936002)(6486002)(7736002)(99286004)(71190400001)(71200400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR12MB2925; H:MN2PR12MB3312.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 1nEsOq11dmPtrzkzzBecPFSRJ81ZbaT77Oiw600TvPXhJtNqs0bMAuA2sZrlS1ZLe0E6ktbdyMtkb7g5xzBGSlnQGPZM6ORJgHFteiMgIOTmYfoUaoMHjVl0IZmI1lkI0y5l3LteO/wAwvhoAwixJzFMSB/XQd2FSqEkhYu3lm74UTB5BjKQOP/dbXFcsSuPw9jze7tjM+6wD8FAbgzUZs0MX/HUoSb4yqMevvjy0KJYT/3s8OrXzwDWDO3ThzDuSe4pyfx7CF5buckfduuuRG0wr8pVbhbkEJqIArUXndwHnAHClje4ISaAgvdnOZeDTv3uYQla3wz3swhg6h788Mgeiq2ON+BQEgeMxLJ6Vae81yq7sNxph2KpYHMPBD4S7lZyDxHWFeCE55GK6PK2d68Q8gaAZpq+Ez5ej/L2Mtc= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0ec812c-cef9-43cc-df6f-08d6acde5137 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Mar 2019 02:46:56.8739 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2925 X-Mailman-Original-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:X-MS-Exchange-SenderADCheck; bh=BoQuSBebcRWoS9ML8eRAVzk8IaZLUCD1hwKFg+V2HLI=; b=qnjAw0xMZikmUoAfKOMXnkWYEUI53NcztlLtvvmTP/r7cbHbcGiJ/5tqFpfS3Dkih/IoRtLMqeME4faMIZa2AAD6jeZKlFA03VLA+aiU547+K4cTwXp7jX6oXhR+iMWl7mqXtdgbkv5QLR5h76TKW4+2JwRdLunEjbR/uxOaJdU= X-Mailman-Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Flora.Cui@amd.com; 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: "Cui, Flora" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 1. clear cmd buffer 2. make amdgpu_memcpy_dispatch_test static 3. tab/space fix Change-Id: Idf55f8881f66458b585092eccb55b6042520e4ad Signed-off-by: Flora Cui Reviewed-by: Alex Deucher --- tests/amdgpu/basic_tests.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c index a364f67..2d47269 100644 --- a/tests/amdgpu/basic_tests.c +++ b/tests/amdgpu/basic_tests.c @@ -2177,6 +2177,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, &bo_cmd, (void **)&ptr_cmd, &mc_address_cmd, &va_cmd); CU_ASSERT_EQUAL(r, 0); + memset(ptr_cmd, 0, bo_cmd_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096, AMDGPU_GEM_DOMAIN_VRAM, 0, @@ -2227,7 +2228,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] = 1; while (i & 7) - ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ + ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ resources[0] = bo_dst; resources[1] = bo_shader; @@ -2283,9 +2284,9 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, CU_ASSERT_EQUAL(r, 0); } -void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, - uint32_t ip_type, - uint32_t ring) +static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, + uint32_t ip_type, + uint32_t ring) { amdgpu_context_handle context_handle; amdgpu_bo_handle bo_src, bo_dst, bo_shader, bo_cmd, resources[4]; @@ -2313,6 +2314,7 @@ void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, &bo_cmd, (void **)&ptr_cmd, &mc_address_cmd, &va_cmd); CU_ASSERT_EQUAL(r, 0); + memset(ptr_cmd, 0, bo_cmd_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096, AMDGPU_GEM_DOMAIN_VRAM, 0, @@ -2371,7 +2373,7 @@ void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] = 1; while (i & 7) - ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ + ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ resources[0] = bo_shader; resources[1] = bo_src; @@ -2799,7 +2801,8 @@ void amdgpu_memset_draw(amdgpu_device_handle device_handle, AMDGPU_GEM_DOMAIN_GTT, 0, &bo_cmd, (void **)&ptr_cmd, &mc_address_cmd, &va_cmd); - CU_ASSERT_EQUAL(r, 0); + CU_ASSERT_EQUAL(r, 0); + memset(ptr_cmd, 0, bo_cmd_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_dst_size, 4096, AMDGPU_GEM_DOMAIN_VRAM, 0, @@ -2828,7 +2831,7 @@ void amdgpu_memset_draw(amdgpu_device_handle device_handle, i += amdgpu_draw_draw(ptr_cmd + i); while (i & 7) - ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ + ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ resources[0] = bo_dst; resources[1] = bo_shader_ps; @@ -2952,6 +2955,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, &bo_cmd, (void **)&ptr_cmd, &mc_address_cmd, &va_cmd); CU_ASSERT_EQUAL(r, 0); + memset(ptr_cmd, 0, bo_cmd_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_size, 4096, AMDGPU_GEM_DOMAIN_VRAM, 0, @@ -2999,7 +3003,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, i += amdgpu_draw_draw(ptr_cmd + i); while (i & 7) - ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ + ptr_cmd[i++] = 0xffff1000; /* type3 nop packet */ resources[0] = bo_dst; resources[1] = bo_src;