From patchwork Tue May 23 08:34:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 97902 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1990577vqo; Tue, 23 May 2023 01:53:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5h2SymR+HoOvzfcAbvhZxLLncpTt/7iDyoIQcFjFR8VCa2VOBtRYH1dNQPJ1BoFVyANNf5 X-Received: by 2002:a05:6a20:7f94:b0:10b:5ce1:beb9 with SMTP id d20-20020a056a207f9400b0010b5ce1beb9mr6882288pzj.33.1684831983309; Tue, 23 May 2023 01:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684831983; cv=none; d=google.com; s=arc-20160816; b=KrcMy/g9BrluLy0JNK0DYqZf5YZ5STpXxoAB5EkWrh3bj4GkCJFOOOMEPi6dZOKbqr ntmfMdTZZl/QNNiT26ubk2GPg7RdE88kr9R7+bOWHx07kRZEpCsuyjNhPLgVmIr4T1Za siC/r1U26RsnqAzVfw9R4XgTErx4OFR52zEgenWUcTBI8GXzxvrX4r5/66kB9OXoJgsB 4Xmbc+d+LcV+wzxyfa+lFVMV6UdEBtOdYeTTMoZ6ePFKr1aGpojEmJD8Gvy20ed6Mv82 a4ZD4nsJ/cjtdcEiRzgKz2ojy1h1/M34uB6s1uDwKf++FPcFiujsc0yJ4ji5yQlpeMVv gcfw== 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=qij6aORne6glwy2tr3+w/OLLs25CCJ0eLZpRIbcY4qU=; b=QLPfPyow8/md9kUiEI6KkwyxmaQoRJO0x2QiGe4wQd/SlzNTtB3+I/UCXseKHcKeaG QUToSnogHrc6/q8eV8BS6D/9GfAGuFrLuX/IolbPf/e13BNfPzv5YnMQlwcF1JTwefFK 4pG7AS9krhtg0V0MF69EfaKJLcMkVMnR7XFyHtFLNFb+96Xgu/i4C8TL3mFLXuVPDXIE LnVGKFaGhYZOZJBtJl+RbWp4C3kPsHtGRbF8bbWdj6uS2qORYGHqVm2zW+3+btI7ixOn RvW174N2/CXxvDcYzLlpBVdHru8KJOryev7YClD+AgA1qeIPTt7RkczsBkg3IxoSMB3p Xu1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="f5lHK/Ua"; 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 j62-20020a638b41000000b0053ef05fcf1esi982870pge.35.2023.05.23.01.52.48; Tue, 23 May 2023 01:53:03 -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="f5lHK/Ua"; 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 S236201AbjEWIhU (ORCPT + 99 others); Tue, 23 May 2023 04:37:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235685AbjEWIgs (ORCPT ); Tue, 23 May 2023 04:36:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2D501FDD for ; Tue, 23 May 2023 01:34:46 -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 80B1D61219 for ; Tue, 23 May 2023 08:34:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E437C433EF; Tue, 23 May 2023 08:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684830885; bh=uDeBCUkzcBHJ92URNdM9l1Brx4f2zSG2cwz+M+3kjvU=; h=From:To:Cc:Subject:Date:From; b=f5lHK/UaPZHvvrCbyx8U+aSfrFNlBZeuo6IrZ6le9c3sH92ANJkt14t08Prn4LoOy aIuvhhQi/1nO4uzPhjngpWtLDjNIAHBTnqJsqArO9m02ahkOfZ0o6x2n7EXxdnGV2m JArBQp54U8gqNVM7fhvgaESODqmOCagh+i9gpqABf4acdG1cHCMkgF5d47NS8GSaeH NuZcZuidG6dVplphDurX1sBEP1+zq6fmcbSyP0oLWbV3Ffgpy3H0dEYHU6y0VhTqIT pPewrt3Fi0vWXd5EnC+dlICVBF6bDoCqWw05jXwk2xE3JlzAcJYz/fVlZGSXfbPPdB M5gyAovdlDcdg== From: Arnd Bergmann To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Tom Chung , Nicholas Kazlauskas , Saaem Rizvi Cc: Arnd Bergmann , Wenjing Liu , Jun Lei , Charlene Liu , Alvin Lee , Mario Limonciello , Jingwen Zhu , "Nagulendran, Iswara" , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio() Date: Tue, 23 May 2023 10:34:30 +0200 Message-Id: <20230523083437.986490-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1766674381933876176?= X-GMAIL-MSGID: =?utf-8?q?1766674381933876176?= From: Arnd Bergmann The .resync_fifo_dccg_dio() callback pointer was added in an #ifdef block, but is called unconditionally: drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_hw_sequencer.c:2292:31: error: 'struct hwseq_private_funcs' has no member named 'resync_fifo_dccg_dio' Add the same #ifdef around the caller as well. Fixes: 6354b0dc3a7a ("drm/amd/display: Trigger DIO FIFO resync on commit streams") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index c6fe2c00aedb..d4cacb8df631 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -2289,8 +2289,10 @@ enum dc_status dce110_apply_ctx_to_hw( if (DC_OK != status) return status; +#ifdef CONFIG_DRM_AMD_DC_FP if (hws->funcs.resync_fifo_dccg_dio) hws->funcs.resync_fifo_dccg_dio(hws, dc, context); +#endif } if (dc->fbc_compressor)