From patchwork Wed Sep 19 09:04:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10605527 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 43C45112B for ; Wed, 19 Sep 2018 09:04:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 320B32A806 for ; Wed, 19 Sep 2018 09:04:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25E8B2AF59; Wed, 19 Sep 2018 09:04:29 +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 BF1FE2A806 for ; Wed, 19 Sep 2018 09:04:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DAA806E4C7; Wed, 19 Sep 2018 09:04:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0040.outbound.protection.outlook.com [104.47.33.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3939E6E4BF; Wed, 19 Sep 2018 09:04:24 +0000 (UTC) Received: from MWHPR12CA0041.namprd12.prod.outlook.com (2603:10b6:301:2::27) by DM3PR12MB0746.namprd12.prod.outlook.com (2a01:111:e400:5984::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Wed, 19 Sep 2018 09:04:22 +0000 Received: from CO1NAM03FT006.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::205) by MWHPR12CA0041.outlook.office365.com (2603:10b6:301:2::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1143.15 via Frontend Transport; Wed, 19 Sep 2018 09:04:22 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT006.mail.protection.outlook.com (10.152.80.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.1164.13 via Frontend Transport; Wed, 19 Sep 2018 09:04:22 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Wed, 19 Sep 2018 04:04:19 -0500 From: Chunming Zhou To: Subject: [PATCH 1/6] drm: add flags to drm_syncobj_find_fence Date: Wed, 19 Sep 2018 17:04:02 +0800 Message-ID: <20180919090407.24111-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)(136003)(39860400002)(346002)(376002)(396003)(2980300002)(428003)(199004)(189003)(105586002)(16586007)(6666003)(2616005)(476003)(72206003)(426003)(126002)(86362001)(48376002)(336012)(97736004)(53416004)(6916009)(7696005)(51416003)(478600001)(81156014)(36756003)(50226002)(81166006)(8936002)(47776003)(450100002)(8676002)(486006)(4326008)(77096007)(50466002)(305945005)(316002)(1076002)(68736007)(186003)(356003)(104016004)(26005)(106466001)(54906003)(53936002)(2351001)(2906002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0746; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT006; 1:HOUgaS9dSaqLp1F8wcFZ6kkHyyA0pF78zS5wSLR8XSr6U8QLHPrB8OXIwpuFzON3ZhrDicI1feBxJWvkKtMtWLO4JhNxyTnMNtrfLSayRCO+HxuD7OEkbIdA6vR0Qqwy X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a124c5b-0928-463b-1abe-08d61e0ee3f4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:DM3PR12MB0746; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0746; 3:rdNKJRGS1y56arlPH6VlqORCG/DW/QvNiHfKSrhx1mRbaAn+rIZe7SN9nLlzbyPopxCtjGt5bR/IDfbfygNLsLeBUU6YfK0kZPKCBYFZceubGGcNTqKbCMhRwcokFcJCQHX6Zo19Pg9P7weYhQw6Bn04QImmHsDRdCIq5HC0SPyibMoh5Nx8Hpqog0y5MriQliU0k829a6yj2ae5tWdrKL15nh9CS82nw1PA8jKzu1mDzUyqCRAWk3SnsayMG55bT/M6oD4vxNfI8hFV2UK+bmWf5+zRa+jvVONNtBHXvoEc+RxheWwL1OusgDxTSIbBlS0KqnQWW1bszsFGGtTelvbEe4IA7lGxwPyOqWYwSqw=; 25:TgNhTrPPq+lLXXLJpi2tacngsbddUj+WMasdFFiMYVvtm/q4LSNaYdZZeedwvpEOY9nnyJrd8f3C55PC8DSJ1WJNPPawHMBJelMu616bWAUrupkJK4I+XpHf6nAQhV38gzZ8/niNkXqBhDQCYl+u8+PLpySfVt4Ujn6DBRRQ+LsY1YpAlhxK8KNwpSYkgNgcFm+bM0gYsy1CtxeCS+Rc5ovrhXsTYV0ug4p2Ve6YP7eFJ8PcOpn5mqB36iM0TFO4FyeizbN2dyNjFT+KPGubTvCsuRdVRP674s9WerV739SDAa+LzZLnS+lxIvMNYsWu9sp4F72cym3u/atJErfKVQ== X-MS-TrafficTypeDiagnostic: DM3PR12MB0746: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0746; 31:O1JnyQODZ2N8eDfaqwv9Y0QXVmI+WsgV/9Nek4QRFuGnXuF8g+ovBdUT6MMUqbIki+Tw1s3r4uBfFzQRzi9veVMgpLlOAYkuijEO4fjtmmjOo9N3u/JZ0iqzygRI25xVy8wXpEg0U3IjaHCSHA12GyCsbr7QN2/5p/YkgME5HW+qJBY4r4iKINfla5SxqT8R7l2dc5mhNfRq6K9qsTBudijGDIRLrSI5IYHFfYLKzM4=; 20:wF4mlHjYdh96EIWz4rukFcTqPaeCdp6UGBZt7IwTmY2bhaANuAtCbsxtk59wXROVDa0mMd6El6stBlwRhFVIy2xDk/A608CqZFGFDUETRFdnctBCPRn1LbxMTjWv1ZhzSxdBblV0Ka6tOzNit3FtHibWaFv9XxeBF6iNitui38nBH8DhrZBeoliEZ4ZSq4gUZ9af6gFCTrECTMsZb6HfEnBLlav9qtb+pkz6yDZwYbWx1MPauQZZL7XrfcTViPeGzUCuOIw7Z6qTKmQy9U2flwsD8kqmPjCM47kQrTPaWXWnDyKz6gCBwWDBrMRkN+S773mRCBzL4XWPvrhm80mH1ZG22/HGG7id9Kh5ujJcwJKc54Mj0dIPadaVp36nKi5IwvFM1e1A1YGmjRQvxGPSPDK+6LyrXp6/0KBtQL8xqDMMnE55inmq2QXh0V2E5Kzfws5uZjQjX5iIsHNfcorUrj8eEj0xWaS8TLfbBZQ+/NuWS8MERLTkao5RGmNgmaVV 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)(8121501046)(5005006)(3231355)(944501410)(52105095)(93006095)(93003095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050); SRVR:DM3PR12MB0746; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0746; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0746; 4:qxELFYd0cgMWdRk6KmIkZ/tDP0lWFh1oG//bku4/vjGiVjwPTl8PDDEhT4fJVdf7V1Sk997QENgNXIdnVmMXE3sJOfyIhXQTRPMPjiHqFwooETymbSNjP7BujUuV96dl54Gj+0l6AtJF5489F1MfufKzB8ch0osm1p2W9/1C9d4awgC6IDmCoEW1ZoFq8YtRs3+CHkkk43oF0YPlvUEK4zWn0swdCN84cW4+neB2KebZcuW0DNmZKj3QGyAVRGxhX1UWu74LZSr8wpsoj4gy1GdXQmU6f5hNMg8YN/BDQZaHodKtwp31wGE9D0KFcHda X-Forefront-PRVS: 0800C0C167 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR12MB0746; 23:HX9+RQkmUwj+41xh0L4v5jzC/t9qdFc88rWjY3MU6?= keMEJ3kWHr9fJizKlJmrYf/kq8E8EwAVWBKKheAyW9Dzqa5hyCEFq/MYliX4fpsAG2WPa/fsL2C2Wxqy8IUCw3iVim8D/FRpAe4WRnBfdECZaEclfWHFCdmjLaXRNYKP2u1KFY47Ihr2moUbOrPjqaPiCLDCy0NwlMlbSGXXMYvBu/XPqfiaVpsyXF7aQafwr15RSaWkBMqT3wGitiQmaFUb30nWsqiByfygmAtBJISicSOeAkm5/TPd4Ufa5pinLs39HRm+tfGWIaIcm010Buaimy67lule7/3srbZX5vrRv58j2D054Yk2bX67k5wUEPIOHLBQOUiYO5tzrtntKmQQcC/MCAUXpzdtkLsspaqtJWegVicAtNd/wWmZkg0FU3sCfe7TR+vjRt0+51KmoeBHFCggcohFIXKJ7DhPuZWxq/3zm8JfDFd2X5PQ3R+zM3k9Y38SmjC4vZSwl9Qd8yFvdHECcCngBtyuMG6Cm609DDZZ9kDQkaU4vo4GGuEoD+Y5rGXQwx4yIaeLWk5gJ3q8y9LxUBF+abclJSWtePooYolCA3PllLmAa5cZj8jb94PuL3lplaRLBG4Q6TIEvWif9bYPhpJdBt2MJFtFekKKYQvRQh5G+YBOr6okloNQZvTdOMRE+Ac/ei4KPBOCzpU8vbB6hd0R8cPvn9xlPmjeCpRjundsQ9tTNWcONFyHigFqG2XO9AvLb78U0ihysUspmOxGbD39c2Fbe01o4TNeyrAopwK0MP2rJAv/hH4FOWV83zOZV4VmeZ7rDkjxDkZ8i2pnKrmIlxtqISyxR4mZsW27bCWOEakKXbfeUCRC7yM1qDchfDIkySyw1jKn0TAEv6db4PhFLGhK6pQroKwkzrJzZRRIkpURMj9eOWoq+cSp98ZyrbnNngCothAZ5ty0mMriHOdGpXn4u3xPmEAwmNoOofj8eJ6psFc/P0Wc7k7UqRBzSZQbp4Y92Cc2+P9bUIXVUcFZZbm5ncNxoVlg6obE6TK9SH9326f1pBYEKMtUAETOsKV0V9GtKak17yzeqQidxJWG8AI08b90CR2ib7cyxogomIiVqhKoqRhMEDBh2VV0FZrxKKBjcLKeMzZAkiwFvVj2wyiDar05wEWeQ== X-Microsoft-Antispam-Message-Info: S+Qe/4nA3iZfIH8j7Cf2xiJaBxvoERI2Oo3A4x5uR6NHGWWKeY9a+M/jDsV0YklKtROgFy3mCdtsU0SijhlwkJmudmYyrLh6prDPazb7D/MlDtD84iLk/lyYTXU2pjdBtohmj7dJlhCBCbUesW3wvG3GEpmeb2h5VmQ3ryRbOC4e5LFW9gy1UKRLn/XZ7wP+EloleUOVEFuwdfAk+mEe9aEBIE3U85NkBOV2FGhQiVw1h/sr63Y6aep9hA0oZ+NP+eIhTfk/UcBugUjyZAMak7PGvmp+uN7CxIPee2VlBus9cvxJzlEt4yJzlqip9uDdq1dthGOPqLqfDZVTMulnxwxCkSy3ket1YvHGLVyZ0Fc= X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0746; 6:BpupsiyyYMl7uc4GVv/NcfXKJpKeb6FH/W1bOYZCDXg9W7ubS+QuyzHoK2MRC/e8rAE98xyAQtJ/oGS+3fEVCtirGNu5rTKNpTKmGsi7DwvBpmsH0sifwfNLhVMP05VlHNGlUA20MlixnObC1RGaYic5hzvESEH7JB/zhjRAfqzXUQfo6faxVSKKa8urcLyV0dUbBH4/UwaoqiVZaGXwblk8F+ZdZs8ORFtgTukRcDiKAC6C9jAdRDbrefBuOdOrvmZIc+zqojrcb8AK3Ys3GAO85BFDVsyq8pPsiKrNeaspVVt+o8YJIOSe7hzt5tJ2q2mJa41dMJTNgnR2BvjzdBhtQQqKRPnHjyC6ggAnSL1wp53gWbR3LpDJZftHjiTdZsconOKnvRHceqKcWVIqLHOs4odmt/rsFHjO9NEFYrOw+wjVFxEenyY2f0xOq89EU4DjCMt+6/I/xG5hx7LhwA==; 5:FI3IiViUCLm0/crIo01pJ4QLoDyPm3wM/++045cpkpbob3BTMipb0uXwoOm3FJjmxu2vL1bWlVNX4ABtjNhBo+FN1cfLZZA+69+euiNB1XzUu11nTbxrClMIljq5fpjyoWVbIYL+/bKLetz8/SFkDBgODMTYL2UPkiqczKpCxyI=; 7:daD9aHvJv8PXP2KfdHW1d3HVL2XgT5s+4Wl4K21syilc/fUA6OOmhgWUqeVG9IWYHVP1b6ZBcOISTg239CaGIac1NEpt7NIiSpG1+0PhAFe0wMO+0ZAcKxE80S9rc4lfB5zhzS4CqKIfzivv2Ceb1aSP76hV2BT2OnuhoA0cWDHKS4EmOcCJdr9qxgj8HDQVBdZlf2BSFvo3YWwa4y/hZCq0JWknmUv9xwaQmJgYv8kanouvDYOysderzMOQOJk4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0746; 20:Ce709ovIEIzoYJV1qubSxZs4ynF6BlcAzQGPs84gAm48ybl/kAQ+YKKce1QticHYe4rp6Lw/ipBGtIOr8SXxrPTftCgIW4nSTPpwwPCmwPD79F4PieomSHV5S73wIhKlquvWTGEN+TqDP+f1X/RxmncMVzAO/f/ADtuwagYpt9e3CuNjxfLesFEn0VMIzkpP/WAGtpoP79AzVl+0VZ1BG8N5gJw59tckFOeKjaNLwiCAIpuqucj3znOFMrB/J7EO X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2018 09:04:22.0117 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a124c5b-0928-463b-1abe-08d61e0ee3f4 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: DM3PR12MB0746 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: amd-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP flags can be used by driver to decide whether need to block wait submission. Signed-off-by: Chunming Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/drm_syncobj.c | 4 ++-- drivers/gpu/drm/v3d/v3d_gem.c | 4 ++-- drivers/gpu/drm/vc4/vc4_gem.c | 2 +- include/drm/drm_syncobj.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index d9d2ede96490..412fac238575 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1102,7 +1102,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, { int r; struct dma_fence *fence; - r = drm_syncobj_find_fence(p->filp, handle, 0, &fence); + r = drm_syncobj_find_fence(p->filp, handle, 0, 0, &fence); if (r) return r; diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index e9ce623d049e..f796c9fc3858 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -235,7 +235,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) * dma_fence_put(). */ int drm_syncobj_find_fence(struct drm_file *file_private, - u32 handle, u64 point, + u32 handle, u64 point, u64 flags, struct dma_fence **fence) { struct drm_syncobj *syncobj = drm_syncobj_find(file_private, handle); @@ -506,7 +506,7 @@ static int drm_syncobj_export_sync_file(struct drm_file *file_private, if (fd < 0) return fd; - ret = drm_syncobj_find_fence(file_private, handle, 0, &fence); + ret = drm_syncobj_find_fence(file_private, handle, 0, 0, &fence); if (ret) goto err_put_fd; diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 70c54774400b..97477879d3d4 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -521,12 +521,12 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, kref_init(&exec->refcount); ret = drm_syncobj_find_fence(file_priv, args->in_sync_bcl, - 0, &exec->bin.in_fence); + 0, 0, &exec->bin.in_fence); if (ret == -EINVAL) goto fail; ret = drm_syncobj_find_fence(file_priv, args->in_sync_rcl, - 0, &exec->render.in_fence); + 0, 0, &exec->render.in_fence); if (ret == -EINVAL) goto fail; diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index 5b22e996af6c..251198194c38 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data, if (args->in_sync) { ret = drm_syncobj_find_fence(file_priv, args->in_sync, - 0, &in_fence); + 0, 0, &in_fence); if (ret) goto fail; diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 425432b85a87..2eda44def639 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -134,7 +134,7 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, u64 point, struct dma_fence *fence); int drm_syncobj_find_fence(struct drm_file *file_private, - u32 handle, u64 point, + u32 handle, u64 point, u64 flags, struct dma_fence **fence); void drm_syncobj_free(struct kref *kref); int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,