From patchwork Wed Aug 22 08:38:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10572727 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 58C2D139B for ; Wed, 22 Aug 2018 08:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BF4B2AB15 for ; Wed, 22 Aug 2018 08:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F3BC2AB21; Wed, 22 Aug 2018 08:39:13 +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 C4BB92AB15 for ; Wed, 22 Aug 2018 08:39:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D577A89C84; Wed, 22 Aug 2018 08:39:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0078.outbound.protection.outlook.com [104.47.42.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id 27CDF89C84; Wed, 22 Aug 2018 08:39:11 +0000 (UTC) Received: from DM3PR12CA0091.namprd12.prod.outlook.com (2603:10b6:0:55::11) by DM5PR1201MB2504.namprd12.prod.outlook.com (2603:10b6:3:e3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Wed, 22 Aug 2018 08:39:09 +0000 Received: from CO1NAM03FT014.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::209) by DM3PR12CA0091.outlook.office365.com (2603:10b6:0:55::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.14 via Frontend Transport; Wed, 22 Aug 2018 08:39:09 +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 CO1NAM03FT014.mail.protection.outlook.com (10.152.80.101) 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; Wed, 22 Aug 2018 08:39:09 +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, 22 Aug 2018 03:39:05 -0500 From: Chunming Zhou To: Subject: [PATCH 1/2] drm: rename null fence to stub fence in syncobj Date: Wed, 22 Aug 2018 16:38:56 +0800 Message-ID: <20180822083857.19216-1-david1.zhou@amd.com> X-Mailer: git-send-email 2.14.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)(396003)(376002)(346002)(2980300002)(428003)(199004)(189003)(336012)(53936002)(5660300001)(478600001)(72206003)(4326008)(36756003)(48376002)(50466002)(106466001)(53416004)(105586002)(2351001)(186003)(77096007)(486006)(14444005)(26005)(476003)(126002)(2616005)(426003)(104016004)(47776003)(81156014)(8676002)(81166006)(97736004)(51416003)(7696005)(356003)(8936002)(6916009)(86362001)(575784001)(16586007)(1076002)(50226002)(6666003)(2906002)(54906003)(68736007)(305945005)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR1201MB2504; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT014; 1:wpIB1RA5pzgt7Ve/45qy0z1+yHMJAdrSrr17++ahuskzDenHZr7a96C8X0XbmQcBe9i8k7r/oVElflRcOdCvCsLe4uRKEzGqtO+p27DsY4tTYllaYAOMkDrDgZsIsr+4 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba817ebe-aae0-44d7-4041-08d6080abaa4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060); SRVR:DM5PR1201MB2504; X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB2504; 3:RlVmvE8DPtKzFaBb+ZmP138sntF4VBH28fb/RZeqgbcZ2ft6naDafBR5a71K+cvlNfsDt8zgXNQhkk7eXQYN5knKQwc9B+orYMzlV3dcOZMKNECA1aMLARZ4yj+e9zeemcCkNcsit38mksfXGOm1ywJbIlOt9waIFadziKEHPI8uQCUjkkaHHcGuttngyvZJ66hf2ptWQ8xAyljBnG2p5JL+kZtyK1aQI9u25jdAUleB8/JINHXpB4R/wd4r85iYF42lkPImKsFVOTi8fXZiQtnW6g04cDYZB51Mz2ElMEutv61z8pf8HdjNLEmFHSGz62HK/8bEqH6eOb+pFmpIPCEeKeWSGMHDl8+bcKFS8HE=; 25:vMkjbC17bf1KPyJaSUsOa5SnL2Zsr2E5hDCXlXAAT72N8VG6Mk3rR0WJwb7vSwJPBOhqPY+KxzDqp9uFoxccLEHi5b+J10IkRBt9eZBQuo37om6Sl+1PGbDSb/pstjjF20YnWN8r1eMoJSjdrE0GJhes0hUufWqoVq27K46mHAgSOSOEYPF3lxiiaBzdp2enBlPBRc2kez+Z46yk5TBG7KoKb3004GMzTw97FAtVhPNjEJt2+AtQlegq/tqOHcpxWV0NbA7xcwjtpb6c9zw4zG9rWYlq7ZJaGCdsvIKQthmmCy+44aIuzQa6aaZq3d4bNSQRg5WUbYQa9Knu34d8wA== X-MS-TrafficTypeDiagnostic: DM5PR1201MB2504: X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB2504; 31:UoGmoYbmq8kuHh7cTkvNY7cQWowG2N0rQjb/Klm8XyafZ8Nw5NArKYEy+09ntoebned2EHZM5W8qd/P77yEWP/SKR5Pp2pkAZ3r+PwGjWOpPxwGLMscFqL3iCu/Q9IZvMeHBc0sfkHjcWCx1xs5EEJJWWO83NuI77wosVgh2m/IwbuFNQPeh6untDlo5R8yGhIVP7Wmmka2O/gcy3j5EgVy2PlhwElrQnHz9CdM2LWY=; 20:NI/QzHPq8IhX28x9r6i6ko1SN+ptdy0ZqosRnWYtP2hvuP0YpA4IlQXee0TxUNuNNtjdC8h8xmikHg3C4WpfPQDfbhZ/8f/HIEtiVZchKROZbJYfgoy15uS+IdffqK3X+2CEIjO6Ztvs8ZVsaNnvrPVbAEi0IbPt5198mS+XX9xSpPnP1FALN8a5xtXoAUIMhjt02vR9jU4SiSWU/bvTff+AJZkX6gjg5a2qhs+mWcd7D8vtOEVTF3LGBE9Du3FOst46g0gtWfi2w/S9z3T+OztLt0f1I6o0+7jLB47OqJVr0YxCNzFiEu52qjWq0H29QSFAZ6+Ri2RY7ML1EDwz3e3vyR3EaNSf7iBU/IE70HSqeX+XVyZrHz2rsAGwjKPuxWrOVJeY9wco2ieqN9aWkq9bM60A7xTce2cN6dFfeJzZhgEeCToiLhhWf42lDgKYkFvEbUisgeKw95SV2HczX17GQ9cR/AaVkoim2wrn1lzheaxRbyf3xrM71jPa4udD 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)(3231311)(944501410)(52105095)(10201501046)(3002001)(93006095)(93003095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201708071742011)(7699016); SRVR:DM5PR1201MB2504; BCL:0; PCL:0; RULEID:; SRVR:DM5PR1201MB2504; X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB2504; 4:9pwE8Ben8djecpBlJrYlLTngQtrAl9dNS/KjOKkYYqJCaT6fviX2xnxrw0/a8PaTYA5xNnC/LjCeZ2An/HXyXPPRl3CDk1Jjp2+aHPpbk2aFmpaFPxC35+txWr7nl8aXxRLpZmxhNClp5O7r4IkOITbNdb4vf96mcr1tVs5f9A0IjoWG+6JkHEWbbuIHCKsGC+EZkMn0IP+8lfEMWkzqAJ6ukvfbqXmfLrKEb/SjAofXl5yweB9bbxUPZxsFhwyslAFoJLdOi/RHHOE8XlyWxyVfbf8RDd5c6DR9WIIx8GqPHp3BwtSCn5qiuf1TY8nA X-Forefront-PRVS: 0772E5DAD5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR1201MB2504; 23:k7SJk030Q7EeSk50nR9qmtn2Loki/O8/ZWUUVn+?= uywDOqtfBc6nKocTCZ7nPpHu9/b075jm5mQjctIFQ/dUuOcKZqFKBRdlTiu4kijmEGfkj5tSIg4wZQoKIKkUOWViYswPTEarP9x4AcfSBHUB1CoMqsiWeH4+hwpbWPs1JjZH0ofQ2oo2PBoXEm6+/WYo+Aiz+uttzL0UIz8G8/oKzonj+oWHhbMQN4it0E8OnO3m7qVqS1xxEVcutwwDUIzfFQQntBIdQntyqKZPi1WNqfFhmTLcm6+xoIR3jhmmdrCdBbntWbUT5EExIOzMXF+bkW2gD8INI2iY4tMeII1zTLDcAW+i/IP1PjfsL1U9/Nxn6+g2eelZkow15mLDrZ8GJjraEkpaBUT/4+LMZZ7u/wnZJFQZhUzqD07zwVIzYCBjccLZXgFITiVxkqvX8bCoixdOPTpGVNjxJ/dRgkkCkyVCngHzle7Mk7RX2zNfl7Fhk+aLKvwBNeW4nCydV0+J/h1Auo/3jh3faKKOBzOM3YdMRKipNn6J2iZXR0LCO8qkIxHwd4hUUy0e9ozVbqx/Ik479adOQppG4uc43LwNcp/r7Pdq+SiUMZ5Ga95H7xg/GToD4nDTS3faXroAUanoyUTDutgsCHa0X37I/0S+A7Sjc4ZO0/nPmsbA11tK+bLpaOd4FFN43sWqz6u8d7X6k4sr6FpRt+ix/OwDPk+o/oCNGtKQHorlLKdu/pPw2gwZbDtU3iEAcYmE3NHauliqWCsTz+LogjSSgIR1IITVuCAEgv2umZ8NCDRHB6ZAlUgJic5wOBXeEYxmn+oIlY1V7g2hWA+T7qz2LHbk1Fnlza/Qutk7MS8+adlK6zAuh5lhSUkQjg/b1bPyawHokaGtuG5N8ROVtsgDLH1/vPUMfPgWuzjYwvE8lcryDB8wxEr2/r137gMae62rhWwdNGgyHMbqy4EELgnIw4NoygRkKSW7vxUBlfYxnkG7PHkkXz9rDL43YEuvs30h30SjxBEWjiRc4oktlWC/k8zrQri9z2cRP96g6ZVquhO025De2I236Etav0WTmHvUXJzYiztt1Dvo9lmoLcHlGLdmozuoLPD+D5yjXyBB2G6XztEvTCETdA2rYwoVMKfarxOCZih2xdwbpBi9Y4CBYSAZLs9ovf6mkSKq67thAY+8bO48A/do= X-Microsoft-Antispam-Message-Info: Awo/Cw4ETI1DXrQ2rQ2ZoW1Olo2Od3xjXP3gbKXIW9bxGoNdgyP2IAUQhy0obTjEAgX7xZir+75R/wVzIo/P+9OdBfZnyy/VMcj/Mi5mZ+J3HfW1hYEC21mKC3gg6ZOB1Nox3XIRc9y26j/iblVPDz8nAu7tVetZO9gGcVchO5y4yRuzj+pyg7+zdmCz4+TesGdvhd9IC6uTNYVNaVzQZBjETmo+svyUmHjyveK+G9rAp1dxMRuMlD373z9fSa/lqhY9oEo8xj8pDZTSe4fnS4f9RnASwo05zRZGtUunkUNb5QT3tPFuxSZMcIMx2ixQAOmgKJ7m2E4vrkF7JwTVNr3ni93Tapv5dAtNUPiTl5s= X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB2504; 6:ZR617fHzKYiDBAXyd3liqRj6Eb8LxDEmF5JCmiJHgiw4jAl+kOnzp7LWE8P/NXEAmO27HHiPWQXMsap6AGLWKSJRxQ6E2w5YSjM9l1AXe9O7uwak2YmDC1eG2YXs30h344p2yJT9d4oslRvYiwWhqWKztZlI1DLcqgfsak6hgHNrSdck5VqUN0MPQZrBfrJ6CozomHsZkeu1M+QrVE7jKUodj5kVs6a6xFRnQTHCouAh2p5sSkEY8IJyMOM9fzMhU5p4Dj6XbVcBVUiyG8D8yu3oG1/qB0z006X7iA2VmxZ/rShIaqG8+F+bb+uOO91g/YN+J8UOO1q2D/riakHOKnCgfxn/cZo4KEFDZFi0rjATAK2BfGUCD5kZYkKwNJ+3OAVDAbUNpqzxCDs2j7j2xgWoXdnV0Q/po3djipRarLEuesCXEVnZbeSSNEoL33EEZx4qfDQpmMpvSGhWpN6QwA==; 5:K1xw4wLfbj00rDwXF7U7Myju44e0ShPFDia8JVEfwiG4HfMC3r+UpEOlJmHP0xYApJgfVFhMTSU5/Ct5p5twTRojIk4QyVKcAeHzIhAUTyKXncKuGqBzZJmxWCCUPm92x3QPpVMaCj3tVQW1Y5G4wbqhvyfccWAtQeRT1z+ku80=; 7:LOwudls/uqQ18N+XPYHm3dqYuZn+lORrxeQ+H5aJtoVRSSs9axtqtkrZRagCd+f/khQo5NCJYPOgvnquKi5FC7UnNuBd6ZndTuVXK0hpgM0evIQMQ4WTSmaQHyTW8OFqlxwyNMLzoZl7LCiKz0EwonvL0AH0TrbifkINEN3xBMVclpDlaftCSkfVqsTVSqRIvgW8p/m/DwAbazlVbY1E/YFMWsHVfzh+bhoT8erXP/vPIEw2dMHtr/sZ3Zv70pRv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB2504; 20:+4QDyyFidrn41PJe3TPteDaKDv2VzZgjtA/nKsbuW5HuwhGCyO+wyhQywOihBC3yvd45O3Ku/bS2NZ3CnpPO3EhTxfqydUnpZZci7h1DfBK0zBoHbGub3zPAs92kgQqFlhDrU2yeDqx5hElq/bl7RzKkHm3Lf8xSKjjc44XehVbu3bEWkWhS0JxwGdDYa/uDefxs0nXZRwK4VH/ip4eNyhF7hB8YlJ43RQf56JXozpZ2MbEFd3Dt3BjbOtBfQj76 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2018 08:39:09.1338 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba817ebe-aae0-44d7-4041-08d6080abaa4 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: DM5PR1201MB2504 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. Change-Id: Ia4252f03c07a8105491d2791dc7c8c6976682285 Signed-off-by: Chunming Zhou Cc: Jason Ekstrand --- drivers/gpu/drm/drm_syncobj.c | 28 ++-------------------------- include/drm/drm_syncobj.h | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index d4f4ce484529..70af32d0def1 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -187,39 +187,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) -{ - dma_fence_enable_sw_signaling(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, - .wait = dma_fence_default_wait, - .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); diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 3980602472c0..b04c492ddbb5 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -30,6 +30,30 @@ struct drm_syncobj_cb; +struct drm_syncobj_stub_fence { + struct dma_fence base; + spinlock_t lock; +}; + +const char *drm_syncobj_stub_fence_get_name(struct dma_fence *fence) +{ + return "syncobjstub"; +} + +bool drm_syncobj_stub_fence_enable_signaling(struct dma_fence *fence) +{ + dma_fence_enable_sw_signaling(fence); + return !dma_fence_is_signaled(fence); +} + +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, + .wait = dma_fence_default_wait, + .release = NULL, +}; + /** * struct drm_syncobj - sync object. *