From patchwork Thu Aug 30 06:48:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10581235 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 3D23413AC for ; Thu, 30 Aug 2018 06:52:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DA7A2B7C4 for ; Thu, 30 Aug 2018 06:52:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 205962B7CD; Thu, 30 Aug 2018 06:52:10 +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 AAB972B7C4 for ; Thu, 30 Aug 2018 06:52:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7677E6E6B0; Thu, 30 Aug 2018 06:52:08 +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-bn3nam01on0066.outbound.protection.outlook.com [104.47.33.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A4BE6E6AC; Thu, 30 Aug 2018 06:52:02 +0000 (UTC) Received: from DM3PR12CA0079.namprd12.prod.outlook.com (2603:10b6:0:57::23) by DM3PR12MB0747.namprd12.prod.outlook.com (2a01:111:e400:5984::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 06:48:52 +0000 Received: from DM3NAM03FT006.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::203) by DM3PR12CA0079.outlook.office365.com (2603:10b6:0:57::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.14 via Frontend Transport; Thu, 30 Aug 2018 06:48:52 +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 DM3NAM03FT006.mail.protection.outlook.com (10.152.82.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1101.10 via Frontend Transport; Thu, 30 Aug 2018 06:48:51 +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, 30 Aug 2018 01:48:50 -0500 From: Chunming Zhou To: Subject: [PATCH 2/5] drm: rename null fence to stub fence in syncobj v2 Date: Thu, 30 Aug 2018 14:48:28 +0800 Message-ID: <20180830064831.5868-2-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180830064831.5868-1-david1.zhou@amd.com> References: <20180830064831.5868-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)(396003)(136003)(376002)(2980300002)(428003)(199004)(189003)(2351001)(5660300001)(2870700001)(6916009)(6666003)(47776003)(53416004)(68736007)(50226002)(53936002)(186003)(106466001)(105586002)(8676002)(8936002)(104016004)(356003)(26005)(316002)(4326008)(81166006)(77096007)(81156014)(72206003)(14444005)(305945005)(54906003)(426003)(76176011)(7696005)(446003)(36756003)(23676004)(476003)(336012)(486006)(11346002)(2616005)(1076002)(126002)(97736004)(478600001)(86362001)(2906002)(5820100001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0747; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM03FT006; 1:K5sNRAZL0hBhdve7J98ML9O+m6Ht/mbgircE5k8NzjLm9ikVjuMOJ3Jc6FtJDgue0eMGrgwKHAMHVRoOrnPlteqA4T6JOjv0veQgUkcZ1V4vEp2Ad2GP5kM9Dc+vyfaR X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d7c7fc5-b308-4ef2-5bd0-08d60e44a5ce X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060); SRVR:DM3PR12MB0747; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 3:ALJv6p0+evJ0qPy89E5d5CqTlq0WcAhlZIrdRjdEEGwKkylpV6ONGe5S1DuBdRkRJwZ6Oc4z4AtO7DggN/kPY3WaZks/R2dQ9lRrpMJHt5trlSRS6rCi9EaePbR+6fy8KsJmLp8bIETECVTf7d8LtdqMwASV75S8QGPEaSzVvbryvdj3Kjc7HyOIaIeh+kkfoPYtrpFEVB92TLTQh6coBHc1RbUkGFaZRZANzKnoXo1VvXLZw4JcoUoez0hnQmpfzLpgnia8n+OTMfvbmutMyBz+1sDOpGa3D6LlLYQ6ecz21MdZaa6+I4uqPYwn9AeSHdiEKpGBYJMje/Bj0i1bz+Z4WMW+oYbxirNxyr3vDnA=; 25:XYp/nk9KE4Dw+ngGR/EWvL/W6xmr29VejXpar6sSoC8+DQC1sorSfn+MRUOkZ3uhG+3biZNhXxWtlAsduCRM+js/FW+9dvI2XwHVMHyyJRpAthDQGl2lPaHFhMFGBCIez0XktyU6q1RsHVGYE2ndCfSgCwXm6roKgzpo7bmpQnUoRgy6YuupDB+16Is7ZTqplxXPPStg6iyzseI6mBiPsVHpgTWBLal1HmBdq1vOHKpRCm8uADJVxkf+NjGWy0qrXMDBq0UOGoxNGuclE4CF1lJ2e97lXKOFksXyWAROsGyi/8UZNhxTgc8/khAaL2JfbResX26Fplf88PCvINX4yw== X-MS-TrafficTypeDiagnostic: DM3PR12MB0747: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 31:6CEjJt5EamSdbAIVNGHI69xu5OOj0tkE7apCFYSVlyxaTyDSsF/2TLiQEeMNOFP8fdICJlfVoOoD16co6YIGs2/nb959muhbJ1jZBdeky5eEQa4e0U4nNiX42sakg2beJC7hv3Bgsr4K3gDE33BeX6J0JW2mHiV0qHNYaXyXxCgAjst7Isb6gksHBA/rD9vaEX0/LUTDy7ddmvMQzw+vmxr/QxvdKiP7nHpXSTODmCQ=; 20:dcVJTKHtTF2O4Pe2b9DidxtmUsfgPNou6tH2i6e7AagE7QYjjBwppyxNSeMuJ6ZfmB7wQnQkm+VJxX5ADAS0u8YVEvYcCTtA90u/MOfZ11DHVPDN8ll4yzlKTrRCgUZfeCm7aZMpVR2KmQmXW3de668Iqup0WuNiicDRDw4uvx+wOK7DrBnlGcAfwbRg7YT6s7u7pACXY/eGgaAvI/7/h4U2y8pJXlIeJMMV6e3DY+68KQSHO3hWNnJ/xhsICj48QXq60ULzeeEvKVVGn0TZPcTiAuB2HffezhOd7lzsaJhJT1faiFfl4zcUCuZpuaVH0DzqGUG5WmzlDQOXQ3YVD/f+JrFq6+WPux4nxPM0QmkVrzzPWxPNmfgDsRkbQnlMyU9VuCtpnrrNyOXTame3nqRCe8DCza77zM78lJYOTHcOOpdoY7hN3S52NcQ3WNExDhsvHxmDt83aTTseMqLlmMlNisPA4qXLXXlKeMMvttE/Qp+1UIwdv8lESXy3ROMU 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)(3002001)(3231311)(944501410)(52105095)(10201501046)(93006095)(93003095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699016); SRVR:DM3PR12MB0747; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0747; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 4:6sqI0WEv4pTk16uUrrcTqSXpjQ9XDruDp7jUqk1F/QQmbiZx5Pu6F139N5amor1G1zpvr9TTzk9RHBqymuMeqoi7cdOf3ellNa272SXJgdYg/CbOmqJXSFWUwaezh5jvpy44uxXYSUQi47+3akZOR14UBuJ8JxdO1akmwyIXU9tb9r+LKU/kqy4JExBlLhYPrPzscYri19Pp3I1SFnAXB0DP172sypy0epkWraNmShr7Bm0258hiRglo6d0YJPIcao0wTuPvsc1SYexKBzMMIOu62H03RmIDS2C1/hSKn5uwZUoEncESd40aSIirSM6Q X-Forefront-PRVS: 07807C55DC X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDM3PR12MB0747=3B23=3AaBeg2JQ?= =?utf-8?q?z5Fem4rZojBRK+M05kJQRRD1RRJcuA22osC4bIGk6RvbkNaChLDvrJ8fpikDOPWlQ?= =?utf-8?q?xzn1PKvb7s+FTkT7K9OUKjQYRmoCAnP/xTL2HMSmUf7Pq4UYQxS8j+EO1BmFewayc?= =?utf-8?q?PCB8uAFaVufkx3hKKyEvv4zcLXnzgKPCvWuM6J1Z82tojSr9SEFKO41MTjC+JZS7k?= =?utf-8?q?b/yobdQsmGh8mCclduPUjzUiOui88/zogYct6hfcFdBw0OkmldnikvbWAEk+T3ZoO?= =?utf-8?q?6kafDKgDz9LRYZBKCGJRqyndR+C0N+21egJUSQNwsmJPmu+/2zX1B6J57ZjkIX9NG?= =?utf-8?q?ld3w7svZGVoAX/965IoTLU6vxcdfpTULva29u9c0xXUaJ/Vk3iFWAdd/YNE8sntdj?= =?utf-8?q?p9LaUXHrXVHdvEGKFe+BoOjTXh5ZUz0gnkUKYv045SQLOMMRHDioUHWa2mVyC8Hxc?= =?utf-8?q?dHj8NfeOgwfrhMp2hkcKBM9Wxptkz/PTWxW+kdbdUoqp2eg8DucfyNAYT6SMUC3gD?= =?utf-8?q?EmLigOgsUVjbxOib1oKRztnMJUNj/QPMR5DiE/JWoTucXVnZa5b6JCYyfqkTL0KG0?= =?utf-8?q?Xx9rN4FvGW/9DqW+soKpME2aOguEcrsxG1ezTPxFuUnNZDYCnoOVJ4hPyAe6Jg742?= =?utf-8?q?BuapE78vDpe3ij81olsNqqhcKR5oGXgycg6lyDsrN0s3Ghm5rFlg25QZfS77Rbzs6?= =?utf-8?q?MsDt/Y+NhSjXLZbejq1hf2zGqQtLoa+Jus2MU9U4tC5b8JyDDlj5orBKY6WSpOVgK?= =?utf-8?q?+OZSt76ARfcLgJutz31L9nh83H4wKyTkThTPpBcohUSRdcw3TXM596azgfjSOILmj?= =?utf-8?q?XV11tGiTxE4iVhD1n64MMNsUs5IhktBoq87tR5qTDxlS2xw+v5rsRfKDmhi52S+cn?= =?utf-8?q?4PbzNmHRCcyk4MbaNaVdG26+frPbcmt74eStFoMtPxFZnTO0hmKoCfhmEuXBYNZTC?= =?utf-8?q?rlrLMcU6XPybSwaivywrD6ZO7t6KV1HzBnLt8bS48sALNVC7x2vu2KxZlkYiIr1XR?= =?utf-8?q?+2I9OX+tDNkXIS6QTccDXzGxTVcxaGMCLQud9TF5FYGxyNTc6UMwHz1OWT1frLcqj?= =?utf-8?q?1JeI9anE2R07cJBqoIkCJCVKz+gpJtE3Kik7hR8kf069E/dWdtTdscAt+KivU+eiJ?= =?utf-8?q?MDjOmxtMrJgl4vAxIL2SafB0hkEJtyFbdNabFCMLptw01EqZn55U8kPA+UJ+w=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: uzP5oj2pFOQ7khFhz3v2RGMI2m9MkrJFAkdfXMI05bL55lW2YtgBZGtcQAX4XS1f3pzgvRkQHOFQ5Yv2YpHBvj7uKtmQuJn4HNR/waj0B53AM46H6eKItc4QaHmAHz8aJg2+hU3yoHPI9LlQraUaFYzw+4cRLjGO/CR04Rz5agqCgnEBCopt7SWNubXLFarxrDSCWrITRPZ7GZpRW8okWdb8fZMgcDCXj/8UdCnTWsTDsmOjivL33XgpLCV++MAt/VNzgdpue23Jcxc6McGlGMLKxP/1vCadqX6TO58RCosxD69L8/FDufwkwF/jSC4ATgcGF+yMLg9uHHnuyTuI0v6l9qV+uq3cYr82prkQi28= X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 6:CoWq7zqThhyavwfh1bTnZhAvc5rJ0gtC957QSxoPDWuEnWYdfg+40AdLgUU/4Pv9qudYq+zErzgWXTlW38b/uz+IwjAWD0OA0QcC6A+ojjOFza3mMa5u585wTBACfJfvW9N8cGovuJcF7Mj0wyjwgO9RTsvAjrOztpnyHH8SMCGH1G7F89KX2RF3lnlLg+9FR5Z6t/JfDTNgfDf7/8yqVfkzrx+WvX1MMI9daCJnxhbgdYsMpy8jskqC11dJyT453pz0/1V7kmNJJrsvm+dxi6fZOISJWuOdt5QBConFilMYVsTWJkCqXT73eLfVlsUj9V0ZMtSPHRRu5E8GymC6jZDrWYbOuMnQV8oqCIv47Y5BrpDXFjwc6yZEEW/FJErTfD0I/gw5HpcS9pn3V8Kmmr7Txdbo16sHYKk6jhPB0klsLTLkXetd9UmaedXr4847MMw6ch7dVR5+ZCYKITWglg==; 5:IaOVh9OLemrcBoO92wad25f10imwTkLexIDwHEOv8/XCrYd4YLZ/Fh/YCb3c9WMBtutgu5oZYOrFxftPJVfJCdfzoS2Dblp3L0imF9DYBgSqArvNpta7ZcQbYn+LlJzLR5SbSuhi0ziH6J+AG5BdI2RXeEViKUwAePaOV3v4ZRo=; 7:auqYdJ3Vfy5IUl2zFn2fxHUPwnsmF4DBqY6Fex6dj9FLxEaC3xrqokS5RkLLW42w8c0WbVrLygfL9CPmTZfck4672svX/I7cEVun3ejBDfFUHXFAZkOd9vsf0fqTn59uTIyMWOkhsyKJww3HnqULt7u3M04tCWPp7KzUQFWvke2aJ6p8PTpaU5WN8IImRTs9T3h0a0tgZlxM2xNCCvnXVB0kIMurEebi8DXE4gY7m83xRyYUjNpOlVcaQDFP8cyW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0747; 20:O4pw7E5Qtp/CeRKYtDajLFkRHZt2vWLntqedDnfF26t3zw5Dva7DXL2/V6fClUmNJ38cqhI6U+FnX88eXBImJQw7aho89eZPstme/+Ioodm0lZO4D0jKo4aHSRyxZCxoLxy3T/Z3tP+Ww++UtGv99O80EY55a29T9Z7kztekj8z2BbnHwjePx4CHiKYkbMPQlGZEP+GN/zPDBoJ5p6dtAcuRvGtDvPcZ7WXDRjIm+LkPfcmXFSY1BfuwK7h+L8Sf X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 06:48:51.9958 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0d7c7fc5-b308-4ef2-5bd0-08d60e44a5ce 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: DM3PR12MB0747 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 moved to front of file. stub fence will be used by timeline syncobj as well. Signed-off-by: Chunming Zhou Cc: Jason Ekstrand Reviewed-by: Christian König --- drivers/gpu/drm/drm_syncobj.c | 53 +++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index d17ed75ac7e2..abbb22c97f7a 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -56,6 +56,33 @@ #include "drm_internal.h" #include +struct drm_syncobj_stub_fence { + struct dma_fence base; + spinlock_t lock; +}; + +static const char *drm_syncobj_stub_fence_get_name(struct dma_fence *fence) +{ + return "syncobjstub"; +} + +static bool drm_syncobj_stub_fence_enable_signaling(struct dma_fence *fence) +{ + return !dma_fence_is_signaled(fence); +} + +static void drm_syncobj_stub_fence_release(struct dma_fence *f) +{ + kfree(f); +} +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 = drm_syncobj_stub_fence_release, +}; + + /** * drm_syncobj_find - lookup and reference a sync object. * @file_private: drm file private pointer @@ -172,37 +199,15 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, } EXPORT_SYMBOL(drm_syncobj_replace_fence); -struct drm_syncobj_null_fence { - struct dma_fence base; - spinlock_t lock; -}; - -static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence) -{ - return "syncobjnull"; -} - -static bool drm_syncobj_null_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, - .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);