From patchwork Fri Jan 26 18:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "StDenis, Tom" X-Patchwork-Id: 10186711 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 0453E60383 for ; Fri, 26 Jan 2018 18:29:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E915F297F7 for ; Fri, 26 Jan 2018 18:29:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCAFC29BC8; Fri, 26 Jan 2018 18:29:35 +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=-2.6 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, 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 89C34297F7 for ; Fri, 26 Jan 2018 18:29:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 961A86E69A; Fri, 26 Jan 2018 18:29: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-by2nam01on0064.outbound.protection.outlook.com [104.47.34.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81FE56E637; Fri, 26 Jan 2018 18:29:29 +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=pjtJLPuhfPyRC0b9mz2a+Y10b/ql3Br058KEeGS8fkI=; b=3XAw9/Gu9og+KgGAqoqpFPUyDW0lxW1K2PrTdhKVF1w9I6vyGYhtEM3riPCfaxrUrcqYYQuEDiXcVORGSqkjOwg/SQX9jBbWqDmuddPWqxRYGEmf9Ks+hcNk3K/APhkZUyz9UaYrFIOgXsQIObqlxgnJtqzLTiHLacAH5VhsZqk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Tom.StDenis@amd.com; Received: from fx8.amd.com (165.204.55.251) by DM5PR1201MB0076.namprd12.prod.outlook.com (10.174.106.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 26 Jan 2018 18:29:27 +0000 From: Tom St Denis To: amd-gfx@lists.freedesktop.org Subject: [PATCH 04/12] drm/ttm: Fix indentation in ttm_tt_swapout() Date: Fri, 26 Jan 2018 13:29:03 -0500 Message-Id: <20180126182911.20761-5-tom.stdenis@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180126182911.20761-1-tom.stdenis@amd.com> References: <20180126182911.20761-1-tom.stdenis@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.55.251] X-ClientProxiedBy: MWHPR03CA0027.namprd03.prod.outlook.com (10.174.173.144) To DM5PR1201MB0076.namprd12.prod.outlook.com (10.174.106.18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ac495906-d0dd-4ede-dc77-08d564eabbf0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR1201MB0076; X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 3:fFlksq2EDOGWSL3XYbUKl2cFW6BmZpsj/GTBR8fei1gwQMOzca3MUVEYkR6DmtTyrZ+Pf1H6UF1Bx7scejT+V+MAjgJx1BQN5cBcTK8i2toW2f99pRDjoLlfO5Y2iUoYe/5+NHw1abVFnJTXoTHSFgkm0Qy288CoDRsc6IDKN+21B4vCPWalYwTjDfYSAKULuQM5Q3I6DWSOtcJ7DOHLGxRyJ3gIPWFrpO4eNSLRLw48g/V9XnW3awLSOVX62cCm; 25:F5IUgVgYR58OWvgLLW0YnxjQc/8KnhY+gHdBA0BYvhTbL71kJ/huwlzoG6ATtJU2IZYlaOqV1RMfE37S7h+aT3/xCXTpLKOyriYBrKFp73uA3bDBpmA3Z+M4D6tmm0CvrmA6jh2JjJm63ApVmImrzTk1Dgz82v1PKvnSROfb2EEiI8j2qsHsflaSu6dOEW/aXPxaRjogTnqSNJGhgww8lkEQ9RtAC6G4GTJP5Po2lyTLix4tFOLisXmfu0fBq5/B/eTtY6qMHd3ub/0se6fblu0yQ9Q5VcqT9u5+G1j8gHlhLr74HiP0i6+Tpks1rxPSuQPElhrPfK+WK6OFHb5K1w==; 31:JBccCOxdZerM1MBlYndZv/lFTdSmHlnCcqxKF48CvxYD7BPBe86+60+KdRgTCxVRX7DJIwmNR1Vt7h7GbTA1FsKUxXlWQ1Zl0hDucKhg+74PTNG7Dt5dP0KzTocuFG/k2y9lO4+MyMQVz/Q4NWqlpZ2sAR2/Enz4tImyRyx4d1CT4hBho28Mp8JmsNWmCtvprwVU6YTKHYAnz8Pc0pwMdfecdBLyeINCKMT3DaUq7R0= X-MS-TrafficTypeDiagnostic: DM5PR1201MB0076: X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 20:ZDmUqeYF5xTN/JQACmdt7J62Zhs79DpXOs0cEIKrOt7wbhtfeDv3t/QP1SbU3U2q91eOaiv9YNg8DFFwV6YH4rR+GvzPqLKseU3wItBuyusncNKcwFLN3R3/je3ekL4ue2BxSsQ/ZbQ6Rxx+p7KWnjOAjAauiAUw2AFpSG3IF2U181tedzy8wWayCfVpuDJA54Yp+bFX/9oCoxqLwyOAmxr1DU2R/P4CBOgKYtsyMIFlh7zdmfWJYhpMv2MVRTvx8DuBWAhS28nMHGeUx+e+ymKuwit616GAF6ETJfM0Do0PFqnaD2ZTmGtOURX9Y83Qm6sCvc5XgHcVvuTnES7cz5jxjtaAK+N0JY7VBtz/yfJkMHhm8I20BMIGbTwe3OrBZFAvAXPmT0kweJ/jOUTzabQIZGxUOXD2q+pUKTlvEELv8WPor2luEPgDj5wWfMpibbIp2YPacjGrI0uQwaaIwTV/e4TWAfGHzeo+b48mzcbnn8WRBd4PYo3+mzuEgBPf; 4:Q3xM2NLpWjYWe/1cAt3+AgLJF1lOYO6SHqQ5wBSPIE0ir1qnUt/BzMhjOJ7GqE38xPnPlFLa4o49nhRGSIHWiZQq/iSZrWPAJQGbmgG+UshvbvhoqOoynuvDJuC/vRKx6R3tAx3r1jAVneEMXpSRbYuWFaP2aAL7Z/sZbZZrvSY9NtYCUsZ01vZIFTh+vTmZQj7qNQ2RP6oeXjhrsypQnfxPAMwbQvsLyJmTR1fOKHNfttHjNW+myELThnHDBYbPT6GSINXFLKnlPfr3/YM3L+7eOcsLe4wmD6CUEs5r7ly4f8r3Csj6xOV6tJ1LSSSK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231075)(2400081)(944501161)(93006095)(93001095)(6055026)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR1201MB0076; BCL:0; PCL:0; RULEID:; SRVR:DM5PR1201MB0076; X-Forefront-PRVS: 05641FD966 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39860400002)(376002)(396003)(39380400002)(346002)(199004)(189003)(6916009)(2950100002)(6666003)(7736002)(305945005)(5660300001)(1076002)(6486002)(6116002)(3846002)(53936002)(86362001)(51416003)(16526019)(81156014)(7696005)(52116002)(186003)(26005)(8676002)(97736004)(59450400001)(386003)(50226002)(53416004)(76176011)(8936002)(81166006)(25786009)(36756003)(316002)(478600001)(72206003)(47776003)(50466002)(68736007)(16586007)(48376002)(450100002)(66066001)(4326008)(2361001)(106356001)(105586002)(2906002)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR1201MB0076; H:fx8.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR1201MB0076; 23:kEZ2kaZBpRcBQ582mZLXGPJ2KLwZxd1jn+fpYYQ?= =?us-ascii?Q?RMVGzQjzz1Ff0t8lf3sHIJOz+vco8OP5Qhauh9V9n7/J6kr7wDa9gHgm14v4?= =?us-ascii?Q?181QLDDaDC4pVZJ/AUeLPp87O7+WksGdFG03YB4iKmi4zRX7wAQeDxOqX9cC?= =?us-ascii?Q?QVC9rv9OGjAFf/DbvsGS7V8EY5SvxQ47thhH9KzGMIE2G3QTTIOzIITQ7IBn?= =?us-ascii?Q?cjBfmb9LPPx2keme4filSD4fyuvPtTeTNFRbfOkISTtpmO8H/PajhmA7nwuE?= =?us-ascii?Q?Gq0+upyWFdQsjmIXHxn8OEN4h9X1WZZVSdB7x7GgOlMj3rTFe2OkiO5buuxB?= =?us-ascii?Q?ENOZEI9JnCRLCdFcNb14nLC8wxN/XpPJvV9KGqG4gS+57W2Z0H59NYkBGOB7?= =?us-ascii?Q?3hSQzMNCf4XoYHVZaUJum9yynfx4q9YeyF40HxvEkjU35Va5Qh8p1sLOgPQK?= =?us-ascii?Q?dpC8cmhvhyD7cWQ6q5WhwFWAi54GYMzguEs5iRbM6BVr98QcDtQc1aIW1jj2?= =?us-ascii?Q?vbekmveGMjXv6xh0cgK8nyNiFqqzGuj4P0REu+Wq0rCMWZ2hVZqwXSKRIauL?= =?us-ascii?Q?9rRyQJreV67NwzFHESzYfqeWvYHDi5JROLVmCHwh7Hms1mBCNJFqumj2BC5u?= =?us-ascii?Q?r8QEa8rqotvkOPeu5aNYDeUqIt22+Iv1nbQiTfkinQEU3zpnkdP6VkIjdqtm?= =?us-ascii?Q?vIyKPyGnAD8R/Ja/sN7lDtRrvhtcX0n++5U5JkUDMzs/4nCQF4jAVspAqoiM?= =?us-ascii?Q?ZOFl/Yk39JEeZtU2NF7lsLb/2+RDgkwuIwSass04IdSd9GrWiYI16vN8yUoq?= =?us-ascii?Q?Hs3YO64t38s49bgL6ZBaOhjdwWiHdDa1TbXrC8rXwc3nf/Ad2HeN9dHWcGuL?= =?us-ascii?Q?/b4VDRcBoEj6IfzJJIwcR+o5CUXGQhwqp7+ZjPOiR1W1AhlmDA3zOa5/Q8PA?= =?us-ascii?Q?J/MtuTf82P+xde76dIUsjkRCrxgo1QRbBEXqLFsm+BUnZVZG3r6Mmlaj4tGs?= =?us-ascii?Q?mWd9Hq3isa4yfbkHr7MRx5re/On60ztWRMCTmyfjia01OLgF+d30rRrUqTvV?= =?us-ascii?Q?r0MtWAspOkavlkQw/96CNNYrlcipCvjB8AsFW2tKPQt60u6li2AjYajXWGLK?= =?us-ascii?Q?DU6mh1ir2fY9tY13mIf6r/YwA5kxJAAEwj3NZH+I9tFmxWvsgT7z8Oj5WjIs?= =?us-ascii?Q?9Be7pYDDRv/wcNUq3Wo0qlnZOyL2/khnG/J11H2hFSzDPM/9YnXjruVH/rw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 6:gwVgy8HjDuQertUbzxFQoMrVri3VooGYQ5i01wS2OIq5pc0UCqWSd1m1uMhoG45CP2valXiPP8qjAPoE+wQSIOrIIAm3OWVzzNOQ/AJcZSqzDCRpuuVbf4RjfXoWO4fCUYBjagwgV4q/hY7E4SKj4AXgUjYD2zFifYLGsKTJL6t1yr3fhoD3Zeq85J6rSlidcWrtCPIHIqAq0Nw+jOsLh0jR+y3D7EG7dzW1Nn5qtvH5VwPfXKZwjpl+7jbbTzRpMI1y2uWE2llgI9hKD0xmPv7WJf5LezSJIOsCBue6U2hBbUwNnUUwBHF+kWEFsDC/9LAwiMP96rTGf2ElZINGYfyxz7jQW6wjRh0MKaLPgpA=; 5:PNAFh+u5uD0y3rYUy16A+OC5ujcrsCPN9P9u5JmYGpjS+nUzDuyNU1ydMKAVPQ/yfvcuYaToajVB/pG0NnqA8Xf9TvdP0HalzBF+6+shfbsjstRCSGrHUksvT5UCVEsmHEkg/EMUpVaLod9v1uoEK+4ex5AxEEv5Q67JMxrf55E=; 24:tqx0ED0XdoEUSV1ocARKothhENAC88YaeW4JABz1bvRWEWzJCGbrq3W3vrzvHoM5ez7t1TrL14o9lTQGODla/Uj8UGhMZUIVjX/fUi8eoCk=; 7:0zUb/HyL5S3pNLzpZC5SRv62AEEJAihMokKlFkgMHhcLhLiX1Dxs4prSsYq8Vrxje+ds1Rdy/YzmLvriCm0F/soh4dUjYt3mliLdIszZN+OZq/TjtLgUu0CKlfqB62OTL/zDlpNZzwbwmK5BvPaEZIFGfk7r3BL6wRuSFnVYsSTyADrwfyAYwl6hbSHisSx1/glS6kdAieCqTqjtX7TaGeq6rZ1DijW36VgpI5vnMIqZWpGho6sfGSGbsTRPyoBu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 20:6tVcRzbG7k5HfFvnok/4p9b5cPQlZgzdJ3GWYdweoOUlKsswh/XiFbFFZkWQfnWq14+0jSJwKuPEbQSakDLyLgDJxQtSG2cldNssk7NZnQe2mNQ98XjLCLpGXbrYKp9g/sQDbPWY974azYcE+43cgFxAvUTWgG8e/gOYMkr+G5EXrAukXi4n07nkx9/0msThaihjHp7ed0N5NiPnQr2q3w24M5U/T3iXHY260Ac1lOpz+3pCfZXAcuzqevubMgrW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2018 18:29:27.4323 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac495906-d0dd-4ede-dc77-08d564eabbf0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0076 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: Tom St Denis , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Tom St Denis --- drivers/gpu/drm/ttm/ttm_tt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index e90d3ed6283f..95a77dab8cc9 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -352,8 +352,9 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) pr_err("Failed allocating swap storage\n"); return PTR_ERR(swap_storage); } - } else + } else { swap_storage = persistent_swap_storage; + } swap_space = swap_storage->f_mapping;