From patchwork Fri Oct 14 15:21:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 2740 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp240431wrs; Fri, 14 Oct 2022 08:25:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7YCvfakk5DurD/V+Lij7BhJolIcUOAWTJFJ9vdYcsLTXI0aCNjS6GGNUV87B2N4xkR7cGX X-Received: by 2002:a17:90b:128d:b0:20a:da54:788 with SMTP id fw13-20020a17090b128d00b0020ada540788mr6523575pjb.65.1665761113254; Fri, 14 Oct 2022 08:25:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665761113; cv=none; d=google.com; s=arc-20160816; b=ZAuoKGu6JjypPJ5w+5g5yRzsHRgz174j9kBVFRiOktLQru2kciOnx7dw5M5Q0M9a/6 6SUSTjevc1yg8lg8ubUDPr9hQgzDehZz2kn46LPlmnYMwEcaNG85PGf3FCoeStz40L85 +tl22LPqoU+ULn0mUQLTBQ7fxH3wzt+TL57+jcuP+beZf8qSg+uB+m6fFBpYBOx//PTL zLQkdkYSh3HmuTEIcRXHzW1ZLuBLhAURB8mkY4oF2LLKg4EPNFgU2rIuvNEQl0+zw6Yd ECLEMb/nMNpzDNGDxn362Jh/9M1R2CPE52xk6OI5iVUfA2JjIw315oV0vd1MTJycVOHg MHBA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=BWq9QX5l/o6zKbIZuhxKKatpj4EsxKSVIkVHm63jsAg=; b=ihcp3sesPVMrupHhdKJ6R1cga0jUBQ+abA0uEMo2/m+XmpUr36nHHtqyhF209WAvaK HOFEMLDUMqy/IqCrrCsSPfsAgB/WiRyrRiiLzBi4MGi8uwKpG4UzWcL9T5XIJVViqZhg t3zv4H79o2C1ZAgSlRsmH/FcNjAfOSIWhxChOpkJMBmSg3DEs6KKSuv5ZwsJil73vhpp AoY37atNI4igS8iXDfUTo9ztarTOD0bvVobUuMoejx2xExXkonwEjOnchKb1qhQmKH66 QBuiMD7KrEjYVZiTvDHmEvi8P/36NcZ5bnbQrJx7I35JO98fgj0vufQ/KKT6CK3cKuDG DyQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="A4Sbe/jd"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nn12-20020a17090b38cc00b0020a7f4402d0si3655947pjb.27.2022.10.14.08.25.00; Fri, 14 Oct 2022 08:25:13 -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=@kernel.org header.s=k20201202 header.b="A4Sbe/jd"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbiJNPXy (ORCPT + 99 others); Fri, 14 Oct 2022 11:23:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbiJNPXr (ORCPT ); Fri, 14 Oct 2022 11:23:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B16FE1974FC for ; Fri, 14 Oct 2022 08:23:32 -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 ams.source.kernel.org (Postfix) with ESMTPS id D641EB80B8F for ; Fri, 14 Oct 2022 15:22:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0BCBC433C1; Fri, 14 Oct 2022 15:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665760931; bh=zumSMnjEB7p5SnrVEFCNhx+z/ucnZjd98NRHyDu6F5E=; h=From:To:Cc:Subject:Date:From; b=A4Sbe/jdgIdp2JTTlJQ/vJ7PRFBn7V3MpBu4EWtv7v+Gm1iqO+VzSPofI82rqOmqi NeP2i6fk1PlH+XjX077mlJBwjTTF4bkTanAKfd8F0pVcX4kU/sNx2Lwc6l2QuyA420 DgFjb1QoFdbFISLgFFmAMM5lxyi4YYOtTdofh3JL7kNKJZeHbeiIQIb82+Oa8flbvV T2fpOOxjDGiIM9oJKPkQW1kJ/4LXzkVWTQYWwNxB5QgiUIBIbGZH/5VIK8/aAaG0N2 YzrIQBGerQKC9mXcG8X5cF2luJzu7Bgtg7g7PapPdZQDwO6qp5Hrr38rhQ+oHcgSug +ekifejesRymw== From: Nathan Chancellor To: Linus Torvalds , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" Cc: Yunxiang Li , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Nathan Chancellor Subject: [PATCH] drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n Date: Fri, 14 Oct 2022 08:21:03 -0700 Message-Id: <20221014152102.1755050-1-nathan@kernel.org> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1746677125169410047?= X-GMAIL-MSGID: =?utf-8?q?1746677125169410047?= 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 --- I have sent this to Linus in case he wants to take this directly since this is a pretty obvious fix, as opposed to going through the regular channels. drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 9c9155a3509a2ebdb06d77c7a621e9685c802eac diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f6a9e8fdd87d..c053cb79cd06 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8310,8 +8310,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 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)