From patchwork Thu Aug 23 08:25:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10573539 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 610AB14BD for ; Thu, 23 Aug 2018 08:26:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F9222BA16 for ; Thu, 23 Aug 2018 08:26:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 441F72BA1D; Thu, 23 Aug 2018 08:26:30 +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 E940D2BA16 for ; Thu, 23 Aug 2018 08:26:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BE3A6E4E9; Thu, 23 Aug 2018 08:26:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700053.outbound.protection.outlook.com [40.107.70.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D2546E4E4; Thu, 23 Aug 2018 08:26:25 +0000 (UTC) Received: from BN6PR1201CA0006.namprd12.prod.outlook.com (2603:10b6:405:4c::16) by CY1PR12MB0248.namprd12.prod.outlook.com (2a01:111:e400:50f9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.23; Thu, 23 Aug 2018 08:26:22 +0000 Received: from BY2NAM03FT027.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::202) by BN6PR1201CA0006.outlook.office365.com (2603:10b6:405:4c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.14 via Frontend Transport; Thu, 23 Aug 2018 08:26:22 +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 BY2NAM03FT027.mail.protection.outlook.com (10.152.84.237) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1080.9 via Frontend Transport; Thu, 23 Aug 2018 08:26:22 +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; Thu, 23 Aug 2018 03:26:20 -0500 From: Chunming Zhou To: Subject: [PATCH 2/5] drm: rename null fence to stub fence in syncobj Date: Thu, 23 Aug 2018 16:25:39 +0800 Message-ID: <20180823082542.2998-2-david1.zhou@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180823082542.2998-1-david1.zhou@amd.com> References: <20180823082542.2998-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)(346002)(39860400002)(376002)(136003)(396003)(2980300002)(428003)(199004)(189003)(486006)(72206003)(50226002)(1076002)(53936002)(4326008)(2906002)(68736007)(476003)(126002)(14444005)(86362001)(478600001)(104016004)(26005)(8936002)(97736004)(77096007)(336012)(186003)(50466002)(11346002)(48376002)(7696005)(36756003)(105586002)(47776003)(446003)(53416004)(16586007)(2616005)(2351001)(316002)(8676002)(54906003)(6916009)(426003)(305945005)(81156014)(356003)(76176011)(5660300001)(81166006)(51416003)(106466001)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0248; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT027; 1:M+oqqpUQUAW+qhc39ke9RSOXvCASw+L5pRj6CmCupNd2kKBenNeLNxe+VbCKfh/vm3QtUMXWa1fKV6jiW18euqGx6A68Kfb7+BCrRKEFpsm6F9icvHUjfyQ8fFJrXhYw X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1a13677-14a4-4147-efe2-08d608d21bdc X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060); SRVR:CY1PR12MB0248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0248; 3:cPMidOLHSuXeKL++N2DLp6gQJFqL1GasItVEeHPn1p1GWdJsZ/ApHgQdoXLh/o5O3D6FkSoQI/aCYFTKAHY6NkAlLYvL6Mc9ThaGIMjTOAnDwKVcK6Mjz8XNaFQVcF6fRJDIuQ3kPGJI1nX8vboNiIMoQSyiGS1NsimHkTOo44l4oZKEq5ocGXR4X5ve8hYWkNvoPUbN8KjNQry4I2MO58Esp36j/o+NcNBjtdOHXgZoLH31GxtGDQ4V+lBDGyBG/Iy59xx8t19ug6pbD+bsrlvZuB409CHqHHkiViBT/chjUvmPMs1h3OSjPcR/LgfMReg7oqZWB+dpLKeXO3GsDIiB3BrTl3afNDpcELO/U8Q=; 25:lRxoxe811v85KF2shpgX+SWPn4DDJcKzclt4Cb4JoQfseXibAUkFyNkpyAHfe2sJ1zuSt7dfTK7VnF5Zx6NRPphc+s2hH4w96Gx8hEdQi0sndL6YKbNQl9s8PjYm1GTFL5TQX4ga7XSpjvLqUUeN+90JpmGakM2t9qS4gLvj2iOrKmh3l6QoelA2MSnv/djl4XRFxG+XxDDn31c9zopIGmu+2ivm1X8BQFtNudiVRej60uU/pLPItYEz5cWmbqswMemj92kHqRRBeHP6IbrZeOe6yimoCi7R6WfCTdJfgBhgIWIGLSl5PtP2ie1TuPp/9bvZ3uMCu9nCz3jAC6imAA== X-MS-TrafficTypeDiagnostic: CY1PR12MB0248: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0248; 31:skT1Ow80m7EPltpav/WAI+WDocCK6NcTcep6PP32dp0AET7kQT4bBa+9QHb9WZljHzxGeuaeWyCTqagj1z/gv0SrP88OVcOJSOJnReXKbhRckxOaDYEX66jBWvDy+O3dBoK4H9rG5UZeew4rA+6138YdFdJd3sKjjIHYbShX6woJIam1I3EoQ+m6x1kfMVJ0jh8ElE0iF3L5ulV1+rVmUguPxqQaKl2EJ7hsHq2ApQE=; 20:i9BvjLfMvegiJjko7VC0L74gVF4+EJO7Lct+ov4D9KpZvYaChPJLqE0F+6b4HYJyuM3J7gcpIaz5cyIjI7WB06fVU8MbRWOeh191dBczfmkieeIfKEyvBgmdKWpQS1SJdTQM/Eu6TOBF0BINzr3ww+3yaZuDGeLVwo3klhkWXVkcD8yv0Lp0QfezUoyjgpP/+x4DxlUgXQbqnezV/5KxZvl+7rsxspmF11lovvfmhJ+5Qv9wit3XuPVpQpul2jApc+4nOw4Yd7bdfCuWD4k87OPKgzPCxDp1+dykn9SXD+rfaYa96nOFy/ktC4WIulTdkINtl7coZu1Ib75ijeivksesQr8lYPMwbnpbBITNbgnAhIzSlJThlvQarFLa+dakD0NwoGJC+7cQFVuS4c9XVrsUvpwQwSE7ZCSKeXSILUJM2WhBVfCN90TWuGw18xK+/OunfZ9qTZRDTKAyr0+sFeZ7X5Js3sSyYWiUC8et/1gZ2hsYHEA8W6pMCKGLilwk 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)(93006095)(93003095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:CY1PR12MB0248; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0248; 4:LyNIwVaFegXW2cpYaK2Z7+d3K48OHqfY+5uSszhru3ExA69bSuVWSYA4/kkqRx4Nr9gOZO+I4bKmX93Wv73ldAY7L+dENyTECF+15dRIXi80/5SUUMiG5vQ1e5mjgTTuaiA54bIbHT6JwbJsrBXOHe0YhB6qU7h0SGXG35BWTzfQqiRpBteYxdLwiMb9QJL260Nby3iQ8W8XDUxCXaJ1WWAbFFMVfQ/wK84OLiOLhlgTAc86wtHzTBlgR56epvMwMiebpikkAUgDojtdSuDGtqAYxOkduabNsZOiZNA0E/mEEk2dLc+YH6Bampe5ZAwo X-Forefront-PRVS: 0773BB46AC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0248; 23:spm0ObnP2b+w0v4JCTaL590s+z5ctnFr0/ilbnR5y?= d6QWPqUpqtCH+kDDsUZGgf5JxjW9joCkgbiUQWmwXyZvvG7Q+kjVNZdTaq8zJaD4QvqmaY4l1h2UG2DU+3R6E/+yY73yGBBWNRgpEl+Y1GD0ZX0BHyzBeTj7nL95NabaU28hJxZgFh0ZMSFYoES4546Wh1I2Hawwem2++sHKcrZ6XE7ccQTZJwBgSO1VeQuGCBLhQHNrlUhEHy0AziLIqNa6IG/ARBrtRwiEKcI2FolOfXw5xSfMm6sSAnO9E329r2V+78JXa2FkTcjnyMvkSwWz15oXj3bZ5lPyZ6R17spDvCkfnNsSZjj4KBabhvOskkdwcJTlmNESqG6YaGzjWOjBQBmTv1tBs56FHBXxPpfU7aRl5C2FkrhjE9UAsguExwhY9Wv1oVYV1qSij3l6Y5KvUBwglIIl/n4pfw8WaihX9V01x2+K6V9E37QTJwqpimhkqdNK9A9QA9rE/AZnN9HGZDfhqBxRhT+XKFOv3WiZ9IxzyQYg5FCrfcqQXE+9unHNEqUCgMJzcy/IL6v6zUWnGX7Zxq9oa+KMvlet3Q92AghGzIysK57nhX1oZ9Wtkhc0tVH/Ps7s5UHUi6rIV1Q9Mp1jjMcMEwQSmUDDrJp2VUd9FngFJ8ph29xI2C6zOEZhmooYF7UKfB06c0K4rcnT1bqLsjF8oyrf2kQG3bAnIz4yMTIu+dAHozbL4/93FPDQUptv0IugE57YedoxjK7+jceD1qOmG9r0qQ2qWpjAfJD+qvMLIBwix9Zmvoq8/JnNF8Ts/cjiH3xLBcgkBAQww1mHXJuFIDvyyVIRbs7ldt5N5a/rA3JcKDqE9q0dgX4BgqNBfLWUcvVSraFDd4L0OR69MFLSPhrDTlT/u/n8QeklcUgkNdchvcJdJx1+LNifr1FLkGVlKCJRT8bfehS6DuzXlTl+op+Psz0jqKJr6DRl/WoVbsUvXkBgLi5n9pKsSD8DZ+PYOBzGPWOtMQNO35lUhmfW2jsf8/MOJpE/cI7PeKWTG9QjxfbXOQ8f3aePOBHwN0dgxiDpNv7bqPYSpSeAjAQFas5dXk8K6PYwuxLvOqV/10GDlSaIla28df50+CGMJ9T77jqwqCgJrDtjXqqz8UP4pG+dQiDL8L2AgBuClx5UbBkuXbhkGVlTGCPj2IBuzujjre0CYmUw72I X-Microsoft-Antispam-Message-Info: cGRgFa9MvUBu+XhrgbFHGrYUqp9ypQvyMwsKdvP+UDRAu+3UAz0/8wh9TQRC9QQGKHqbaAUSd/6/KFSR1bwtJd5Yb+E2rODe99FY8uW4G2Tyk7FMTh7fQbmdWfgcmWp9IypWD+H+yaBpESjpHBf+9Fk5eoqZ/rC2DuvZFtXNbmvviVcm+3EjgCG1YErbEd5CY4EEkG147BeUbhuLFIY2IgYDzp2baE+rXBMsRWfifPenNztgXBXWgfG4wpHDOb/aFtPiBDbQRasnFO1w/2MliBBzGCj5D26fhVx+cOWbdsarYTjNAfg+oEb8e4iguFf6BKAntuJJ+gIQ3xY1MPIOX7qdrzjZJaEQwvdeq1DP2Bs= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0248; 6:N6MBRlNkWOm2RbtoM9zSuE0uO+uJ1Txf93KArEhjwLV9u87maLfnL/GRs3BMhZsXs0pJymxyO/IzMv6iBr0edFQte3b4PG8xdUJBkrOS4uIzTfEE77MS8BrIuvcI9jhcoOOtcnxNK2PVU8V0uQfYaQoI87ySK+A/xKJLyiBxmnoa2nmjuTpEzuyGs76sKQXYQrjXKaNQSQSB/5nEI3ZSkEBZ7f+xAPfc9mGQ2FbIQJzSuSp5nH03HRnEkNX6hxU/TY+li4BgA7qMkgamAY2Ue1w4H+Px565oat5WQD8Fmm4cwsZiH3AAAI7vWS3h9zs5Gab5V/BBqxEY0+MyWLCIlqMGChQ3tTpTNxPRZdYstgoZBa7L8fenmU00ptRyCK0JeraI9xpTgYzY1VpPbjNfVlUHEbKtF/6XTgpoemNzR57IcZlOCvw9AjOv0LVuPpzB6AY0Y5Pmal4UeMJUwwdmpQ==; 5:qHK3s9hXyXFHlFK2np+mx5zPBZkc+It+kD94SmzGsL3NpdpkiWry1sv7De9u6nM5OVGJieMUVfGbJhDpSlNWv3FiSCNJxnb6/zCVabMVshz1uxQffFTnoFZIO1PrJVe+m/T69KSIx/ooFrf9ZmyOB7LqJH5HxLbuTSkt64UP8bI=; 7:GkV8eEAgGAdSRRysuU+hJdv+rqrSsGdlC5vsoiZUwMv66tbLUbUSB1GzLh21goKMwNfAdRJfflF42lTJw98aV7HEOVUir7C1ZKCOK0Axyu54878PB1CVpElHDRvyPPbHau7HY5WHITjQ/JNWZhVQEbudpgbiQqj+8VY5GAgrFg1YUcQikcJgEebvKOxtbNwdeuJBVejwyFB6gdmek3+mVs/Qv/Lu1rKwFvJhWZ7lwyOBwN1HlCZLgngFrgqLt/2z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0248; 20:lh1/LrXX6tGqSPtvzke4PObuO5h3tQ8rP7xCAF14sqG7A1eW9fVEr1q+hm9vpmwMo+/+IMOrZ54SuscF9fozlPw6eErRw6S21ZWrQPw7AHXkqyhzrGmPl/IxWqK/W1u0PyJCJwLZB2t41HCXY3l4CHBVb79YhtHgii5YOmZkipCqjEuXvKp9PliGfpup/cFb1USs0aCVTUrmIuN2aXjSEt35Ow939tUJJWX4zDeN+IoyjP1h9XtXpRUQoQvN0FC7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2018 08:26:22.0309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1a13677-14a4-4147-efe2-08d608d21bdc 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: CY1PR12MB0248 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: Jason Ekstrand , amd-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP stub fence will be used by timeline syncobj as well. Signed-off-by: Chunming Zhou Cc: Jason Ekstrand --- drivers/gpu/drm/drm_syncobj.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index d17ed75ac7e2..d4b48fb410a1 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -172,37 +172,37 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, } EXPORT_SYMBOL(drm_syncobj_replace_fence); -struct drm_syncobj_null_fence { +struct drm_syncobj_stub_fence { struct dma_fence base; spinlock_t lock; }; -static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence) +static const char *drm_syncobj_stub_fence_get_name(struct dma_fence *fence) { - return "syncobjnull"; + return "syncobjstub"; } -static bool drm_syncobj_null_fence_enable_signaling(struct dma_fence *fence) +static bool drm_syncobj_stub_fence_enable_signaling(struct dma_fence *fence) { return !dma_fence_is_signaled(fence); } -static const struct dma_fence_ops drm_syncobj_null_fence_ops = { - .get_driver_name = drm_syncobj_null_fence_get_name, - .get_timeline_name = drm_syncobj_null_fence_get_name, - .enable_signaling = drm_syncobj_null_fence_enable_signaling, +static const struct dma_fence_ops drm_syncobj_stub_fence_ops = { + .get_driver_name = drm_syncobj_stub_fence_get_name, + .get_timeline_name = drm_syncobj_stub_fence_get_name, + .enable_signaling = drm_syncobj_stub_fence_enable_signaling, .release = NULL, }; static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) { - struct drm_syncobj_null_fence *fence; + struct drm_syncobj_stub_fence *fence; fence = kzalloc(sizeof(*fence), GFP_KERNEL); if (fence == NULL) return -ENOMEM; spin_lock_init(&fence->lock); - dma_fence_init(&fence->base, &drm_syncobj_null_fence_ops, + dma_fence_init(&fence->base, &drm_syncobj_stub_fence_ops, &fence->lock, 0, 0); dma_fence_signal(&fence->base);