From patchwork Fri Jan 26 18:29:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "StDenis, Tom" X-Patchwork-Id: 10186725 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 4E7CC60383 for ; Fri, 26 Jan 2018 18:30:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 401C4297F7 for ; Fri, 26 Jan 2018 18:30:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3478B29BC8; Fri, 26 Jan 2018 18:30:19 +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 BEC95297F7 for ; Fri, 26 Jan 2018 18:30:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA9C36E49D; Fri, 26 Jan 2018 18:29:57 +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-by2nam01on0040.outbound.protection.outlook.com [104.47.34.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83CFE6E637; Fri, 26 Jan 2018 18:29:30 +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=h+HOYz6AzrBhjEi3ghhGPblQcWB7HkBRSqBPNFJJpA8=; b=Cw8jC3m/8JWsFSq+F0vKwIAfBBeIpZdFuj9dyx/Jsx+e0I7MBH6nz6XP3Xcukc2VZ3jf7Xx3zf/Qo1917ASqEd2YMChqGpFUKfyQLaPsbDxvgZ8aLPTs66DTBouCRDG3WeEUGwsKb0H+euSRliiamAd9EbZYzRm9He3/GUgk/wI= 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:28 +0000 From: Tom St Denis To: amd-gfx@lists.freedesktop.org Subject: [PATCH 05/12] drm/ttm: Fix indentation in ttm_pool_store() Date: Fri, 26 Jan 2018 13:29:04 -0500 Message-Id: <20180126182911.20761-6-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: 9f7baa7d-a021-4e4e-7300-08d564eabc89 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:WbYL99x+YYbkxmXCU7xqtbKZEITJwb0vCvbagF8THaiLkUWva/FSgXFjFJu9or4Jg+M4zsUZe4OGgg8SFxeaxXmKORlwE5apcWLkOHh1zR9oVAGe0TaPVvLbw4mujds60oVkXi3U3gt5zFY2teysCgBErJcn7qMO7cGx/Zc7x50X4Hry/U0k6FlPsWc8rKemPFWiU4GF5ODHGoC8zmk5auETDvrufKky11/S8Qbeuw2fRzl7Zq2cRiy6rpCIW9pf; 25:ZQAJewOmoEixk7GU/OvoLJZQ5HbYxUmFerMeWXWG56Xi6IXSlsKdchM7W9dXfnAHtS2vk4L7vvq4JRmfFtGAr2FwMNM5jOMgnmCMaGABKATLYZ4TXKwb/OEtqSaxqizDruUZZbuD0kR9+bVMQKL49tWO0CVbY7HWk1aI5/O9RxAPAtj53jbvqjjj4KuEP1oi50ynuQT1LjdpARhXTA+QmI4Q2SEzcI69dCWYCFY3wgCNTEJBlfS/UldFQQWoclKLXnf62oRjRE7LFtpawaO8rwcQ8F7rSSwVEWvzHlusHe66wxInCjPlARVGwaibm4V2Z+wpbHNPaTL//Lw7bakUdw==; 31:0N51Xb6nNs3Px5Tmt1H+NFEElqVLMdQxwRgN0jVF0jCwTH07dkwIk8mw0ycilayOD27ISfBzmCbGNGgWFdO034rgP3LVqQKvfesUFtYddV4+upFdRLqiBbtMk39Ti165JeyNyAFjCTkV6kBkpCK3t3pnHqhKoyg+vjHiwd9aXCPFG2+Zqoq62N8f5RE6Yp9D3/LFq74XGQXamhXVFiTkX0lUrrQYNm1IKGYbCLj6NlI= X-MS-TrafficTypeDiagnostic: DM5PR1201MB0076: X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 20:JLPBSpF2BUoGACZkH8h5g0tMvKqjNAwFB53pidZUQS2+D70q70yBVv/k3BAItvu9glrZY/lS/NreanEGAIZcxH2xyLx2nc6RqvacarwGtikyoO+iZzGI4QFGZ+8UrFVWm59XnNg68sUg3ugLFB9X7c0GaJ7g4Yp5mvsDrce7OLrayGwX7NAyj77wy8ZB0jeGtiQ5kJ6NcGpmhICfNnSBMYSlggOPtvIf0M0UUrbNWlJkTou6JeJ05xdEY8TeTaVovdQb1zEjTp7HWLM39OkAKyZBwjirc8mRoSi96qvMQ2qvlq6aMM3ow0n6OLmAdMx6Xn0m/WaTKD48c17xcjFsRQ7qLvgyr+OYtyAKBrPGBTPlwgbrT1cQnhVdiRHr41qip24w4IauyQICbLiEeVlzIl7wW+tScd2jDtga+lsaJDma7HU2u84wXLaRDDLVeGg7G3KXIJZSu+bnmv+fuC4v4jeHccWkYJFhHUTaP44HyPoIQiOI4W4uwyY3Xx3pB4TW; 4:RXy5TLhkh5tAHs64IoJwQfRSO+LGXf3yNPmrA6YAJmMtxj1cfHF0tjtKC9ck814LwCMyb4SV5PdebuK1A2sS5RHJYopBXWI06/2W/xaJpFvHOZ25Yr7euGmxBLdsuZ84EnnRhrMP28K6cQmNGpTeP3lqApPjVM7AeFbZjRHtzaarB7nkjaxIMxYzTiSEfwd0LcUdel70HZZOKTBxLcKD8BPfbG0ZHpAMZOqn13dkogdHQqWBLNv3ckMizW6/qxIDzwFbv863jmVlAUoYOGbPI7JBSzOLa0tjXs66nz/okfz7XIzHrRWHj0eFmDEsnq9x 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)(575784001)(8676002)(97736004)(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:ktG9y42YwquvOdITCpoyY2oDmb4mJHxXKdtKbiq?= =?us-ascii?Q?+zhUQFhpsE3rx4BjRJkdq7yVcydjYgcebRMAAp4YR4uKYOmS2M3lLDDUhLap?= =?us-ascii?Q?6tXjAIs5xnRZGzFoXxbQ65rsupf2/wA8TzTbu/EXlgpC+VaL5PqupYgj02LQ?= =?us-ascii?Q?DnyBJdD3Wdh/XxQMAMUpn2RhR1G1sBv6tZASuk19y2fvy+JZEo0FzjYDb05t?= =?us-ascii?Q?rUdIBQMbzEFnDZF8Gjup9k66d4YQOs9R6+nOQMhhQ9eYU/LUgbnxeRP7qJdm?= =?us-ascii?Q?EYbGCXeGHnFUK6ZD2+LxUhLe6wcleSrdz4SLJHEIgUIbWdVlM7Pk/17o9sjy?= =?us-ascii?Q?RYu55jSais7xDncSM5kIFlHS7uc8DAb0O+58pVPHuHN8T/EPTVD3sCuMQCJB?= =?us-ascii?Q?G8xswOvufFmtMpnvQnNB00/K18+F62U8zUGYUNu69Lcw33eEEsJqasseb/MK?= =?us-ascii?Q?Vp0THaWe5JQfrBE6q9NT87v5G1MD9ZN7DBu5m+HfrBYm+T0xGXQSMJHqpQBI?= =?us-ascii?Q?xxHdNiRw0A/iRtJ62wWuJ00IvJnPWBjIG92glh6f2V7eIneSDXWmEh++FfHK?= =?us-ascii?Q?hbSgRajzm6LeK6vjQ3xYMrMbO2qaa/mTOi7ld4R17Oz67s5s6m38iJAOtSSA?= =?us-ascii?Q?xLeoQSYqgjUTcVzESlz2+hWI+XH8hd+h5cJseBvrtC4TWcUfaDnMeu69v8Lm?= =?us-ascii?Q?UKNBAnMyE8jZ/OY+9ua2viXFcN3ffaR/YI/w29PTbPE3tAnbQl9kwflIwbRP?= =?us-ascii?Q?6BbCDnC9RskBMjxqLuSNZtcUBFpUdSawGg1HE/XDU2MK+5cO2WJo8dWhvKC7?= =?us-ascii?Q?CSnGEAC1rqAdeasblIP5O3e+QacCEs8JmjbeORrU7IqFpxGo+fljeBlQrQJ3?= =?us-ascii?Q?U1PilkxOj/Iq+obzqhwdVdoDjIE73hElnXTinmADm1ourBgGUAad5608D7wp?= =?us-ascii?Q?lVcjj/tFhXWWjdI4cNpSzyMLs10MC3eluppsWOpusdAVnzfnFfwmPrnBIWcW?= =?us-ascii?Q?hhmDgLsoilvFR1YxYSP4e+eXcpdseKjzHt2vMvb6Hhle5vzh1p0giNYntEjs?= =?us-ascii?Q?xWDVdzRlC1Y0r2tEdWqwsuqp2RZQRQS/HkD7UCQkDSesJwkVqY1YWPW2Qw53?= =?us-ascii?Q?chILyb78TuDnVfQw1WkJt14q1XgU4fbk8o0PpjDnIqk0DC4EYKR58wAtYBzH?= =?us-ascii?Q?aFVGvfJP3z0SgMnzakVnrDHHASSz9eQkk0rBPuuhRQcA66gKq9jG5SGpfHA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 6:vX6/eaF09a97x1JdNzsBN9yZETStLx5h7cRK1VRRDV9/Ksg3JiUblMPGbzbCu/7G57Co3vbjaPMp/DZxFBv5BPqhCzufcYccqE9pgM7QCcWsOCmByCXsDzRlKND/U2AvIOJsBtht930gbjgwy01vgMf2MXnvJOakljuBcrAPObHa26tNkoNpPM2zK6a4jVr0BStBnW9WXSnLC68t6/+Z6oy0GUeQBr0zx34l46cr/0L/jJy5KKyukPbY7ZFW+EIq6BHu6+fIrVdL5sDDkaiLfO9g+zsWxOY8NIiG1egh5+7FJbryolkl0SyJ5h+zn/VWxvsHO3fmIDMN25+yzOuNurw/3TvnCopNH9o0Xl2sDAE=; 5:Ccnj3bazy8ZaUvHR0faYEjDagYyZ8LiahZFxq2SSlBfRa/a5/wZt5FjyuSGHSHRRXnaj3HJ6UtB+FCvgMe+rXWB00e06Fwl/Mg8SYEAdJsLYC+tso2s6ouZhpUFgEnvfYM/DitJm2GV7AonJAkRB2N9aBifAVZFWLrpkRfjwKQQ=; 24:8FsiAv3xU9ZeUOzsRL6yTSaQAEmp17lrNZWhb6GApYfy46si+hGkmuMkSlV2jeX4v6xaeTBnIgodrEV82A3jFYalfOhgUMl9xilVCLCnDr4=; 7:G8jkfkomnXi8+THy2OrE+v6PUcqTUm6UzHFBiSUuwsRXNmqE9FkXbSz36C9IlnatzF/qG3DPNfG45rmYspuWbXW0gjxcRCBcf4S3MWiFMjejm9/Wn5HG/skm8dAhBITj67BcPHtj+dcLBbay7z4pipwF7rL1I2Yy4OwM8+TdqQTKhPsR//aWlZzWtqsE+2nIJSdh2HCxLVKi3dkbp3PbJSloQmcs4yTskJ7OhCGY4ndNdjIZRVqq5KeEk5DTqojf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0076; 20:AOx44+jk9ybBOzb5JMkgOg7HivEyxdOppaOy+380SrVhWtA1kXyYmJfMqVkuOzeywVSjm5z0HmKp17zNzMmmuT/HKL4r45uTxV//ar8W2ehiTUgZfxVjKFi5nqKgOKm5uN+Q8waKCzzbD/h6RhSghWY5iRc+jupmLeUb/8ncTgWCXA3pVOZEoqqeEY6H0VBRWkFNDGT1XgokWloFc/vId+MNrTSH4ezoIX/DCwUklp2NqN+cAAlJWrCVD5/VUK6M X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2018 18:29:28.4792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f7baa7d-a021-4e4e-7300-08d564eabc89 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_page_alloc_dma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 9e90d0ebc773..647eb5f40ab9 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -210,6 +210,7 @@ static ssize_t ttm_pool_store(struct kobject *kobj, struct attribute *attr, container_of(kobj, struct ttm_pool_manager, kobj); int chars; unsigned val; + chars = sscanf(buffer, "%u", &val); if (chars == 0) return size; @@ -217,11 +218,11 @@ static ssize_t ttm_pool_store(struct kobject *kobj, struct attribute *attr, /* Convert kb to number of pages */ val = val / (PAGE_SIZE >> 10); - if (attr == &ttm_page_pool_max) + if (attr == &ttm_page_pool_max) { m->options.max_size = val; - else if (attr == &ttm_page_pool_small) + } else if (attr == &ttm_page_pool_small) { m->options.small = val; - else if (attr == &ttm_page_pool_alloc_size) { + } else if (attr == &ttm_page_pool_alloc_size) { if (val > NUM_PAGES_TO_ALLOC*8) { pr_err("Setting allocation size to %lu is not allowed. Recommended size is %lu\n", NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 7),