From patchwork Thu Dec 14 03:15:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "He, Hongbo" X-Patchwork-Id: 10111383 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 7AB0F60352 for ; Thu, 14 Dec 2017 03:16:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A9A82988F for ; Thu, 14 Dec 2017 03:16:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F6FE298D3; Thu, 14 Dec 2017 03:16:41 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 E6D5E2989F for ; Thu, 14 Dec 2017 03:16:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0711D6E61A; Thu, 14 Dec 2017 03:16:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0056.outbound.protection.outlook.com [104.47.34.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03B026E619; Thu, 14 Dec 2017 03:15:48 +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; bh=Imi5lbczdjb7Gj3c27G/DEvNTo/D0UBByYxKVGFEc4E=; b=5ixA7/vdGo4XXvuXWl8589GPHE8T30GQBJGSCxCEkk4Lq+xF6A+zrB0uQJ4VwcembF8yKAgswRXNPBwVDemaFXt6LjfwuaFxLUouS7lf58Ocj02onmaSUFGAu+Ppw/nvRfOPLf62zQBy9NJ/qsoGSOdglk9X+jQcuQ+yrjaakp4= Received: from DM5PR12CA0020.namprd12.prod.outlook.com (10.172.32.158) by BN6PR1201MB0050.namprd12.prod.outlook.com (10.174.114.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Thu, 14 Dec 2017 03:15:46 +0000 Received: from DM3NAM03FT014.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::208) by DM5PR12CA0020.outlook.office365.com (2603:10b6:4:1::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Thu, 14 Dec 2017 03:15:45 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.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 DM3NAM03FT014.mail.protection.outlook.com (10.152.82.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.302.6 via Frontend Transport; Thu, 14 Dec 2017 03:15:44 +0000 Received: from roger-build-server.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.361.1; Wed, 13 Dec 2017 21:15:44 -0600 From: Roger He To: , Subject: [PATCH] drm/ttm: init locked again to prevent incorrect unlock Date: Thu, 14 Dec 2017 11:15:39 +0800 Message-ID: <1513221339-9927-1-git-send-email-Hongbo.He@amd.com> X-Mailer: git-send-email 2.7.4 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)(376002)(346002)(396003)(39860400002)(2980300002)(428003)(199004)(189003)(316002)(110136005)(7696005)(81166006)(54906003)(77096006)(305945005)(2870700001)(2906002)(8676002)(81156014)(5660300001)(4326008)(356003)(59450400001)(23676004)(68736007)(478600001)(72206003)(50466002)(50226002)(97736004)(104016004)(53936002)(6666003)(47776003)(86362001)(5820100001)(106466001)(105586002)(36756003)(53416004)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR1201MB0050; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM03FT014; 1:PBPXvDNtYG2gEwlE/L/zTZU5duUMBIIcgiZyAITWhfeX8+TYb7dHCK8c070BgfJD0A3bdSYGlAy7M8m0CQcDTK+aQ8Bwy9uMa+OiwCKd3DTlG7VE3bzorvwz/BpRCIq+ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a422fb93-7b56-4b36-ca19-08d542a0f738 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:BN6PR1201MB0050; X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0050; 3:rnajtxItEAGd/u3s2imWZmbR/S/n2eAuCy8rrs/mqIcdK+8nF3/YbwxqzOMYFZsrE6vHAKDLsRevyOHbrtr2QJJTYFip1+TEkz6+/T2TqSgfvW5s6gGxStoPk26pCAfLQy0JSxQ+z/kLhSdqUsHgTWJiNRImGqsM2Zv5vDRvNm0267KTIVcM5AxtK06JEqR8S49nIcnFJyUuDoORkyDqBOuRjuJJpvwYxLcxKrkMpgmlsmZoUF16VxP+eR32vsppY0i+nMPC7FPHzX/qJwMcishPiQBpzRTtRkY70WHdjVOkE6xryJ516uTgcS+dQn4EZCNHFYrq+0TckEB2FLWtUdOU33x7F8l9ghNHQzWLD7c=; 25:LmjlO/Nc0vANjI7o7kJkL1xVRMfDzioYe+vhtWkVlADoeUhhG1AaB7nGArVN5j0z58P3LBQTbvoZAYpI2Ln1xaZOwea8RYR6frRWjSqp5FVFAB8NcquDJ6s+gxdGu03jBJc/GlyXvXh7DBp6JWIP55ATApxFHELpLeFoyy+cUQ5Zs1vn7ahMtdsjY5rF6SMHuzR6k0yeij4ypjPCG6hNEZAPxlMhY6udlr/mQUK4Assdk0y7ipIjj0pl3xYu3W5bxufQrkEAqtdXap6QBaUxYG6/I++fcCPK6pbETW7vvUgEIqRsde/kF0thIWMkYJBHRTx032YvUE2+2lL0u7rx8A== X-MS-TrafficTypeDiagnostic: BN6PR1201MB0050: X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0050; 31:aWRCSNS9jo7MXBtkVSt5lHP+5sWpfCBaKYB/2h/sjupg/nU9MF8fkQyNsgJJfswmCvu76ipfq5HXUDzUzw9lOyXPvnPlQYen9iuWSM5ldrn5khLYAEoscEpmPrtmvv/MDiQuMh34zrnBE3MkPttvwq6w5nQP2Av0vp3alrJk3LyJwbcyYRprphoXLNUsnGep8MHzhyAK4X+smdJyGAv40zSQIQn0Oxl+da1WY+KQlv0=; 20:5oMCevAwnG0WrjkPMkBzJ9ZEIYUsGqbiQzPOFDboql8oMGJA3fmwPJvD7ktI8+DACJHwJe/um9bHpMxgFisJFwy+jFJUpaKkavSoADCUYsVgLbC8JTqXD2DbYNjYtnkvG70GGNimTzNC7ZXmulTRAoc5WJOiV7hAQT81N5tDWPeBGVTpMZZ8pMlfyrwc6oh2K4MC+ti9cGrMOjl2CmJAjChiAweNeYMA7UDOGNXh6J+2Pc7PSRRqGxh5qbNPJBvyrz3iF1p5SIiAw3bnNm9AhzoAEvRT70uhsEchrrqfm4lpqduGEjoE15/I21BNLxRtTUeEkmWAxkAb9TuLy3UeUDenvplRLvsvcrPmKEWZ3/VLqKu1yiinbDeST6rmaZ4CEa8K2Hz2vYU9zn3/KAZk0jE3as5tGrLLCkCZ0+t9OVpRung9eXHB64g3XpZD571w5ePNQOGFutWWQWcQEq9Kv9oWuOW0Pg18jrvnjCtUgsUpRlMWPu50mr5jJn9e8ULU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(93006095)(93003095)(3231023)(3002001)(10201501046)(6055026)(6041248)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123562025)(6072148)(201708071742011); SRVR:BN6PR1201MB0050; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN6PR1201MB0050; X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0050; 4:iGmSsFDsKMmN3Kh8tUYlmScAnYcMd7ukqfQAy4kNiCAvxrhtHwLfOP6f1z+aDaJd9gf/tHWZrolxdEmtqHH0sUqEqXb1nBAEj3TV1aEHsm7/uMv3XXtmk0DQeoNRza43cHk/JjPL6RwII1sCa8X8y4tdP5KH5GYGU6dIQDup7HykZ1qaE+aKRj7vVUQ2MfPJsp7upSIhaBmv6mspgLhjHS8zfovN5Ecq4RoND6RzpadQeKCYo4xERDz3ASo5aUF6AksrQyxfdfXSGOLDIcmci+mb0OioWspCktE7YJkI9HsO9DsXrMVynWYdRlZ1A48VC32B74//8seoaPK1OccmkQ== X-Forefront-PRVS: 05214FD68E X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyMDFNQjAwNTA7MjM6R3dXMkg0cEdTTkpHaXY1T3BaeGdTeC9C?= =?utf-8?B?VmtOUlVLb2krWEFiZ0V4enJieHM4dVpxT0dadUJTbVYvLzlQZVRnRlJHeXNv?= =?utf-8?B?c2xHZ3JSYXMzeFcvc3Zhc2dJaTQxamtEMllCTVQzR2h5dTdKVGRFWlJrSGM4?= =?utf-8?B?V0I2SEhnTkdPd3luS1RWUDdTSVU4dGJrOThZVlZlQXZiOFg3b0RXd1UxTEZN?= =?utf-8?B?SUN1alVMdGlJcnRZSmo4VktXdTk4dGpVSUpsZWFyNkZrZXBIem5YVzIwdVhh?= =?utf-8?B?OE03UmNCZVRtbi9hWEltVGJjNW9ad1hvWm4xRE9hS1RqdjA4RTQzd09sWm9T?= =?utf-8?B?NVhJd0xuUnExRXlXVFBvV3BucnpRUjhuOGpsdncvQ1lEblhGWGJBNGFjQnF3?= =?utf-8?B?WDZFZzU3Y2FnS3l2aFEvTXM4UDVLZWNHbDlLL2NNSVZPaGlQeW96S2VFMjRi?= =?utf-8?B?UE4vNi94dCtKZFdmdlc4d3FDT2JhZElsV3VMaTVlVFZWYkdrOHdnNVpJSTZm?= =?utf-8?B?QU91VitPNktSRzlSQTVPUm16WkY2anJwdWVYNnYySERmL05pVkNyVWxzRVY1?= =?utf-8?B?K25YTmtTS2ZFdXROdElqOURWTnhSNHRnQ0VndFJYNXNnMExsVFdiM1VYVEgw?= =?utf-8?B?WkZDM3FSL2pyRGFXUkY1Ymh5T3hlTmZIcnlLQUF6M00wWWttYk5qNGQ1T29Y?= =?utf-8?B?V20zY0lsdUd5L1BVUUcrLzFqdEZYR2hVZzZXT1BTbVoyaEtHcU5FMG5nc3cx?= =?utf-8?B?WFJ4QWxrSCt0bXcvTEczTVlqVGFSZVl4a2pjcktHRm96YjRIKzJBd1IzbTJG?= =?utf-8?B?RThrTWNZL1JNQ1lRUHFHVFNlRVpOazBGVzNXbk9WWUlTV3hlUFlSUXNvbVY0?= =?utf-8?B?N2I0WTZYMElFTUlXNElsdy84Q29VL2hMUlJEWW5zK2RNaWZIY2VIenVudVhr?= =?utf-8?B?NEh6UzJWQmVXQXU4bDgyUUpYelFkMzVrMGJ5YWh4ZUJ6NE9hVHYrWTRWNmZE?= =?utf-8?B?SkdBVlVUTDRjcGRHYURnQ0FOVjJmbENQVTdMWU9xYWtJRE55cDU1YWNOVUYv?= =?utf-8?B?bFBXbXd2cnVBRnFZaTVndE1zSjV4dUFSQWVUQko0M2kzNUlMcWxzQ096QkRL?= =?utf-8?B?b1hvUkNYM0RiNmx1bU1BUGJQb25hYVJ5NjloZDZhMVZ5WG51OFMvUVpCd1dr?= =?utf-8?B?eWRvZjZTTjNuYWNsUUVnRFJwbVVsa2wzQjh2dlMrRkt6a0JNa3p1c2VhWkY0?= =?utf-8?B?T1Y3ckRHejc0dW44TVVFYzF0WWROM1NrQjRoRlVoa3pudzFFaGtSMlVJWFNP?= =?utf-8?Q?8OQ9hT3P7faWCjljHZ1m7cMtpXXdzjnuF0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0050; 6:sjG4u2218wNCXNONa6abrwu5hdMDz2NLk/S155K+3RXnSsyZW46348lt66KzYx/XEGDYRiH28zVAT1+9Ha9mX+c2pzyDRNFNS0YTv15LTTCZsoFUWVWlYWnk4ue/AWXA9Y5efzQ55pW7orhL7m8X7GqC34AXn7MHV7Zh4mbx//ro0M/m2wdDp/et4ffZyvoyJ/UXWDfIKE8+cSLlG0l24G2Ay8M4xgqpk0le1AIb854hHVJ5Q/s2EzI6bVcdiiqsIiJ4zD7QNXoTR+QlMrvm4CpzB+GsZJumC6VgKMisRNrMSofUaw85EBeTLh8/mBIMO3peRnzc3Yze85AlOnAQRSwN8QLFqDeYRrB7zxuv0sc=; 5:8q6bBnbyi10nLVSyqy7b8rZa/gvGrjleqSnEiEQbHvBLTuq5QAveaTFXKOp0Ljj+7OxzcxnRJI+UuhruVB5SWRoH4V0+oJfHH2VS1BJN3jKKzus2S5lNbNimdS5eZUtqQVhHc4JLt36VgtrWlRi+7OrdINcwJe0mUrFZHULjnuA=; 24:RV10Y6oFIVEz/RGUqhBtIJj2jL5b5OAcoDcReH08r9XLyj7Bok8aK9xpqVQJa1zpqKqNlMuWHa1OQpDSmlaLwlieRFlAeYDR9gNLu056ABo=; 7:HVGmMGTtYxgaYeM4NwkTxuMBiNexxzy1axa3D/IUTjdwfCJZoie6lYRMYzXsnc3gyUFuxu9z5TFJyDRaiJGsPyc6w5NUfPZzWgeOMVtGqPT8RyFabCLcC0DcHD9Nhgb084gLdLst2CKxrWG3Z4ONCCHGOYnj91l9Va9fsH6FvpY7EYAE00UuzoNI852/hvQvlSBgHYZ8uBhxuF44TOqIhI5fOghbaXlTv4XLNA0W8l7ZhgAhau6Z+Svcbs5QDOSG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0050; 20:heRiLAgPoQycbPP0UFGFDmFcVTa4dLwYU34rYY9BPi52pCtDckJ9oEbAwr7N17Aj/oxLG3K9gMN332+tb8qYU+Sp+ItV9BZaBFNqHn+exadpgwZh86RK91fwVbl3Qz8oSfDN5aUUp3a4Wd/CfH+mh09uzj2vGW3k05HhEk7KmsnBV64o03yR0Xdfhy2DqGHwAkZvrI21KL0rTT8aY90mMgUARVzoBE6kwxxEmYBLt7Rv4uHDzGl62YH4DMYQ/+R+ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2017 03:15:44.9562 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a422fb93-7b56-4b36-ca19-08d542a0f738 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: BN6PR1201MB0050 Cc: Roger He , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change-Id: Icc8b5112570429f24e90d52484df2728c546f85b Signed-off-by: Roger He Reviewed-by: Christian König Cc: stable@vger.kernel.org --- drivers/gpu/drm/ttm/ttm_bo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index a3f908c..098b22e 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -735,6 +735,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, place)) { if (locked) reservation_object_unlock(bo->resv); + locked = false; continue; } break;