From patchwork Fri Jan 19 06:42:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "He, Hongbo" X-Patchwork-Id: 10174641 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 08FA060386 for ; Fri, 19 Jan 2018 06:42:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD60B285A2 for ; Fri, 19 Jan 2018 06:42:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0C86285DB; Fri, 19 Jan 2018 06:42: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=BAD_ENC_HEADER,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 5B6F7285A2 for ; Fri, 19 Jan 2018 06:42:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E5B36E022; Fri, 19 Jan 2018 06:42:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0062.outbound.protection.outlook.com [104.47.41.62]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FCFF6E022 for ; Fri, 19 Jan 2018 06:42:38 +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=8r18ajKnCNUxyy7Ei2aaLZBrdvxpyTuLRQdVUAReuM0=; b=yGahDIFMWUFHdt9wkFMK+ZWG9RaBWFpbqU8K7I3RefDsv4PXaoTE1r8yFRYOmFl6TKuzQbuWcVxT5VKAQVY2wNRg0sbOtMpZhBAe8bjEDeOcAQtqleFj4/qkYyoBRMAVB+pkLB85r2l6ux86ItyWXoSyvGzaJflPvD7Sv8DE0yY= Received: from BN4PR12CA0016.namprd12.prod.outlook.com (10.164.241.26) by DM5PR12MB1273.namprd12.prod.outlook.com (10.168.237.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Fri, 19 Jan 2018 06:42:36 +0000 Received: from BY2NAM03FT059.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::202) by BN4PR12CA0016.outlook.office365.com (2603:10b6:403:2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Fri, 19 Jan 2018 06:42:36 +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 BY2NAM03FT059.mail.protection.outlook.com (10.152.85.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.345.19 via Frontend Transport; Fri, 19 Jan 2018 06:42:35 +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; Fri, 19 Jan 2018 00:42:33 -0600 From: Roger He To: Subject: [PATCH] drm/ttm: fix missing parameter change for ttm_bo_cleanup_refs Date: Fri, 19 Jan 2018 14:42:29 +0800 Message-ID: <1516344149-23440-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)(39380400002)(39860400002)(396003)(376002)(346002)(2980300002)(428003)(199004)(189003)(6666003)(50466002)(54906003)(6916009)(48376002)(97736004)(5660300001)(2351001)(72206003)(478600001)(59450400001)(7696005)(105586002)(51416003)(53936002)(106466001)(68736007)(356003)(81156014)(81166006)(86362001)(8936002)(316002)(50226002)(305945005)(16586007)(8676002)(36756003)(53416004)(77096007)(104016004)(26005)(47776003)(2906002)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1273; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT059; 1:kVnav6NmblcCNuxlm8VH18c93SCwpsj70zvP5Uby+lj+hVSqzIMWQzP9Mwqu+LabB/B3D43nY3u+vXwh8aJ+VypRc7mfvKQuvjkox+BbpEy/ZT4whFGlosc4yR44ic0+ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4db9fe8-4ae0-4a90-d608-08d55f07d37f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060); SRVR:DM5PR12MB1273; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1273; 3:U7Y3qLzge8CEnY4wiqCBxCp2OA7Yun2f5PII0a3VV8Fgv2oHvd1Z5tbdyOALfUY4L85J5+Hnc/dkzR3W9lMmjl6+mdfg/8VZ6iNni+klqzcNxok/D2DtGMZ6/M9JqVU4q4ruyD1nX+Wc11n/bQHU3DsF5F3Gyk1za5cqbu/H/RGrTyC+IYhMANoXsj97d5opHbb84hpPXOcddPLLjqBlI44f64q8yuXpIMNXL21RoWWeQ/6sBikQguUsqTGlhEWEojOR1fDDJPPAVjvWg6Bq4RHKAvN/mqmpK7afOYBu2RrzTvB9cqeaxBgPFeBQi5phuEJTToXvSVLNmXfntkfGtV7L/fE3rUO2S1m4mKfrktI=; 25:IbKS+D11BhjZbzoguuY9PzWe1z3XG6tgKPZgkXb+Imy49nOnU6CHZOj4B3QnvFu7jZgJTSZJLNW2e2z/lRVwg1dY/U6HtKkLywCjP3F49Gxx8c3MMLtYKWK1hSXBweWtkwTIXd/HbpNEdvFtNyvP89iyPzfTtyC4K4ro3znfnr+IrZ31O1KKdHvczv3Zmi2JekvWDopbu8P/+13cr+4P+S0hlvour2Awjru6UXAJBnEbq0n+kXALRDpJNn0etVesFQ7wlatCmjzeudB05tij+7UDakrAhxsGdpvgb9HhVOi58v0KnJz2878VKfCmSH7SEZUjHY6Jm9AF3rjiErDmfw== X-MS-TrafficTypeDiagnostic: DM5PR12MB1273: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1273; 31:SvfaWVK4wMm/wusClbeBv+woekQn4KFCy5y2ajWV9Q4O78P/WgmYNd7u0xbsHJf/2sWAwC7I0OpKTg0uUnk9I8c1bPPQI5p9sII1f6+P8jDNv6r+15Q2aFNR/hI8ruDfG85XJ5CU+iP9ug+zfuSAZzvm11i3Ou53wkOWxXau60cisYW3JU87eVhSDKYwwoW1OqOuYEF2TPgWWDCH7henwkDypZWcqFS2YYm9KCqt5hs=; 20:KpWMXGxEuwcIpsD2UUcR0q8+1U92afm+1mTTA6UjHjE5YyMedoQLudt/kYaVM6DHpNnCCRZs67b5cN1fruoEf4r0OMs7acgSESmbuNNy7moN/fYPtLXhta9PYGz+9idOh7GXQFioTm4OuaAOjrYlaxwmdRVwabgMmZLbrURJzKJiC4/sH5TUx0zQb4dY65nEjMXJRjn4sJXVgMviWGD14ZT+NK83dxg19n0AsbvwmcaPtOZZnWVuWVBJy/UEqtmEtXAgdhC4bucGExE9bduHZKsqRHP4ZeZ+5ATac4JtS0Rd8zjrVf1dlMzFs0AQDQ88UgUfb1+pOvcQ7PVOJr1xjiNKXxKG3OkYJ3ptR5A3OxTOpSf1XTUsD323pD+2Bs0jY+g5vQyJMUCfB6hnCnvTlYHvCMwQ1J2DqdPYM0YGSSLtFfLqOfQL+sfbulDC4sBR9Ta4LjVcgFY8dgATulG3R2EY8Z1Xs5YILw/3XXFsHHQtHA1LRaH37kehZmGG+1nq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(3231023)(2400073)(944501161)(93006095)(93003095)(10201501046)(6055026)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR12MB1273; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR12MB1273; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1273; 4:j0+a/H37Jj1ntWKyOPsgF9/lHOaZfB9YHTFKbLapz+5luJWA/fMorrrNluhYkE61ndKsbh+0ZtIVPiVa8c0Lhj4msW85IpriBTlOQzXy/CfBpumb1/qOUbdB6ktZGoeAfO86dEo8wKs3BBpUnl7ejPxwnNdD4EsF/YNskTdVx/RyunMw2SyHtgLTy7XYE4f9bggXQtKGkSMkkdVc00+o+LokLIJMilNvY6qP/sY2Xa3BS1vJOHPEwE0b0lPrVzNAYGGaYNVbRt6v3ISqnF/4BuG9izJseAQjYskNhFm1HbFAnylUzEEXTiX7Xmo+jhhV X-Forefront-PRVS: 0557CBAD84 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB1273; 23:8YrNKfTNE7bitHyB9Mxpb5pWEp1T+m+yM/NsTjVBs?= =?us-ascii?Q?h69qOo5ulRZMFniOpC+P0n0THRZI1bYBW0UI8eTAabvVcT3Wu9Yf3bhbjIK/?= =?us-ascii?Q?J8JacuPSJjnhjZDvGHEm8t+nHpBVbLsLZJvMGu/vbaxWe794N4FTv7DSubRD?= =?us-ascii?Q?XeufNh++axWg7D5YyMPnGwDjr3bJVtNyxLnhoyg+RIxn68iMOzKCzC8bGbIr?= =?us-ascii?Q?oy1yziuQpj0cWEEy/1DyMJ5S29bEpznpQwKFWxF+yz+pFQmCQxa+Q2tMMobx?= =?us-ascii?Q?9DqhKvNly4Bfef6x3b6B5wlj5sRUAWL4mGgplDQHxnNwwxYEzsd30MkwmIoN?= =?us-ascii?Q?D5PmZbKSUtqqnvVdT/s+PYtdrdWJvi98a+4ebxm0BZVUayomrol/6FihaI7R?= =?us-ascii?Q?pTlA8hdSd7meRwtb1QkEUDYgEJiisvSnLkTpizA7olNfqLLZQ2iYne8yeNjR?= =?us-ascii?Q?PR+xIRnTaKIly7q3QPCX0GPJfKjQsBsh86TeLOGR8HCYw9/w8C7ZQ1rJcSVK?= =?us-ascii?Q?oObsuYMZwS8Dzy2OTinIv9E11lSMYDs8pvIYaFRbjeFyQVLsDEXDC6JR1C1s?= =?us-ascii?Q?N+kqnIll00zqJbsVzC7bGruxCbVyUI1grJm66ID2ETkWsakr8G1bd7fp3fdW?= =?us-ascii?Q?PUHu1Dogs5ji8JGqv4wTWwwy3mY22MM7CbCRfudQcaz2F48NReBqqjl4E5pa?= =?us-ascii?Q?5NHGr6CyA+Yq2IdNk+bckhM7GmeNBQ7ZxJJImoSKidmEqXAu0baxZzEqgO7+?= =?us-ascii?Q?oRJNCNmBp5quTqJ+Vq2ifIfM59MR0DasbWNBrX8UvhhLNvDjd33Uxod00R/O?= =?us-ascii?Q?rIO4TLJBxJj+7AUs5/+hCe95YPHSvzapzYaU1ZfcYTg+WmtUfgdr/EapLPMu?= =?us-ascii?Q?Bkx/2xEmZxBiKhJ/3qhQ2Eq21xq2zYvrO5fVu11z32spmRCQmb1dlhTYaD6s?= =?us-ascii?Q?jyRk/XoXExx26veSg40A9ce5HNlbkbwM50EFCff1uskoUeYhVMMNzbyiH7zM?= =?us-ascii?Q?Y8Ttu2Kp6VvbSe+VxZqn3AWWvQziDPWI1Cowssb8mHJwA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1273; 6:IKoCqvd86D9X8C2MKaiKZ8ai0YwShy0fwxgEtA1zi52DEFIYMZukA92ihVUa5HNMeZsSbjZBhhNJbkDkeqP2KgV/pSrIsNxh6Jh+bkxfuTcjhl2sFoUMgL/ir4WwJJekdyexsPaPyD4S6r9j7UG80HCnR1crEVU7TcJiotH9ZNVkXOK+XQHCDnzRfcxYHHc1pYRTGhFPybOY2FD6jcuFd+zaoYCWuFbgo3xCt0z5LDu4pSicpio3mJ+yst8n5ptFQHUpMs7TIofKE9WWMfzWrTIQPMrNYLVuQHg8a8zO1IN0svczWn39eZ+kYbRYE28b0gzXFZYQLM6UBgwYvorjv6rjzjGfqrffabTi36f+i3Q=; 5:jy/ronzm1/AJeEz7n5Xfhme0HoiZQqMtATq2DaENx3iAJ3Z4DhBO1anfTSI0+c0bO3PO1SEW95MSIl5lPLN9ZhXawV7jIfp4HCS62aj92Q9OokaYQM4X/K/Y1100+j5260L+3dxvKx76ctFwxsitkDy6HEsRUKLTS6/bhYEIOUU=; 24:4PNFaQo0LAfyXBYHn/0L0IrGQtrrok5Bb6UlNYn2PklToJzoSKxK2xaNBVocsmqDmeZJ6tUNe38S3jcbGspJUTAluHvcJqNe5+cqhAgkLa8=; 7:5Ms3mu9+k/vYPz0LYz7QKfl4EPgkNOpXHNKMk1YQDSfdiC28YjFhOOezdvlKZtcvLb0L/XhHb4nzqSh3hHTiXWThDL9s9fApQvNfupd2z4Mjic1D5E752dCspo0uNtsXg52NXX54GYyO2NEVQ9cTJdYR5gW39lzfvCYs6TFDVtY/nsOfcy1Jd6jFHgGFolcvMhLSWKvmI9ZC8kCPJM7HbCbWCu//8jFKici1q2hALJn7HdMBY+GRVdZp8SINMrQR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1273; 20:/yItmoxVmsFd1MZMrGUeH38KB+x/zYWxRt6QUz6XnfuJ9ooum2CT1RfZwZ3yodbTkcPfq4nFCV9M9L/lpe/i6lT1n6aOEkB+h8ah8veIXjnI5Bk/oJHeDKYp3ekPRMkg469MytFL7aIW50V6YlF+NtAuD/iCM7ip0k/LIc2JybZBuhDGl8gnKREK3uwgu0W1TIP+LRxofY9APp4p+uY/5nGqhOOIOIHKqrfO07RBVIYgYvVlj7CqsfHrS6d5CfBk X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 06:42:35.6354 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4db9fe8-4ae0-4a90-d608-08d55f07d37f 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: DM5PR12MB1273 Cc: Roger He , Christian.Koenig@amd.com 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 Missed in the patche: dc94777 drm/ttm: enable swapout for reserved BOs during allocation. don't unreserve the BO if it is not reserved by itself. Signed-off-by: Roger He Reviewed-by: Christian König . --- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 893003f..2fef09a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1727,7 +1727,7 @@ int ttm_bo_swapout(struct ttm_bo_global *glob, struct ttm_operation_ctx *ctx) kref_get(&bo->list_kref); if (!list_empty(&bo->ddestroy)) { - ret = ttm_bo_cleanup_refs(bo, false, false, true); + ret = ttm_bo_cleanup_refs(bo, false, false, locked); kref_put(&bo->list_kref, ttm_bo_release_list); return ret; }