From patchwork Fri Jan 26 18:29:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "StDenis, Tom" X-Patchwork-Id: 10186731 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 D18C060383 for ; Fri, 26 Jan 2018 18:30:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C27F91FF22 for ; Fri, 26 Jan 2018 18:30:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B62C728918; Fri, 26 Jan 2018 18:30:39 +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 5477A1FF22 for ; Fri, 26 Jan 2018 18:30:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B6CE6E7D4; Fri, 26 Jan 2018 18:30:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0051.outbound.protection.outlook.com [104.47.36.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00B186E6A9; Fri, 26 Jan 2018 18:29:33 +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=Gs26FsHZt0YF8phPVQDaSlZireMimdcbJDx31ao+WOs=; b=N6719K+QsspvwB0dvm345RFHC3YP5y0U/qGL342RrSM/r5MKemmHNzTOmXB3nI5oclEfkZsjoJBi3aYb/qr4/C73Yossy4Ap9CMy0oThEdjYxV1aZIRPz2/1iM4QNy4K/K7ecVlqlOx0OC9Hkud/ImBl09v0Oc91ZJ29C4DX4io= 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:32 +0000 From: Tom St Denis To: amd-gfx@lists.freedesktop.org Subject: [PATCH 09/12] drm/ttm: Fix indentation in ttm_bo_move_memcpy() Date: Fri, 26 Jan 2018 13:29:08 -0500 Message-Id: <20180126182911.20761-10-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: 1f6e19e2-0841-41b5-7d99-08d564eabefc 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:Y9WhvBXizK6aIqRQpRmL7Y9xD5v4zin+KU8niP9LGewwouHkgkU/WIovNXe7dj9kO15gJlu8kubtfOS/MFPv53xeo94v8h4Mq1Qjnqy5pnuh3XYxL3J2FB6f5SiFtys+Vd/dsBrP/DUnkN/tzcD3ZxdPpbdK52MEexo3pX7wLdfXxxdARad6EiedkdE9yT0I1VJN/3dejdNAb8rtMYIsnWQAguTs/9lH6GO6UfwB+XEBCgjotE781LN/QYJis9QK; 25:Wx205UWfnBouZSacMomNfEEgHtZYc80hLx5/XqSPZdGig51IPD9f2y38z9Zawf5pGUH74CKfVUAlSVqqXjOak3c71/e9hSFLlheK4giuEgojRVYtFAY/DlD8teOYL9+tFKADKZyyr3bg4MV/X61lnuqBhm1J1FqyTiN3xPxICVGcnY+HRjvceSioB1xIQ+ZvCVcaDb3wRE/M9seb5iZvSnDUBlKSWH7nIru4+Tdr/cSJX9oCGrWcyUP99PPY7KYGnE5VYWfa+r1WOLHZxqBlCJ5qv2EmJCBnW7YdSx1i3m89gdzmWz8OzhRFk3OecUY1PTHAazQcBCln7Ccmtxtu2A==; 31:2w+e3bo4XV56sVbXXCTa7u94oDidxSuF6hwcShP3gdSWbAk4YLZvS9BYCT7Ve4bUyRlLKXwpGLMHpALrhzZbkJfSxMw+IfFcyCtZTQLp1ejkpulkbzUNUHs8Ud9pBmRZVSEiKBAUiryFKhBm2o7MmXozRo0d7iAXJxxqy2ANb6iZBx3vDWUICNRzlQw2T+hmrdyehzEwW7+NDj017USMTdWu72TsvEVe52mXlYHpvWI= X-MS-TrafficTypeDiagnostic: DM5PR1201MB0076: X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 20:tgViC2r24w5HkJd9wMt2E1+4SvAXsGYxvx/SCuRmj4quDErK93WtB722cUNL1jYYpBnFb2A575S23VG51QD3h2oH3nl5ckyN8KUUzygzgG6LI7MUN+zQ4eHUVQKh39EXqMsjO1XmBQ4NGj5exKHf5qs9EpUiQKQnxFIrUmngLgeq1tTCo6FTZtK8Wm+/DslXXsm0fFbRhGlJxL5+Nozi4cPckuDuSvtths1XhXaPd3a6iKnfrYZevcXloVjzAYE33YVrCNYClZ/e50bUumKmdSHVLayANoS0ECviHcJ+w/NRGOer25DvCzWlg7g/3eDOGMpAmWwRLT53yUhKk+UwYTISt3LvzI7JMS/H90hsQNNhpQJOwLeWDaMNhVVHlf+3fIy3AOVBL8t17aNcg2T7+Dak+EBGcdT31uoBvVAZsghfW1Ul19/clswCreME9KlIQwvw/fdgepLN3XoUkO0Lcd9imYta4eHOw9SV+oH+I0JbdmDPt0woCv5JnV5uj8cv; 4:SHR6on5beDTPq5cNM5eNK0JZNJJtx3I+MJt1QzhTdTyZbJt9dulXp+ukYXtSTtDjbAcK16WB5XQH0wVMk/Mcg7Ak2c6S6hKexM0uSXfjfDgIfOi0BMYPyUP5V4EdZ3n0NfGv8Yc9jfanWaX7AQGptt/K8VJzeEgynGdWeD6xkmRgmrSpP2oUM9gpxuuzpy+8q/aW0d1RLhxPhEkisWtytVn09mo73lXjWVIBA23xnUrpNC9UqeEe4rK1/YJwJd3NcPptc/tGy3tl6Bj+U62VEUuF7jrSg96uSVzgEpyyU7KARK03+gFekc066x6Qmx76 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:E73k8y52RBkdfzg06X4buXJs4rO2jMQstSqi4l6?= =?us-ascii?Q?bu7e2iJpfln+wf7Fdo85MbPHucm9IvoKCKkyoKYrPMVJWRlHlFufkpsvRa7c?= =?us-ascii?Q?WC5lUn7nm9pGw7v57uXkR19zrwcg1ooLonzVzWQzxjJkTnDqAWOR53Dw4dUM?= =?us-ascii?Q?fOnpaz8H26x/CMSXb91vzqJhR8b+I9OH5BqA+ts9apzf0V+a2HhHhcIEUgsF?= =?us-ascii?Q?8SQzuo0FcMA7WdjstXqMDSQQQGRIkI8YuAxZarBbzoIhc5OofNqxxlqY5/fG?= =?us-ascii?Q?wK5fwi9tAQ03GldZXO+vt/5LsLU7CkZH8CYQu6ytlYv7J07t5pINSpc77eqv?= =?us-ascii?Q?xN7c5e51T86Ano3SWxKisfmb7t+aSG+FSCaEZcX1WhyegYpTDtH7E+DDqqOF?= =?us-ascii?Q?kZhSb+jnRzHYBsiVPy6HmxaI4FDwa/anEKBOOd2wbWiLtkxue2q8X1upE0Ko?= =?us-ascii?Q?hd5/be/ZfB/HampMchMMzARndIN1Ie5qNowBuQ+NxTWhg/FLhFgo7cUIwBCh?= =?us-ascii?Q?b48PFclIv7lckBzOuvOEQvYnw8Qe0BI3+/IIfJkbAS+NwV0tbXFd4fl4eCQq?= =?us-ascii?Q?fC00zyDq7K0O2wNzsr64ULuokyFxX+Oe9R5LIAFIIN+hDko1XQfXLBz1pZBF?= =?us-ascii?Q?+uKWu7VBbRODFLOnSaFPb43ZDLwIbYNxkN82mKFNefznx8p704WU42Dvvx76?= =?us-ascii?Q?bCCmyVcHYjdKSWXJ61dQ6UIqpV98cO8wiD1AWqiJ0XiIs8VnDxJ/LlghV/17?= =?us-ascii?Q?vEXVGeSmWtzbMDlTX86NZLEXJgsKPtmR+w9NHNVNp4heCkZpqAbhES1IaTq2?= =?us-ascii?Q?NLmthF0TurnB65vFqDLbJiMHWYhLMdPqABbradHuhoS/TFdlkNxyLx6D2cXf?= =?us-ascii?Q?7qxZ6kK4VGAYm191NOPokUsPgWgQDFtneRDMZ8yp4gTBpARLGQ0tnNKhS4pV?= =?us-ascii?Q?zxD/y7b5ECL+Q+90yXF2yytRYr9VFwjymvcwc69QVzXh+JSmPXMCALlDELZr?= =?us-ascii?Q?QYV3bsCTsshDKs8lATnZOsF4yVCqTMCBvRMw+4w5mwy+8A03Dfp6QEgBjan0?= =?us-ascii?Q?AuxYF487QmxTw8clRiMyLESY/3uQprhnYWR2P0jGparqA/1xpBHOJdC182SB?= =?us-ascii?Q?Nb3uc9U7h2w8jYDwNzBx9oTd7eWNW8+xpsRUinks2JyYBDU/BZ4ENQ73fxoB?= =?us-ascii?Q?+mFGdsx7XNFZfroQ+P9DkIi9FCKAkQVBoLEiTZ99piwaWkirAEp8k2QC+Cg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 6:rFmS1WD9+AKyIaW74uChCTPuWPpYw5CcKXcYVmVQ9WjsHWvcrKHNVNYzWcTicwVfp3s8+ckgzZM5f8v/RfOXZNsbKeAK4CXzVvGDQADeX3Nljnn4WwITCkzJzvxmjxHCrjaDe36ZO+L0CnU+lkCLyOIqc9dxzO28+a+8gO2hn95EuoojyJA3t1I9MPKPGWwu9nq0OjGhaJsJD3mo3gUW0NjwhYMN2r0GjozB8+1p4WHVim/SyehAOh7lHZ7D/ArDbatQDpuwbXy8YOjwQQxyg2MB4k0G0e3E7oiO83nwxZX1rLeXRNxj11GpBPeFnqqaYzbDIT7ILzZamI99k70FlFMJWaRs9hoQSsYQFncFKJw=; 5:2TbcH/nZZDlqxk79L/qtsPTiS/7B4Vl1qrIYORkhYt08DYzKlnztJ7DoajYl+p3Txko399yOR/4t3lf+0bBXQGKCjFAASNDY6D1Hqa2jEn6Tw5hamEgWnhrETh4tEbbSRyf3Gz8zyd7uo3F63UWXsu61TVefey011S6bYLps3hA=; 24:AgspkpnuTRgL7W7Hs599lG2FCSx5snSxEPTjukdnwnlKvVFU4KI7/NOIlC2e/fmB2ZciPXnDhW7544q5cZyHMKqZfWIM84v6WDfB3Y7nkPE=; 7:p4++4sWhJmQ21FBW7vuiPuDgjvGQuTiRAoudwh5hcYdkPtpFGX5DvFZnfyT31aY2BpAquF6lIH6/pZTSeyS2hQ26W5zo9QjV+3i2sCGpmlsSSDmnRzCld7+nVsRGy8SNRhEIf7/rG/snOmpSlP1EzvbBbuiNrEjG/O3J8I0bAPwxLP2nEkcmXH79HaYvdc6WqAw9gwflc94F9n/9+htF6AxNNJOa32Wx/DOnlMZxxaeN4aokl9/gV6zGPs5neTeA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 20:QHnNMmN3rmzcAxwv0rCtu/w/EP4DQU3TL+41tPoSjuzfMEpqmeTP696uVuP7XYiUUh5JESiuk+tfIGLfIprQtc3hfov+la7CxhxxV2yGNn67du5zOJ8MbMl4aDAUkUNJtajfi1XXoKDA9W9+GQef1CU5RiQi6/qILZeBk1F/I9FokkCofQ1hVgzufQMsZVSeIMdiT2VYhS3O8RTdfohF+A4quYvsbzDcyUbJPLecMdMrSpUK/h4uWq7u7CpBkBmW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2018 18:29:32.5730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f6e19e2-0841-41b5-7d99-08d564eabefc 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_bo_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 153de1bf0232..33ffe286f3a5 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -402,8 +402,9 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, PAGE_KERNEL); ret = ttm_copy_io_ttm_page(ttm, old_iomap, page, prot); - } else + } else { ret = ttm_copy_io_page(new_iomap, old_iomap, page); + } if (ret) goto out1; }