From patchwork Sat Oct 22 07:29:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7715 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1109602wrr; Sat, 22 Oct 2022 01:49:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UVEsWiJZ+HNjjn/nCS2xcMnx/1AO/wP+2qFdTrcL8NrXV4hxgQlBfvBJccACnua3JCvR7 X-Received: by 2002:a05:6402:50cd:b0:45d:109d:676c with SMTP id h13-20020a05640250cd00b0045d109d676cmr22147253edb.344.1666428551408; Sat, 22 Oct 2022 01:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666428551; cv=none; d=google.com; s=arc-20160816; b=mde4aBKJtHdR4HFS0RCKn3REgjxnq57tCIrPTm4Gs/40LP5JV3KyiG7tzVr3fNPcUz rVKMXOBwNw2IkcQ2A3+YZKJkfxvBv4ty+wrbSb4amcEqQWksDKGqW/k+b3e/xmAtvbyg oAHZJx6FAVo9eSxICV5TS1ZPYrBkfSHqVqwLlxLZR9RwaDyS4aVbuTSdoulsbqIHQsi3 5pWfzuxZBAma9/ldceDz3ZpKp+XmhX3F+6p/PI7o6M0+/NAtg1JmzZcB7e9gJfKZOiUe ZsgHU/ouMDhVLP7KaRtKRpAQWFCKXNJIkBNMZr46rCRU0dfNMVwST+w5/xUhRLh6fnVZ ae/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=leukjDcx3SAGRrbnOmf1kbImZS6XRsLirHkJtGdtbck=; b=Z5/lmfcR/mDgwcSmAm08lansMboiS4TkMnNPSjL2Vo0yHS3Lcc0F/A6FvEvwq8PlRI qFTixNPAKI6165POPoVTZ4oBs4y2qgs9l+8URs1ReW1l3EMnqxLE72M36MKM0K8LOMt8 zyaODwQyG8+rHy72/2zdTL9ZqqK97eQduIk9OW4/q2MYknzMOYHvQtN0/gIGM4f5swmS Ea8lBtyyG2YdEGMml4WfdWiANOK+ypA6AoQALTXn1zZ4bfHmV6ed7qcRIuzzgSD4CRHa daORzyMXmb82qH7RGlWxKtUZBChZXUxoVOUnv9tvH+YGqTM8okRywhcYd6rB4Ir9lkUp 6Zyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IkUjp8EI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b13-20020a0564021f0d00b0046054d6b3a8si6385627edb.302.2022.10.22.01.48.47; Sat, 22 Oct 2022 01:49:11 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IkUjp8EI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234618AbiJVIsN (ORCPT + 99 others); Sat, 22 Oct 2022 04:48:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235292AbiJVIpK (ORCPT ); Sat, 22 Oct 2022 04:45:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3F042ECF6D; Sat, 22 Oct 2022 01:09:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B69CC60ADE; Sat, 22 Oct 2022 08:07:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFB19C433C1; Sat, 22 Oct 2022 08:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666426069; bh=b+tvcI6wpnxrBbfyWcd2dsGMGew2N6mThlyt7CAAejc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IkUjp8EIBE5L3MjT0MqwfPFPJpgH9FcwhZ0+jfDF+ZY7otIDtVw0frsnNAHbJSoNX yDIkx6Fieg3RDHx3TWvXNjADiEbI1/sLmAZLm0XoeCuWoSG2gdz3ARDExR7uc+9iO4 FVBtpI39paFcNm6rdOpGVPCqgSJfdoIqloFn2y4U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , Linus Torvalds Subject: [PATCH 5.19 708/717] drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n Date: Sat, 22 Oct 2022 09:29:47 +0200 Message-Id: <20221022072529.772954386@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747376984794352285?= X-GMAIL-MSGID: =?utf-8?q?1747376984794352285?= From: Nathan Chancellor commit 2130b87b2273389cafe6765bf09ef564cda01407 upstream. After commit 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr transition"), a build with CONFIG_DEBUG_FS=n is broken due to a misplaced brace, along the lines of: In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_trace.h:39, from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:41: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: At top level: ./include/drm/drm_atomic.h:864:9: error: expected identifier or ‘(’ before ‘for’ 864 | for ((__i) = 0; \ | ^~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8317:9: note: in expansion of macro ‘for_each_new_crtc_in_state’ 8317 | for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Move the brace within the #ifdef so that the file can be built with or without CONFIG_DEBUG_FS. Fixes: 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr transition") Signed-off-by: Nathan Chancellor Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9991,8 +9991,8 @@ static void amdgpu_dm_atomic_commit_tail crtc, dm_new_crtc_state, cur_crc_src)) DRM_DEBUG_DRIVER("Failed to configure crc source"); } -#endif } +#endif } for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)