From patchwork Wed May 30 03:14:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10437557 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 84E3A601D3 for ; Wed, 30 May 2018 03:15:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73FFC286DE for ; Wed, 30 May 2018 03:15:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 651DA286F1; Wed, 30 May 2018 03:15:05 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 90F44286DE for ; Wed, 30 May 2018 03:15:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FF486FC45; Wed, 30 May 2018 03:14:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0072.outbound.protection.outlook.com [104.47.33.72]) by gabe.freedesktop.org (Postfix) with ESMTPS id A29356EF48; Wed, 30 May 2018 03:14:55 +0000 (UTC) Received: from CY1PR12CA0084.namprd12.prod.outlook.com (10.163.230.52) by SN1PR12MB0765.namprd12.prod.outlook.com (10.164.26.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Wed, 30 May 2018 03:14:53 +0000 Received: from BY2NAM03FT004.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::200) by CY1PR12CA0084.outlook.office365.com (2a01:111:e400:c42b::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.820.11 via Frontend Transport; Wed, 30 May 2018 03:14:52 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT004.mail.protection.outlook.com (10.152.84.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.820.8 via Frontend Transport; Wed, 30 May 2018 03:14:52 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.382.0; Tue, 29 May 2018 22:14:51 -0500 From: Chunming Zhou To: , Subject: [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations' Date: Wed, 30 May 2018 11:14:46 +0800 Message-ID: <20180530031447.27119-1-david1.zhou@amd.com> X-Mailer: git-send-email 2.14.1 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)(39380400002)(2980300002)(428003)(189003)(199004)(106466001)(105586002)(97736004)(486006)(53416004)(126002)(476003)(186003)(77096007)(47776003)(26005)(2616005)(51416003)(81156014)(50466002)(426003)(8676002)(48376002)(336012)(7696005)(86362001)(8936002)(356003)(53936002)(81166006)(50226002)(575784001)(5660300001)(2906002)(6666003)(1076002)(450100002)(4326008)(36756003)(104016004)(72206003)(305945005)(478600001)(68736007)(16586007)(316002)(110136005)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0765; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT004; 1:PtVp29NNCzwsJHdlzi5Kt2VvrTmhlHFX4eSLZDVo98cqCyP5+weq4JnuQCi6h5Pges/kvj7DWVfqJT5dpkUInAJw8y3Yy+yRe7Em36voO+0Ltom4baUVuDU8Mc2aw+xM X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:SN1PR12MB0765; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 3:3+MmdlhvoBykPEoi71/d4DiAalGM/U3vwDtH0gFKQY2ktrkwMPYuB5J/0GYN8+nqXS1DGJxdoi1JP51y+OGJGr9G+GVvD/WsCT3dO2a0V8hTLIGgSPSQZDQP14skQkJbo1ix3BTBKbR9P/Yuj7a3FOY1DGyAt532G5wowwQCVd6Lnud5vUtLaTmwkpojgSgbg5Mr3u9Pswgf4h/ykBSUfRRxSoaDgdOc/Ds0KomTCj99yTbJ7us+7FKzY3HpaiW0kILD2wfEgNlTrEaLplm8ZUEqNpa43on5ZFw59orBifm1fVAxEqOCaVns4IntNl0dT1FWrblW+UPu7xaKWYJxdW65X/MMDilTAMnU+ytv2tw=; 25:X3ogvoRLrSLdykPGURItOG1UgsVgUuMwkzL8nphuPnWyJJxumrxmKPBWqGdyHblOd2rQGBtL8O7I4JylpM06SkK65ba3fwa+NYjNJx9eoa/xaNgqtgHdGVoEUh6PTCKUe//kEQLePtVonTvXo+Tm9rprSdbnCYR7RAgtjLYSAE/WkvZ9ICBWMzxlMSQDUNflcj8hbKmVhiT0Plaw44OidgHSEJmN0/jrmjzrxU4XBJgRgrKuTQznV7VU0uk8foV+Mgvnk378csXIA0NuTzIslc1DxcbBz7kVQdaa4xgc4UI5gF7qmBW/Jqb3SQkTD3sQvZKrsFjStWiEFNs66u90jg== X-MS-TrafficTypeDiagnostic: SN1PR12MB0765: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 31:jSM7+46iowswQiSm0jzrrUZEOKW2N6M08mCpS/eZKDK12HAuLJgns5d+1+Ijq8m2yfVNsh+67FZUO5NtANkpe3sF0b0SA9Tn5zocHhYnkVCxLszetU++8ljMKrizG9j88hbLyZKjROJboluZmOV74FGtEtcaNVNbFjQEEhzRTP7/pofW79SRpHuehl+n+O5B8FOGSIDurt/9q89vOwGrSZc86S6EOxeMOhLG0nADyG8=; 20:ycUce4ThIUIMDMTdElh4IzwUg1y8L9HCzFOqlekrFwcuDfC+fTAqAWmmShcWFAQLfTUvIejRGabdvyYK6p6uCG5rDjio25GDjcUoYBrlp1v9fIYoVWJKV6l3rxhUOqsTFOcmKf+MT+vY4W4PHvvjxVokyg0qaQcBFMj0F1XqMbloHL9QRr5gt+2Yhw1mYF+fZhmNNcReFTtbwvR50biVbzLudJeEjlMiv8vglfmLePBhT32Ij4kR46WeibaYFDH6ZNQKaeQIzRSVeGlSGdkJJlifm4Nn+8FKm+WZbXPQYZHWgtfQQBdr556CAzW75HEUYXzoqOpDIYxMI8n9rSnxHICZ5NbzF7p6zz+wR6g5wWSRaReWIZuPZmhF6ajRpqu0AP5msx/NF/5vypWZI1v56CZGSRjfJcOVpzXx650gz8mc0Xe8so2k9JJcEc71zKcVK9w8lkcj98zOtUz3hDjFMizUe8ZPfJtNXVxqXgKbq3a9DsgaWWeuVwSKhoCpAfNm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93003095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB0765; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0765; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 4:OArY5cp3PynxrmJ7Ifw5gUiyNpgoo/OZa7LRRxIJ1EL6pbNa5Zo3vY4o0T65Xh66sFfN7sooUNIIEoG0UH7YCeqCJQl+TxE6+KfB7bObn5njF1D+P9Cikmru/cvBGVzGxNBDKzgAHhsE7ugyXotu3GzsVR+zlcdevdQ1jt8yInn/h3CRVwlAF8haGmTO8NiIPsS2xRg7N49v/ROmiraSgajGSV5XLGwcZP9IsRB3yVdCs1ORnIWe66c9SVXHVo7Vkx/l00v1T6m0EKpAaICYRsIKC4kCZCCgOmxTD5MvfYu37z2Ye61kCismqVL0Dczd X-Forefront-PRVS: 0688BF9B46 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0765; 23:VeYSDQGou/xx3cpIcHxTKWpe8DsyCKYcJWTE5hyh+?= =?us-ascii?Q?sjS72q1WZiE6+VO23IlGF7fZAe6mgrZRGyUqUNWSSnJn7YL6mWFL3bMKI70P?= =?us-ascii?Q?ET9zuHZB5D0jck70x/KL1QKKpToShLetwczwdoxvkzxjDsHzOKODU4roe8bi?= =?us-ascii?Q?lgVq8KGx4Lvsqg/ex84tpkh6gYgxdeaoEjSvijCeU0XxWlYJ3ZUaAx9Nforf?= =?us-ascii?Q?tajho/HBdWs2yg+RlBa41c+50NpvLK/8AJfQnaaVomXgwJy5riGwkt5dQ4FM?= =?us-ascii?Q?xgk4JwNdW01Hcm8V5PVY/YTru4/kxO5mtBT08u7TDmHmKdmGCpdY6eJUkeuK?= =?us-ascii?Q?qwlrCNZQzk8KOCYFwbpO/b59xCzRukqPLRpO2WqPKZOyUnyVNJEzHw/X0P+W?= =?us-ascii?Q?XvzBudVg5mnKx3F7B66R7fqUg4trYVhVBSsXciJT7pk2W4Z+GXmdyBjgeO7z?= =?us-ascii?Q?baV08IfqlpDiBH/8vo7XfV76KpHvoIA+RYtUkBKSoAghTZO5IoRfnj1RRYfD?= =?us-ascii?Q?ciacBzMkJ1stCfxfO4jBimMuHshrA25VXVT/o8jvqqs25sUDtOU3jjmu7310?= =?us-ascii?Q?ExXFW/V7m9I9//71cVoMYmOR7uW1mx1HJlcHe4xbjsa+IWvxwAucX/IuEGe5?= =?us-ascii?Q?T1EkxQu/iGy1qZ9t0pyeqOf7bRY5EZ6iYdlhi69MDnjD20daW1LjZkqo/K4j?= =?us-ascii?Q?ePHCmYgE7GSWnAdlEtIe6NKgKnFFJnIehfxxgBRf6Yzu+xw55ytjajS2L97h?= =?us-ascii?Q?bxnfHXFLbNM6/8d9e6idlOnxWO1RrraASTZtEBWnpeTzHMjtrVDfHtQgrRWr?= =?us-ascii?Q?iZCitzA3LT+eGJ9cGftTBCDVqf/s3fPb5Udk1BO98A1TB7yRdr0YcgdcN6ef?= =?us-ascii?Q?7Lg3UsWYEYxf2RCYcqQfQq9hAp6KR9CfpcEbN2wwRaIyL6T++a7dB4SzDk4G?= =?us-ascii?Q?EQxT1FCDB9ZkshAm2e2fCYzfurJnNTvW/C9bBgdhMNwPaHLgk9hsyzzN+EbO?= =?us-ascii?Q?ufYC+dXJ012oHboiNv/0SYh23osNPM6vJNTMc4XsWGSRfBrtbk+CpeVDPccj?= =?us-ascii?Q?cBiTi4ok9FZsEPVfkrudAcRE60KrhbHaVbk2QhzxFMXe+81ydYWM/ViABX2m?= =?us-ascii?Q?Rmj79jxqxH/Jx/m1zbQjqyOfCojwewZMk/lOHIE42bq9Nnm743nECsU4kvk9?= =?us-ascii?Q?tfE2WNwGdU7Jc0=3D?= X-Microsoft-Antispam-Message-Info: Ay2clXBX8uxkZY+VT6rFYgYVmd4MUkxdOSDsMjWKJMnNLGJ14aKdlmqgH5scknKvquxDKACFTHXJblnURxWKd1Pe/gD4MYHFQcYY+aZ0Miu+hBnKYOfygpBXSXHTYwrLjIxI0FY/+zLEU7YKBB+R0Mh+BaD4OQ1CYvTWQlCXjW2NoSu3sy9vioQ/Ts+Ue4gZ X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 6:dSgf+b2a419W06LVgGWmCUeeh9kvTBI8h+TjZy98A66XhoSPFW3RXoYsAOnnBovYYq7qN94IumxCVPMEMLA8lPwdFujBr7I1qH6j9o7CcPi+iMW8ZyjNFm83BKyHkQccM9278B0YKbKhsF2bTtM6zl7fMA/WPI7I8I2qnfr34HU7cAi5bmwalWA1S3faE+VEebb5Yo1o85a6TbRcuvi8sf+dFoYUifE3VZOQUnq08oWBr+LW1IrqmjSZ2e1QJpr+xBLv3dpsIyltGyDccSdyxYJtKu9mSdz+exQHlyuGoljbXJdpjdOxT+UTrY0+UThHFPR++HF9ri8QfmUBdKTk3x0WaOdo3IxWwCqZmoKBd6TW+lEFwModduJOjv46Yq8BIsbHI615wQ1yrheVVsn51IZD/Cs7gYUPgPamW6atXXNuGRrnkrgY6O3lSUKXhCckxBCiluexC1fjCnrlaO8hYA==; 5:X/++/dt59nDvKHgtv+UcvlMOei+WM9zDqiLVt/8vQiIs9luSNJz70oJH3epy2FEz8Tlm83WBiPsS8uYtfMrG8qXrerBnBnP/dcYaAomJiuex6A44c83dsW7IOxJ4+A/UlaOHGC5rE/yHD0/UuXxBZaKCO2PziH0/sDC4x76OPFQ=; 24:pmcZT6PdrbTqzr44HfFYY25/8jiRzaNS4FiPuWSRKXFG0scK8TmGugiJI+LDrcpeeHv21jQtfE3wKdEijvy8NcFVleC5B3aJWp22tldqXOw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0765; 7:rBHoMCsNDAD3hxIHJTJfssdbp0CVdJCHXASR4VM7GHA8HSTtCrKVKDJOviLC5JzkLRMQlcQbyWHzEop3bEtxVZf4ADxSWcehH7SRwy12msusFz3ZWWvmHaUQIYC2a6iotZpq97tHzAIkttv5oOQaEVXuDH68CRYZyx+opuZiEE9uO+FvhG1amfGshhGL2s34yoxTdUcZkm7OuaG/E2sxN+39IqeIl+PzDUpSxplmzA2QTg6DO5sQKx5NmGoDWPSH; 20:W3h0nJ2QeCrWQGSwfBDBoW+sknKqj7FC88WRDUzxzwR+aCgrYxfpHlhnh12F0mVTCntdJdg+dYsvXC2yYYR1EbPMyC0ZjvydF9RJbaoCcOz4FD5S96XMrhUuGhIFkqkm9D8Lw6KHyR12V3qGIInUkpT9LAkgNihsZ0sj6wVM/NomWEt6rbVs0LJ4KVvQSqvCLyLjCIb06EbuPfkzXWEZNYim8egKcE1EKKUy4EMRGIpDJ4+ZpL6/T/B+SSCf78mc X-MS-Office365-Filtering-Correlation-Id: c085a457-3405-4144-4285-08d5c5db82fe X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 03:14:52.6816 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c085a457-3405-4144-4285-08d5c5db82fe 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: SN1PR12MB0765 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: Emily.Deng@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change-Id: I412f5783e2839c53841e6ab665f939236bdc5bf1 Signed-off-by: Chunming Zhou Reviewed-by: Emily Deng --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 9ea8fb077aba..12f0d18c6ee8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -657,12 +657,12 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, p->bytes_moved_vis); if (p->bo_list) { - gds = p->bo_list->gds_obj; - gws = p->bo_list->gws_obj; - oa = p->bo_list->oa_obj; struct amdgpu_vm *vm = &fpriv->vm; unsigned i; + gds = p->bo_list->gds_obj; + gws = p->bo_list->gws_obj; + oa = p->bo_list->oa_obj; for (i = 0; i < p->bo_list->num_entries; i++) { struct amdgpu_bo *bo = p->bo_list->array[i].robj;