From patchwork Tue May 15 19:31:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10401815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14DF4601C8 for ; Tue, 15 May 2018 19:33:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04FED27F17 for ; Tue, 15 May 2018 19:33:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDB9728358; Tue, 15 May 2018 19:33:46 +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.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 A58AE27F17 for ; Tue, 15 May 2018 19:33:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 304F06E2CB; Tue, 15 May 2018 19:33:45 +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-bl2nam02on0043.outbound.protection.outlook.com [104.47.38.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCEE26E2C3; Tue, 15 May 2018 19:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7pibBZuMIhxOy1Ffp/WS42UjI1Iy0a9h3mltpBLnNHA=; b=ec8oOXRgmVoEbmF7qxUQyNAnZWcM4rE6i7ny0TByb9drwaxFg11rQzR+t0YTQa8tGQOURiAnIi/u5j47EKI18EFeLZauyDwnxM8SvMjid7/1Rz+pzbOsSrm+FqHauBh1FWH6qDMwdiv+PpJZHJb66J/a+dop1QZAEHY0vNfOVhA= Received: from SN1PR12CA0106.namprd12.prod.outlook.com (2603:10b6:802:21::41) by DM3PR12MB0761.namprd12.prod.outlook.com (2a01:111:e400:5984::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 15 May 2018 19:33:41 +0000 Received: from BY2NAM03FT031.eop-NAM03.prod.protection.outlook.com (216.32.180.49) by SN1PR12CA0106.outlook.office365.com (52.132.192.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.755.16 via Frontend Transport; Tue, 15 May 2018 19:33:42 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT031.mail.protection.outlook.com (10.152.84.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.755.15 via Frontend Transport; Tue, 15 May 2018 19:33:41 +0000 Received: from agrodzovsky-All-Series.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.382.0; Tue, 15 May 2018 14:31:27 -0500 From: Andrey Grodzovsky To: , Subject: [PATCH 2/2] drm/scheduler: Remove obsolete spinlock. Date: Tue, 15 May 2018 15:31:14 -0400 Message-ID: <1526412674-15913-2-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526412674-15913-1-git-send-email-andrey.grodzovsky@amd.com> References: <1526412674-15913-1-git-send-email-andrey.grodzovsky@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)(396003)(39380400002)(376002)(39860400002)(2980300002)(428003)(189003)(199004)(476003)(36756003)(356003)(44832011)(50226002)(8676002)(486006)(81156014)(81166006)(8936002)(68736007)(126002)(2616005)(72206003)(11346002)(86362001)(446003)(336012)(5660300001)(76176011)(426003)(51416003)(97736004)(7696005)(6666003)(305945005)(2906002)(47776003)(105586002)(50466002)(186003)(54906003)(106466001)(316002)(59450400001)(110136005)(53416004)(16586007)(450100002)(4326008)(104016004)(26005)(77096007)(48376002)(478600001)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0761; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT031; 1:M9K9nb73pEXHSRQXpabB/hBs0GGXWaA/Q/or1nK2AqaK76bWm7jgguFSifjhCDPWzAdMOsKgrcscrJtY9pp9mUZhDvFaCWaieq/5qkrzGn6gcEKmtxV+81ohbR8bPWEY X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM3PR12MB0761; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 3:hFdK/9YSKcscZ7w0kkZEqDK9WXBKY2RR/3dRAskKaKOINnEsqwwPsxSDxlbiTBKzvOvHVUEym9u3MNZ8ZsvhFBHddYhp8mxy86yvSWjxVMbdAHntz+N94gBaM1Lj88eWFG5tstvAsBLf4EEhitx92q0IAz/E8raYxx4Fcmg8FmjbUxMtJntqAdYNVnz92nXeDnE6pKNf3PggsEruIOw4BNj0DGisSKkqIrM87/gSVrheOJuD5hIYyHW7h6Mpt0RgeTPBL6HNM78jyPWw6oLerR5cy/VP3hPRONvhrIXT9A0LoZHHU3MEiS314gPENuTZNLsh/NGNVdPlGhLfYEv2q8rVxW6ba4gq4eo81zjvKBY=; 25:+qNGgrgtDIFX/ejhpOPMutvz0Y2jHxorX4lpfa0vmm4h3lA0QvuiRMVsPhVl24GlBm0r7d2lKGoJsWL+lXLaDASxBptuElGCbe8u/XZEQn4EAdydY3j81sP1BYfyF1OPba/PnMna1xyevCMUPPcaqDwqC9SnBQC8VpPfaF74NOMXoM7hlyAmNW6k8CzAHaiBDqVkou2Kwg7TybrhvO6YcuOxFyIFOI2aluhwiim37AsNCi/Tuyu4vMmUkPn3EAMGsai6UaRw5fmJTb+tk2Ipi1BvkvA8gL8UASzRKsudYom0r+W/a2KedwFwNJtX7ycTrQ+u6TUj5Usp1nT/zF0gZA== X-MS-TrafficTypeDiagnostic: DM3PR12MB0761: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 31:KHoz0XdObkh167BFcIR1JzDjXm17LwpKFN3U+l3cgFcfnX/XR+t0a0xpocWMRQmxFWvv0cGBrSs0cJpN4/TYwBWScHC2WNulZf/OAKtWRxElPuHojEgFOQyjoYb7Ye0Z89+e/Oq15cybfo8AX9kQyobLJ+1Z5FRU4zivXRBuZC6xtBNTvOW1V1LNNL0ei4pxE/mgTeLt/QFUC/uYo9ciC+KEECeb5QmxlXORTNbqjxY=; 20:9TtG9lZPgGNqGO39pbDtZD3F1ds8xwLRQ4tP8pWD27IkyV/LanT4NLV/r55sWeamzd9uPF1kDDqJy70h7mQIt0I+Mtih7aQFfNV/+5gGiYHwX2XDovSIiBEqvh7M89ysyvCYBElGXMDikluQJNOzidyyAcja8S/H3krN0I78uRLQzcviq2XwUSbkTUzHcka9fvWXER+ANAi5IatIswCecFQJwC470JS0KMgix7nBTSEPRB5rqOdGyLdhzSdh9iJ35aC1Usb2ZQTFI+/PjqQWl2gTKMKPfVrxkR7UJUZ5wFcPoIWi89ubARfrPhAF1/r1dCVJX7vUg4isdNDjAPg8D9p5m+LTh4CKB035EPRczjS5pgO18WcC5zj8d6iHqSDh6/Bo5v/qCVu+OZyKWpr2NYpWr3z7sSAr9vHN+X7Tm/etg+Ly6fHjipc9ejD1OUq/+LO0VUSs2VTd7ZqgL5SZTF86NF9n7fiAKGtGbDA4fO3V9kbATKzach2fKjZ5vvHd 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)(10201501046)(3231254)(944501410)(52105095)(93006095)(93003095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM3PR12MB0761; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0761; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 4:2YEHqr+9dxzteqafxyNZFFjuMkX4RERopVbOlhSSKKwrrFvKryhsLcytCK4IuzY7ul7YBCvEzp3HVAM01r/v3yXdGnlWbTLPZyYcoT16TVNKZ6u8sDikGvIYX8ytFUVd6FZ53N1s1HZXlVuBpB5nx5pXzEkSVBHYQ64v71837eRXWXJC7JPvaX29nGX7Qo+7lF8SV8tglFlP//tMLcrH19qs4Rd3+Ge+mZZs6x7tnnUk4UNUcG+U8t8bnig+Wn9vbmMmCYuKmEnTcMKrb7XyMIAaMpxwmY0hFWOzaG04Bpz/FwR78HrAanCPhGKkiWhO X-Forefront-PRVS: 0673F5BE31 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR12MB0761; 23:2xZ6M1IkWDg8PinJHcjoJV5jpEG4ddTYw9RLrgZVK?= =?us-ascii?Q?L77Im0HfgfqejVinE5d9PVc/flUAI1g/jj0wGp0La7oyoMBVStq5vJVjNjwq?= =?us-ascii?Q?wkFwTM0IrYweJLUGe9VH1oWqJ8mj5agszg4aZ7z+lyedWlp/uGeTGND5jXAQ?= =?us-ascii?Q?tcRrJHBH3Q7FIS6uUtjpAAOsP+ljxb+yknmnMC/sJAv1RVK1OoIiCrmoM5fS?= =?us-ascii?Q?26wxoqv7lgQmZ1CVpdVBOyPs6X0jFI5BTVBOfJ5fw67EAneWoXT8CSvM1aRN?= =?us-ascii?Q?4M2qgEM986Ehmq1n8cIMopiOAZq6J7rAZjMUplee+OkX3w/3azWegt8phIp+?= =?us-ascii?Q?siymVoeVRqn1GNQyVjYNcHnYJmbLDp4kha5SNvQ1C12RMvlxt1PJQUcZLYal?= =?us-ascii?Q?teweBjVmU7SjBp768egAR0ZPlHPrhCfk6nvv5VymJRELn8tC0kkzFXwGKM3E?= =?us-ascii?Q?7GKsuL4trRXa/H+jrk5gWQ20oQ59edEon+L4c68S1T/2/JjrAJtBSAuN20Xd?= =?us-ascii?Q?7Rgv0UgrjbbZXZ5pu7SYsFGxCPwFrnJNedw7HfO1dbCaqWuFjDnOXgn3PqW3?= =?us-ascii?Q?g/IcSdip8LZ34NCNAxZfzO/NIc6JhdxWj7YK9CtJCuloJZs1XMY19sprGo35?= =?us-ascii?Q?Dav2S8+iMTA9VauWmaTuK/0zi3kGslHYD6JerlZudEtf+LGPhnMKo4DttXU1?= =?us-ascii?Q?+AYZboaQaJJGI6XeXuI6YsYE+qo+6zfJnNCmEAByRZXEf6bEyDLX/qtI0g0P?= =?us-ascii?Q?9HPOmFB8kbSi8f/gRleJyrXXbHqIBmfk6bDjVHbNBauPtfizoRLvUuPGcZZx?= =?us-ascii?Q?F2ruz6Z+D8TJQv8EFuG3VKEY9XlO9YNJ26IHfj4vTShGNuanKzyqyxa1ggCc?= =?us-ascii?Q?y/Cb1rfG8dZ6czuHnsgBBID6EUjVUOAblfJMEyMWgFKIhs2KGxMyT2caNfQk?= =?us-ascii?Q?RXzHfhrSJPKP4G3lvD3FHoENv9f6Swog1vz4fnbeTymfBxyE/SjVMwuIg9+x?= =?us-ascii?Q?mW0dBA3nfBcma7DDcTM/5AZyrrVk3suyhNorz4rkcewRB6J/IBqi8sH3Uelo?= =?us-ascii?Q?uX3MdDoQSGPqAcJqmXF8LCPet7jyCVwYPmvM8gfB7SHB+gqyDeGE5pzsJcWC?= =?us-ascii?Q?dAu89ex20YwoHpTyc2D6hVtJm+Tbqk7JWxKjdwGnE5ZvcgEE06zK8VYt/KZ9?= =?us-ascii?Q?HuvieObDvduYD7iTPiluEE3cG5kSeob7+H+hNa47WbUoop0m1rBDo2VhSRPp?= =?us-ascii?Q?E6zjNCt3owNOqL86uU=3D?= X-Microsoft-Antispam-Message-Info: Q6b3RK/y1W7GEHKtQupFnUatnAKsdsbJWy6Qv0FE+68JiioJYL71VIK/A7iLgLfQoElcaH4mgj/h4G4R70X2b59f+6aZE5Wr5yvl60EHocQeU5o9UXFeUg+j2lCQ2nDjpA78gUGMgb2CKfA2SBfjmQuc82+FMY/5LV+AoQ7rjsoqw72ge02ASh8HIoMTkwPW X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 6:UpJd6tU8Iu+/dkq2pynDxSidMhGhHpPhbL3Bz11ccm1wVPmE8WBJ15igAUAZDhYsQdKAlSCNy5JKey+5rveAkS7rotXzcLTYf31dpFYpgo4fnYdsANXAz4YQUpI8F6/DMextS3ORWwBEiLcx+PjWHCLG/JDzNuvYrVNe2TkWYzsMG+AX0wg2y7c4bN5VMiwzdq2FGXmikfk9EMMrwLCsYZ/ZkERUY5hp1ZfBBRA7as+rU51oE7rdHK83kve0w1hpe5xb4F5f8JIA0UXNGz6UgtsTcVWQN/uaYCPO0BIerYgQc7s08YzaVvbiqHWd6e9VZ2gzyst20rGGeMmbgx5qFxyOyV0IgcU4mKnT+CIHmGPZVBJy0vI7p4fuHqlG+t/1z9ldzy6zXRb/xaW0lygUi3jMQ8SRSz2MhbuacZ7IjFfD02iQ9jlrJZAycHEfH2MjNUg5njrsUgtrK91XUHZvrQ==; 5:jogaRbA6v3CCmmyB+sm11I/kNAhhxEmfEq1cEf8tySn8X2wUaLEHEE5wvDpiM2v7OfFaExsptU6NIfPYkLaPVmELkaRUSzAnM2gToYTo/7JNYRunf57VOHaVUcq3+iOaFa7jZHlzgJDSz4ED8vrn7hvz14RVg9bSZuU2TrnONLY=; 24:AZLXHyDzl0c0ih8er86shfdUSr5aTQAUSf/jCplVG5qFHkrlmMHyCOSZ2ZSor/XnpA2hVvg7l/5pq/vpk7LvICjSgQE7mXN4PMDljuawGDM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0761; 7:SFQR/LoXMWs+U/i+ftxaStKMapvfUVYN38IcQj4DSsmssuBe4oomZp8bJnaiENqgZVfIQbo4iyz551sz5iXNNor1nsRSDQjnrvi2zhKKQy91MqOngLQGpFkS0dLZ9ZM+L2ZFmoMhhVdlFqwGbw3c5UewwZWLvDa+4VvrsVTJgYpYp0aldVfppwS+dbwNGigHoBYEKDRTTHrx9xmOBXaeuELsD1Kl1uiGOlMoYQGe/q+V6FPew7gUstQJamYK708C; 20:mHjMfAXO1DUUkmDjIsNEtsV5nFzKcF3IRTLjkSASMiPKxf8q8Uy1B+Dn5JVnATtK5lpxFr+/J0FOs8/Ld06Zd6Xb92lmA0UN743pj2ol2wRPmohHA+IA84lB1bVARIOUYhWe2V+Pd2IZ+fHr3rmC6rytqiyTNcCuCuuJqdsNon0yzm3MKtVDGj5IYxYi7VxvvT65QTib/+DR7T++pbTdCBP1FIzyDEPBsKfIkVTrg+PwTKnZiTlaa3AuxK5G/5Cy X-MS-Office365-Filtering-Correlation-Id: b1307bd6-5af2-459a-b98b-08d5ba9ac3e8 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2018 19:33:41.4988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1307bd6-5af2-459a-b98b-08d5ba9ac3e8 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: DM3PR12MB0761 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: Christian.Koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andrey Grodzovsky --- drivers/gpu/drm/scheduler/gpu_scheduler.c | 4 ---- include/drm/gpu_scheduler.h | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c index 1f1dd70..2569a63 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c @@ -140,7 +140,6 @@ int drm_sched_entity_init(struct drm_gpu_scheduler *sched, entity->last_scheduled = NULL; spin_lock_init(&entity->rq_lock); - spin_lock_init(&entity->queue_lock); spsc_queue_init(&entity->job_queue); atomic_set(&entity->fence_seq, 0); @@ -424,11 +423,8 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job, trace_drm_sched_job(sched_job, entity); - spin_lock(&entity->queue_lock); first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node); - spin_unlock(&entity->queue_lock); - /* first job wakes up scheduler */ if (first) { /* Add the entity to the run queue */ diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 350a62c..683eb65 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -56,7 +56,6 @@ struct drm_sched_entity { spinlock_t rq_lock; struct drm_gpu_scheduler *sched; - spinlock_t queue_lock; struct spsc_queue job_queue; atomic_t fence_seq;