From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755075AbcISKBL (ORCPT ); Mon, 19 Sep 2016 06:01:11 -0400 Received: from mail-cys01nam02on0064.outbound.protection.outlook.com ([104.47.37.64]:46656 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750790AbcISKBC (ORCPT ); Mon, 19 Sep 2016 06:01:02 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Christian.Koenig@amd.com; Subject: Re: [PATCH] drm/amdgpu: amend amdgpu_gfx_parse_disable_cu() declaration To: Baoyou Xie , "Deucher, Alexander" , "airlied@linux.ie" , "Haehnle, Nicolai" References: <1474205857-5177-1-git-send-email-baoyou.xie@linaro.org> CC: "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "arnd@arndb.de" , "xie.baoyou@zte.com.cn" From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <1ef695da-6797-105d-e9e1-04c4075c7494@amd.com> Date: Mon, 19 Sep 2016 12:00:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1474205857-5177-1-git-send-email-baoyou.xie@linaro.org> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [2a02:908:1251:7981:e5d2:5583:7841:2f5c] X-ClientProxiedBy: HE1PR03CA0032.eurprd03.prod.outlook.com (10.163.170.170) To DM5PR12MB1307.namprd12.prod.outlook.com (10.168.237.150) X-MS-Office365-Filtering-Correlation-Id: 5e4dd75a-3dec-4e5a-e3aa-08d3e073dbe4 X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1307;2:mjj0qoSDB7CJS/VyeiMALDwmHlkrx9rHMlvEaQb3CGv8A8voqOKiJiqPmavL/DqfHPjsf1aPlxp8iuulWaEjjs8hJgA7wniPTk/1baf6QHHaFbH6tqgbLyoD7DDOaHKvp5yQonCmfW+kXRsdHvrAaeGSrBPXF21sONIx+JAj5UdQfSM7NFdznNccjnCQ7JeQ;3:ixqANYdgj9DljhkJYN8L30a+H8a7X+c4G4hrB+smEQl2nSfgDQ1rgxwtOXjOzyvpHL47c2MyArCVm/fxphBGcPVVuZxgnEmsVGexmzlE+ikfJ9GcE7XoHMbbxgcTblJS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1307; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1307;25:iI12UuhAvnhLhz+Z9P1eGjw04+ejDJ5D2RkKXluwrqUZjvtH2zsHrr4cMUnQmjVZ3VVlKqqlRCyeyWVklXxht23hmw4RWponrwjGTUZ4TCwjTUKuec3gDZ+5NYbgxxlrqqENExR8WNOuZqiztezDvF/sFj9BeL267sLmyHqEvGTWgNJdIET0Lqeroebh5qoHXCwbd9Misq9s9tJaUXdiaR5Caqnc9g+ml5VTQR+GVkJXypn1W4IoTqTS3wRwSba+VA/Tr8+23swSMrmO0t3I9+sVmoHgdXVdDwj4W+adcdHqbZMXTXdNW/P2TuzLEWhM+yYd/fhuEojeiOtEHlNtQEKhOvC/mp6vfek38UFN/d0okl8TMggd8obmF7oU+eesy+KW+oXJZ1pfyqDHDoZDaQgNWyYc5wLiK7TovRWANmSBV9zP0OrWQU2j8Qek1BRXOTxUTslw5QToWQ1TDYmJlc5ZEDcj0igr+x2cxlI69RI+8c4XLEZPhD5B4A4T2s12jZUxD4Z5WON5pmzIYk1p+5so3kgoK7awJiUH2UNDINTbe2IxfrisGVpH0U1xHXOXVgDNwiYdBiF5IIe92cjzM7PlsF1W+GbNbqcZCBv5svtAi91KZw1VgNqH86uQWgb8ne4qMqlK3yMfsfO9dxCA9IIUS0fpLkQMIWoirswnVL0OZiKLw9rg8trVfq+i8DZ/ylfLYYNjsKEjbTFx9mkhDUMRkKr/KUKr+aCzk+O03m7J/1tPL00ani2ks64rGHjoqIQSTGlaLGP8L83eb2QHNg== X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1307;31:xM9HjRrckVV31GXwVZhge+hMZRy1fy/waJGwXo6pU31W6h3KHj9BUIWXsegrzp+LXQvSpYtPc3qSMAVO9x+9r59d7P52Zre303htslqQZNkufJoGWFEE1IP2i+F+4hvGDjv9qTVJ6nCcg+d4mTdLALi6FvHXscNdr2iXoIf+Dt1+pO31MdUmHWe69SJAapsNfyJ6hd/UbmwtXedLjZ2yVtOuSnlcMs+3To91q3b7Ucg=;20:xOY6Lt4zMM63i3E+Nl1tOhOUT+bQFVK9/cTky/gXbbmNATHsaSG66DGgY95woMMD9Ec5tMmVEscFLx6kCerU8CfbrQtY6seq0F+PL6e9OtMcfz4H/x/qs5wCMY3zILZWbSjQl/eSWIvALuhQ6erGoLc6iuuqqdsbMG1eAUsDClNuLzINPNNoOjqveO8KE7td88RCOETUyalC8j9w6bdZvn5DJJX2dVYg/PfjDUaR78H/DPCv8p8C8IF6PilfHnRzBkUTBss2wjumsVE+rwjIxUJ5HeTRheXiyvKxdpsNz+yxZHv6zoUaeyNi2JSJRuMI/csb4H1kFAFs14dp2bPj9pJPH07quODmVdbXIb7iP+titAcTOiumRejDYUKo3SyiiW7XgkwIfGC/NPse5WfQbHd7UmsjJQ68t7aLn4Lp/fbVOjqcZpa8jlOMnWpSH9qq1462hn9VzFYrMVA90/M8oSpyOJ9FmNDZkM8HxcWw6KtaNa60MLPQAxLxz74bxihD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:DM5PR12MB1307;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1307; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1307;4:KzbN5FWVqTOUHQSyb55UkHLN7G+fE7O/YuYJaKy9kwMsKZqGzksT6iNrhCr+V8vGUEsh2TRXt06d5rV52QE3mokKT4O86mkFKxpPBH8k1RAaJzDArj2L2/2hBpXdouEwCg+5csOfJBdeCdyZ7JFmoubKTWFu6xTOOB5Jp4UjHxj/fbQT2e6tqzRZFfHs/mmRyF+fKPKxUJJ7ctJn8/KrtjRbEuBV7Yk3UqhTISln4blbfiBH+X6udzKgFu0/Z7JOpvl7bm4CkUkMIHpXmyRA0rKDA/QIrLPg1s9jH00F0Ra44Gcx18YWMs/QGo9oAVqd72r9ldJnLNkHrvs5R197SzzrN/mrMxZO5v3BSAjnPu+wQwO/T82GqmWuoNsH4ezkvm62HGdVjSgLjkrJor3lREE7lHI1Xxqb2EAtJWtLtwoXWzZAngjVqSCBRsRt+LMA X-Forefront-PRVS: 0070A8666B X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(54356999)(189998001)(47776003)(33646002)(64126003)(305945005)(586003)(77096005)(97736004)(4001350100001)(31696002)(68736007)(5001770100001)(83506001)(7846002)(7736002)(86362001)(65806001)(65956001)(81156014)(81166006)(31686004)(4326007)(8676002)(5660300001)(1706002)(6116002)(2906002)(76176999)(2501003)(50986999)(23746002)(92566002)(19580405001)(50466002)(19580395003)(36756003)(106356001)(2870700001)(101416001)(105586002)(42186005)(2950100001)(65826007)(3826002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1307;H:[IPv6:2a02:908:1251:7981:e5d2:5583:7841:2f5c];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;DM5PR12MB1307;23:sccojpcV4tG8pPT76TMiz04yPHujr/sf+4Lxa?= =?Windows-1252?Q?i0QMQU8/Ph/IbXlCe4isMOvJP6PG74rxCX1hEVUFeEZdThCf6e9JBkeS?= =?Windows-1252?Q?UW+suH6Rr73UKWgvn9FlLPwrMVclYuyCLE+YK0K6N9GPu7murrpf5WzH?= =?Windows-1252?Q?xynbO03AkFuISTp1jzJZfr4SlDwOkdLmiLIne4SMdbao7TXy+szxO3J/?= =?Windows-1252?Q?3sUs3Fxst9fM5orm0eGcFOeeUra2+yBE/PypuNLwr00xgdqWrJEDnr+m?= =?Windows-1252?Q?hNz0V5Vt+ZQzBdkHUwQfbYcmmcM8p/vBhOgLm2KJUAaDGRjd8OrTvz/q?= =?Windows-1252?Q?022b3NFnBWaDaxGfVhVB2g7+tL8WeHSCGFZG3mdLjlDRUcGRKSeb7NJw?= =?Windows-1252?Q?sLy8fs0eYQclcnDyMWOHpqaDjY8H4IssuENMpoPT1z//rVjKzqfr1FQF?= =?Windows-1252?Q?BDXU06HNPMOVkqEF+aP1meR/4YCegXwwk76BlYB0f6+cp5OygjOfjEIs?= =?Windows-1252?Q?IewigpTRKeM2Jew9nm3KoTMu29xkHsDAu3u5kf/wcSwiLJp0knT/K3gx?= =?Windows-1252?Q?Ht9yaWzcwP+mim+7xH1av1FReEh+CJaIZ2AfprWYtmb+V61XCh4hxW4m?= =?Windows-1252?Q?eBE8Z8eCWf/fprblT58u3AfouvAF4zIMM3r1Bt4a8BE76VjgbCir97xY?= =?Windows-1252?Q?nZe/JntetPGQr/Pe0szGm196SX/4YTpS9fm2narrmznm6Wq188MgTjfv?= =?Windows-1252?Q?Gxjyhlg/B4hM9rGxObXz0dTpCGZQw3mfBKNvmbVEI+18cXpcAXxDun6w?= =?Windows-1252?Q?+mhfBQfnSdhGbe3HVKFRfr/B8aqtRAGCrjREp2VAei06eVOFpwz10dmy?= =?Windows-1252?Q?4rFhvLq/Wr4K2ljxw6wfkMCJu4MGzycuYCgOo3pWj+sMxkLK3AxnNtrK?= =?Windows-1252?Q?RB/PAD1LDOq8XJHLvfQ/BzXO0xfwDx/g3wr7hQjmDj2TRQfHCtQ/wYBW?= =?Windows-1252?Q?6QXPNUWJz7OQX0XB4FMFaNMOPdh+yRE8SrIPq4B+AMDwVX8Msm0cPvkv?= =?Windows-1252?Q?MlKf0GVOmgl+S2q2l536yZryQdfVyYPPclgkGB9LBQwf0EgbI5KncMMH?= =?Windows-1252?Q?HnvERbJxEAfC6ub2yZTYXFn967SC5INGnm6gtGiVVs3EXW/ictGNuWmX?= =?Windows-1252?Q?e+WztQmQYx2pcKrfM56ZjqjSb9OFSuTCCBL8hepYeZ7fDGvf0xgWDDC+?= =?Windows-1252?Q?wlmGHZ6N5hocNFefvhPCbz7ExccV8NPdtUHShzwLOh2nxZYsapKwoF3O?= =?Windows-1252?Q?x1/pGK9wCE/bWtDn+D6dI/3zm5tchGup/5K9RFXFM2vyo8=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1307;6:OsD9mc4BaBehYaJSpccDohO1MQ+Wdcx4c2b0GS8xtbrA+lbDFuXGuSC6slVsFMMQtFul9kFgA9N+ZZDAAyo3vQMh0I/8kkksLA/2vD31G+6TM9/AZ+lATE4JWlwLKOu/g9kr6+esOGnPNtDjO0xwsPhlhI/1FsiuDD1mClnpn6rv711EJ5Q3Mj73Ofz3cRUGuEqDAizXOcSjgFsMuf62ME03/46WtAGpNHG+4uopasF1QoxdCRbhqvvp2UfygKn7jf50hSUyyzsS0uaYwkhyGeF/p6nssbxivrazMmExSN4TXP8Xx2Mi9wu1coeY85rTA3wN3H16E/q5j8VpFq5TRA==;5:6BGWewReYizDHAry4zdvzoRMww4hwE/5a6PPrcqnMP8RhyQfqNolnuogWIFDsGlscJjL12l4QrRPqBbOWr8vtWJQJNz0/a3GR34Ptl79W1YHu/YknJK9G+G0b8NEOkMOa7erW6tYdHsxR8MupZofPw==;24:WV4azL68NnxPOVH4F1u3VVU8HOu6OasLuF35IivNgdoDxsmzacwKjAHbp5Xvz1K59GUMAaxxwKePr/YNrIfODCqSZbE4XGpJ9ZFk2Vc3Er0=;7:YzZ6nHwHL8vm4f9ojSFG4mxDM8lUJLOtTcggswEQAAT46VspFxmY40vwvZZdNhqi+9vVYz0thHS+9GIJU5PBoyJV7goN/oUNHFygEAsn/FDe63y6UauFYS5Qo1msI0dxmB0r0TaHoUEetQhtfTERe0IuEAfnGLm4CtMkCkeUhNL7J4oYwrmHP2tFeeaUZeKJPjL710SzMKj3VQngAXI7clzQ2Q+d1J2/XThQZAQnsTEWLMORbkHra2dJ7WtB2EFVQ3+OiV1jn+tXmOjNvmOcXR6fwYf8D4U8TAlnM8cfpD8YHQwoRxb8XTLLHFhwNSra SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1307;20:zAZL00iSK68U1mbHJrkXKdHQzAkNvAQzsAV+za6sjbv/y+CASZcP44YvBGIXsvDmf1KWXxBL0WqzkI+PmKgmHtHnf4beZDye9fBQCDu5dq9LDjxPaZA9txb2Qzs4U+xWt9u80UCtPjHWzeA5ZxoyIq+pb9QARjDmzT+I5CWbvBYrmpMqGpobPKTHRVol4qFI7uo3Bve+0ABu49bfLbzE4SZKf2CvbDOEDmj/MYmRHmfNNaSDxV8x2+1VfC/slvP0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 10:00:58.5918 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1307 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 18.09.2016 um 15:37 schrieb Baoyou Xie: > In amdgpu_gfx.h, the declaration of amdgpu_gfx_parse_disable_cu() > is incorrect. > > Signed-off-by: Baoyou Xie Ups, nice catch. Patch is Reviewed-by: Christian König . Regards, Christian. > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 5 ++++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > index 01a42b6..8575039 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > @@ -82,7 +82,9 @@ void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg) > * The bitmask of CUs to be disabled in the shader array determined by se and > * sh is stored in mask[se * max_sh + sh]. > */ > -void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh) > +void amdgpu_gfx_parse_disable_cu(unsigned int *mask, > + unsigned int max_se, > + unsigned int max_sh) > { > unsigned se, sh, cu; > const char *p; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h > index 51321e1..0b9ad4f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h > @@ -27,6 +27,9 @@ > int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg); > void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg); > > -unsigned amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh); > +void > +amdgpu_gfx_parse_disable_cu(unsigned int *mask, > + unsigned int max_se, > + unsigned int max_sh); > > #endif