From patchwork Wed May 22 09:07:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10955347 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 204606C5 for ; Wed, 22 May 2019 09:08:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 093911FF62 for ; Wed, 22 May 2019 09:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECDB928A64; Wed, 22 May 2019 09:08:15 +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 830E11FF62 for ; Wed, 22 May 2019 09:08:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1A8C890A8; Wed, 22 May 2019 09:08:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750055.outbound.protection.outlook.com [40.107.75.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35603890A8 for ; Wed, 22 May 2019 09:08:11 +0000 (UTC) Received: from DM6PR12CA0027.namprd12.prod.outlook.com (2603:10b6:5:1c0::40) by CY4PR1201MB0055.namprd12.prod.outlook.com (2603:10b6:910:1b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1900.17; Wed, 22 May 2019 09:08:09 +0000 Received: from CO1NAM03FT047.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::203) by DM6PR12CA0027.outlook.office365.com (2603:10b6:5:1c0::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.16 via Frontend Transport; Wed, 22 May 2019 09:08:09 +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 CO1NAM03FT047.mail.protection.outlook.com (10.152.81.48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1900.16 via Frontend Transport; Wed, 22 May 2019 09:08:07 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Wed, 22 May 2019 04:08:05 -0500 From: Chunming Zhou To: , , Subject: [PATCH 1/2] update drm.h Date: Wed, 22 May 2019 17:07:59 +0800 Message-ID: <20190522090800.15908-1-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 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)(39860400002)(136003)(396003)(376002)(346002)(2980300002)(428003)(189003)(199004)(126002)(1076003)(478600001)(23676004)(110136005)(7696005)(5660300002)(4326008)(2906002)(36756003)(6666004)(356004)(68736007)(4744005)(81166006)(72206003)(50466002)(2201001)(86362001)(2870700001)(2616005)(26005)(186003)(47776003)(8936002)(476003)(316002)(8676002)(305945005)(5820100001)(336012)(426003)(70586007)(70206006)(53936002)(486006)(81156014)(53416004)(50226002)(77096007); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR1201MB0055; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca6a0c37-b1e6-488c-d0fb-08d6de9501cd X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328); SRVR:CY4PR1201MB0055; X-MS-TrafficTypeDiagnostic: CY4PR1201MB0055: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:81; X-Forefront-PRVS: 0045236D47 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 7KVXeTWsVGAAArZyGL+v0U++5ADMAMfKIFpcvAjHc/oVJgHJvIZYbh7uMln2VBJshBSDfEDDMkShgO3kpwwdK3W5Mbvzd/Ja696QmWOtoWllY5yCgSKdcAiyITmQKKcZs2/qeQra9lUTGVxI/QY78unzpd9tRreJTGfNxRQD5cOQKbAfkzG5IfYY9RXxytTor1YwrUZWO+QSevHyGhBdN1jc3uT4hdtWQL4GTUZ3V+M91IaqfbzqQgty6O5f1TNsS+G6x7REN5JkzLZNHI1cNtEwbiJ3+bQAL4i++qI1NdvYzcPtbWVhmCJXIRgV6Q8gXMXpU3krOVla4cWMFZLBEGDGyXH6MIdxusETEH58ee6v0b+CRqIhSvskG0iTe5mfAxV6r4JVZ7fSHtKJFC3V4SMcRt8r296O88TC9OOBoNY= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2019 09:08:07.9301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca6a0c37-b1e6-488c-d0fb-08d6de9501cd 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: CY4PR1201MB0055 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bH0vC5jskikFbEDN/Eb7Jq3exmZmRcyCZ/S7/2yrthA=; b=Cn7rqnNeZyFzN+TLtfEy3J/zmJ1DERSmCsJimYM5kOLUR0GhqJ9LL8+kXkmc0+KXnVvtkXDSACNlN4gV9Fuj8Ky9fXGnk/3dqLJO0m+r4eL5aw95jl5OXJiTkpPpFkmVDeluNkNf2S+IF2LJxuYEG2NDeJA7GH5RkglW3mzsRpA= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; daenzer.net; dkim=none (message not signed) header.d=none;daenzer.net; dmarc=permerror action=none header.from=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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP a) delta: only DRM_CAP_SYNCOBJ_TIMELINE b) Generated using make headers_install. c) Generated from origin/drm-misc-next commit 982c0500fd1a8012c31d3c9dd8de285129904656" Signed-off-by: Chunming Zhou Suggested-by: Michel Dänzer Reviewed-by: Christian König --- include/drm/drm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/drm/drm.h b/include/drm/drm.h index c893f3b4..438abde3 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -44,6 +44,7 @@ typedef unsigned int drm_handle_t; #else /* One of the BSDs */ +#include #include #include typedef int8_t __s8; @@ -643,6 +644,7 @@ struct drm_gem_open { #define DRM_CAP_PAGE_FLIP_TARGET 0x11 #define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12 #define DRM_CAP_SYNCOBJ 0x13 +#define DRM_CAP_SYNCOBJ_TIMELINE 0x14 /** DRM_IOCTL_GET_CAP ioctl argument type */ struct drm_get_cap { From patchwork Wed May 22 09:08:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10955349 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 681546C5 for ; Wed, 22 May 2019 09:08:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A1C61FF62 for ; Wed, 22 May 2019 09:08:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E03828A64; Wed, 22 May 2019 09:08:17 +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 0E2CB1FF62 for ; Wed, 22 May 2019 09:08:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 70C2589146; Wed, 22 May 2019 09:08:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-eopbgr810077.outbound.protection.outlook.com [40.107.81.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F8A8890A8 for ; Wed, 22 May 2019 09:08:12 +0000 (UTC) Received: from DM6PR12CA0027.namprd12.prod.outlook.com (2603:10b6:5:1c0::40) by DM5PR12MB1276.namprd12.prod.outlook.com (2603:10b6:3:79::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1900.17; Wed, 22 May 2019 09:08:10 +0000 Received: from CO1NAM03FT047.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::203) by DM6PR12CA0027.outlook.office365.com (2603:10b6:5:1c0::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.16 via Frontend Transport; Wed, 22 May 2019 09:08:10 +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 CO1NAM03FT047.mail.protection.outlook.com (10.152.81.48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1900.16 via Frontend Transport; Wed, 22 May 2019 09:08:09 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Wed, 22 May 2019 04:08:07 -0500 From: Chunming Zhou To: , , Subject: [PATCH 2/2] enable syncobj test depending on capability Date: Wed, 22 May 2019 17:08:00 +0800 Message-ID: <20190522090800.15908-2-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190522090800.15908-1-david1.zhou@amd.com> References: <20190522090800.15908-1-david1.zhou@amd.com> 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)(39860400002)(136003)(396003)(346002)(376002)(2980300002)(428003)(189003)(199004)(11346002)(77096007)(53416004)(476003)(126002)(2906002)(2616005)(4326008)(36756003)(2870700001)(76176011)(7696005)(316002)(356004)(6666004)(23676004)(1076003)(70586007)(4744005)(186003)(336012)(50466002)(5660300002)(426003)(446003)(26005)(53936002)(486006)(8936002)(50226002)(5820100001)(86362001)(47776003)(68736007)(110136005)(72206003)(478600001)(8676002)(70206006)(305945005)(2201001)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1276; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3549d0ac-6ea6-4510-b500-08d6de9502de X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328); SRVR:DM5PR12MB1276; X-MS-TrafficTypeDiagnostic: DM5PR12MB1276: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:346; X-Forefront-PRVS: 0045236D47 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: sBD3LcNoWa0/CtF7cOv++FBlLFykz3b21QiNFz+E6Vo3cz0UTttOCT4U8OZhSJTNQQbBv7pfjxxih7z7UUZErDGKeP+/N8nqn1xDsgzM3NhLVDW8rNmN4SAm6vhXn0tQ8YNIMrzID3LyOVUawTucnwQiIUaSYL7zOAGcsoqHxgC0/0Tg6tsWGkShlvHHSjae9SyVtAU2pBlplNQS/lXFMl5Qy/W7V42yz9ac2WBGYvi/6ikblbdIpDEoQb//1Ku6MRTxV6yEwvKsh76fDxWGwN1zqRSs1/jeyJ9I5qKmT8PINYkfuDeYbE9NkTyKxCZLbYivwa47kY1xJxy+RTqtTus6zQadVQ3QoxDdYQ2+jrXPb6mgvNyNBmY56BM7EbRQ8F3W/PB1RJ1nEhau2ew9EMcwv/1UBE9ergDv5hyG1to= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2019 09:08:09.7235 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3549d0ac-6ea6-4510-b500-08d6de9502de 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: DM5PR12MB1276 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=enVtJuw7/SsH/1L6CivwTWBoAtt7D50e+y8/FT5H/sc=; b=IFo3XPVla+UqiLTNJ9xhWvGMTMLj6JpCPvkYq/rn9N4uUWzdIaePtxE6LgXklBeIEfnq3ZZw2Wmxb1Lg3ZK8ZUuKCntn1KLFRmT9XFCN2T4MhPtHOmCCNmZQ3Ui1kY9XlNbFK6WDx+3wz1NIbNLdYGhP6YpBULFobfF7LK223Bs= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; daenzer.net; dkim=none (message not signed) header.d=none;daenzer.net; dmarc=permerror action=none header.from=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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Feature is controlled by DRM_CAP_SYNCOBJ_TIMELINE drm capability. Signed-off-by: Chunming Zhou Reviewed-by: Christian König --- tests/amdgpu/syncobj_tests.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/amdgpu/syncobj_tests.c b/tests/amdgpu/syncobj_tests.c index a0c627d7..869ed88e 100644 --- a/tests/amdgpu/syncobj_tests.c +++ b/tests/amdgpu/syncobj_tests.c @@ -22,6 +22,7 @@ */ #include "CUnit/Basic.h" +#include "xf86drm.h" #include "amdgpu_test.h" #include "amdgpu_drm.h" @@ -36,6 +37,13 @@ static void amdgpu_syncobj_timeline_test(void); CU_BOOL suite_syncobj_timeline_tests_enable(void) { + int r; + uint64_t cap = 0; + + r = drmGetCap(drm_amdgpu[0], DRM_CAP_SYNCOBJ_TIMELINE, &cap); + if (r || cap == 0) + return CU_FALSE; + return CU_TRUE; }