Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <b679648e-929c-9885-9690-70f8918bfa05@amd.com>
Date:   Tue, 1 Feb 2022 12:32:21 -0600
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: linux-next: build failure after merge of the amdgpu tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Alex Deucher <alexdeucher@gmail.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220201143201.1883c3aa@canb.auug.org.au>
From:   "Limonciello, Mario" <mario.limonciello@amd.com>
In-Reply-To: <20220201143201.1883c3aa@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TXhZSHNpMnpyOWxZMkFDQ2JKbkNLVy9zTDlLUDJIZVhIVmdBWVRDQlZlcksx?=
 =?utf-8?B?dDJQaWtrMENqL3RPSTc2UXMzQ3dxOVIwSGk0bW5TczBDSzgySE5pYXk5ZnJk?=
 =?utf-8?B?UExSMkpLU2ZydXRVS1ZYU0dncW94RGllak1jSFBDcFJjVGRQSzcybHFuV3lO?=
 =?utf-8?B?UE1sUTdmYkZKTE5VZjNSdndqV3hneGF1V2RwM2lJaUE1M3B2SmhlWDlMOUhC?=
 =?utf-8?B?VjNFTzNuMnNsSkxZYW83dkRsRi9QaGlPNWtWSCsyMjN4V2tjNEgxTUtqd2U4?=
 =?utf-8?B?UmdLVHROUnU1SnU5aUtISmpNVVRyTit1dHk5YW94SHRWQTB1aE1BQ0J3ZEJZ?=
 =?utf-8?B?VmVWVm8zaGk2QWF5QlN1K3RnVUpvZ0RyNEFBWTJiOVZLNUF6eEtwN0Q0VFBj?=
 =?utf-8?B?MXlxbDBBVmhxeFJsdjZZY0RMMGt0ckJWVS9OcUNBU2JDUGMyeWtkN0NXQ3Uv?=
 =?utf-8?B?VVFiV290ZFlnbXdaYmZiR1drZ3U4cmUwNFRFdTVmaFVpbGJNTXdnbUUrdkFO?=
 =?utf-8?B?RlpLN3F2aTdHamQ1K1ZOYWFsOUxzSHA5TGlya3BEaW0rTlZFT1FKL2dUQ2VO?=
 =?utf-8?B?cCtUU0I0VGMvdzhDK2lQQlR3UlUvZURvanZwN1MvR2x4dlFvV3R5Y3FCU09K?=
 =?utf-8?B?QTNnVktGZ3FsK1JqaGcyVnhDOVhZU3ZGK25Vem44djQrSWpaYzAxRmdmSXQw?=
 =?utf-8?B?bUlqUkw0QitxSE1HejgwenljNDI5QXVEM2xkSGZpcWtwNzlFN1VHV0p1aHNF?=
 =?utf-8?B?aHJ0c005NHczVVQ2ZGJIQXVPOHBkY2UybVAwR1RVSTNFNU9sMlB3Y0xhcUdT?=
 =?utf-8?B?eUFaQko5UmdwWXVWQk9aQUNJRk1xQVA1dUN6dWdRYnkzY0Jqbm9MbG4yYTVO?=
 =?utf-8?B?ZFFlN2VYbHk0SWVndXhxZExqUWpMZDZzTit5czE0b3Z1SHFJOE1ya1lvcGlp?=
 =?utf-8?B?WnFqRC93SjlLclpWcmM0TmZncUFlUUlKVG5vbEduV0lUU05XeDNsUkZuSjBI?=
 =?utf-8?B?ZW9sR2pWSGpSWnkwbEplM0FTQmxoUGtWVU91K054SmZ2WFNISldIdGROV1M4?=
 =?utf-8?B?K2RtWDVNQ0xSNDNxaWlaVS8xYk5QNVdFUnFyOXMyWURIRnh4QXdpSHVRakJn?=
 =?utf-8?B?NHp1OTlVc0VpWExXVzEzU0pjdEpHQ0dCeTk2RFVZWm0rVmU2QjZDSG43OXpK?=
 =?utf-8?B?NnM1ZUJFV2dUakV5QkRxejdxOEl4dklCYTBNS2lTdS9OTVo5TG1reEkwUnhl?=
 =?utf-8?B?T0hZMWNsZGlSekZSeVErZ0MwaEtyalE0V091azdvUERuOWV4ZTd2M3h1T2FY?=
 =?utf-8?B?cktYdEdZZjhIVC9QWSs0Qzd4a1ZyUU1sSlBYZytVbW82bnRzT3ltY25qUnpT?=
 =?utf-8?B?Wi8vSHJjbmw2akRFNnJ3MHJRK1VaTEJoaGd4bVRxYXNoS1NmeXk5S3FKd2ZQ?=
 =?utf-8?B?aE52Q215SHdpdDB3eEp6YmZvR3AyM1oya3FTR2UxbUNFODRyM3ViN0ZEK05R?=
 =?utf-8?B?aUlJY3hYOEZGNC9ZNmZpeDhIakRRakR5em5SNEFhVVlDSUVPVHdpRnk0NDlX?=
 =?utf-8?B?d050UDlSdVpFNUVTMlR0TWovaTFtUUw1bUp1dzZ6emtXMk5MRzFVTWNWSi9O?=
 =?utf-8?B?ZnlEVHc4cDVkNFI5RmE1MWo2Y3laM0tWZUY1dHhRS3Y1SWM1eENzbTJMa25G?=
 =?utf-8?B?UEljZnlxc3VFMHBFbWUySGNBaTA1RDZQK2hNeHRlOGIxTDhKTTlGV2hSbkor?=
 =?utf-8?B?QTIvYlZTaXIxaEpLV3dIWjlRenhvWnlCRS96MldSaDB4ZzIycW5yOHBSdGR5?=
 =?utf-8?B?aGRFRzJ1UnViRGE2Lzd3a1cxcEFBTUZsZk5mamFOUHFTNGNEK2xZRDE2OVp1?=
 =?utf-8?B?TGtsRUFzQ2FtdHpsd0tDV0lKN1F4VS85NmRLZndjWHo5YS91bXNmZHR1QkZK?=
 =?utf-8?B?YlQ5TDBYVlNHcE56YUNhdU9sYVJ5NythTzhxdW1tZUZKUlRGeldCcVJaa0Mv?=
 =?utf-8?B?dXVuV1c4WHZpRnFnK1crckZnRlVkYmpUdXMrbGxzYllPdFRKbG9rTktrNnVu?=
 =?utf-8?B?ZldZZ0c0Vkw4cWpSM1FkWTZ5SFdUYnUvWTNRQW1zOWV2eWQrdE9ZTFY4d0oy?=
 =?utf-8?B?TVMrVW45THhJcSt4SDU2c0t0N2pVSW1XekthOWhMWkNNN3UxUWpLZSt5M25q?=
 =?utf-8?Q?xQ5YizmmsmLyzP7/IU7oMGY=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 86937714-0c46-45d2-fa0d-08d9e5b1306d
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5157.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 18:32:23.5215
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /1zz8hK8sbJiD9fuX/EOcS4Xu/BZD8VihAf1Yr3kRnwEqFOyPz7AA4Mm/bm4TWwSFhcXC4MygMg9DxvctBr82Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0071
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Thanks for the fix.

Alex if no concerns I'll push this patch from Stephen to 
amd-staging-drm-next with my tag.

On 1/31/2022 21:32, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:
> drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token
>   1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
>        |                                                                                       ^~
>        |                                                                                       ;
> 
> (and many more)
> 
> Caused by commit
> 
>    11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Feb 2022 14:24:40 +1100
> Subject: [PATCH] drm/amd: fix semicolon positioning
> 
> Fixes: 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index e61078cec072..2931c8ff4cc6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);
>   bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
>   #else
>   static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
> -static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
> +static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
>   #endif
>   
>   int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,