Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1337376rwb; Thu, 15 Dec 2022 08:57:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf6LN2GpylPdhNTe9/mBNS4dL9Nd7WkpESm+ni+LRfaw/rEyjCOb8sZ0XpxyVrpfO7kdC2VW X-Received: by 2002:a17:902:b618:b0:189:af28:fd8d with SMTP id b24-20020a170902b61800b00189af28fd8dmr28078891pls.1.1671123475279; Thu, 15 Dec 2022 08:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671123475; cv=none; d=google.com; s=arc-20160816; b=hZWxoAaRxxXvPjoqcd6m+pwzXOMG5APZ82cbZsRYCUFcE0EtUZLc5GPT8zXctIng1x G8VcA3OEtZvSQdtnFo2HEpKYFXXZpDdX9YIJlfnPFGI7jfxwlFdta+MQUFB0xVXdaEKN ZJS+EKRtI7QANhI0AIhjeQ3/P5/0M12S2jMkBVOvBRzPUZoL1MOUij3ULrDtNo+RfyKD 2ZvqeQH1NH8yFoXrshSWnEBY5u/RQNoM4OdOfEF7kUH98tEZTRYNYiRB7AbiDJLxcWqj gKBjsuK6QG0j++67cC9p3pZip0Et1rZuXbcRdiWgUrkxA0AEcgXt1xZuISmAVgcShubG 9RNg== 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=QnPiZUO4kUnHBDs8g68B+sEyiQ3z6dfUpPO0KSbwrxc=; b=kX16bE0tjXjZOWjj170UGiY3ip10y4WskHibJ6O9yAdw8lPK3HuhoffwIIR4sQhqiw UeWPnDFeuZA1JiPMGUlpPEoTnRMAdgXj5+ph7nH0W/EEFtKmOfH+94m8Cm0Y2t1CEbkT zZHEn8h/77Q8hlMXwvIToAZ9xcqBEooO3HQRY5nZ8DWO48Ytm2OX8lN/SHTbCPihA0D5 ZVWF3d3Uv7Lm6tpQH6UrT5GVgM7aTaaov20ycIybZM8PxqpeJMIH7npVnL/Hi3JxXOq8 Z9R9WL88wcaffY3X8+moceQ8lyw63Z65MazgzosfQWMmstyHTaz1ixcp97eU0kEyNGp7 utkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HBBGEmEN; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p17-20020a170902e75100b00189684c7c79si7038530plf.293.2022.12.15.08.57.45; Thu, 15 Dec 2022 08:57:55 -0800 (PST) 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=HBBGEmEN; 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 S229976AbiLOQh7 (ORCPT + 68 others); Thu, 15 Dec 2022 11:37:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbiLOQhz (ORCPT ); Thu, 15 Dec 2022 11:37:55 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DF4B21270 for ; Thu, 15 Dec 2022 08:37:52 -0800 (PST) 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 281A6B81AAC for ; Thu, 15 Dec 2022 16:37:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEDEDC433D2; Thu, 15 Dec 2022 16:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671122269; bh=RV+MWWk++Ih2bkesG4BCmtmkZAUvC1BBjtjl9erq92U=; h=From:To:Cc:Subject:Date:From; b=HBBGEmENzDsR6v2JzTk9TsAw9a5xMy9TsGY6JZDw1L0qqzQqPIY07i8Qw2odeYYUg qqxgxiB9NJXMLxLCaAk33gZIBI+IOaUEvqtdIgJzxgo/5ykUWho5ljgwWk1yrQzAz4 f0TUSjbzj0c6VqOhrB/VkJA/B5J+FqIYxqM11wNxjGgNe+0im4oWCBXyOdYU6zlssx wsY6ynr08+JA0+mt4x20OnPZgyhQcpRPib361frVWiv9bcenSBL0itX5DV5OHiRIBq 9JI7gmWa5Yq9BiUJ7Fr7FvjrUXaQtLHCL9qOgWA4jAEG4CIe79ZlNpUHiC5BeRTlQc u1ea7XRG0LeKg== From: Arnd Bergmann To: Harry Wentland , Leo Li , Rodrigo Siqueira Cc: Arnd Bergmann , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Wenjing Liu , George Shen , Alan Liu , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amd/display: fix dp_retrieve_lttpr_cap return code Date: Thu, 15 Dec 2022 17:37:10 +0100 Message-Id: <20221215163743.452648-1-arnd@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Arnd Bergmann The dp_retrieve_lttpr_cap() return type changed from 'bool' to 'enum dc_status', so now the early 'return' uses the wrong type: drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c: In function 'dp_retrieve_lttpr_cap': drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:5075:24: error: implicit conversion from 'enum ' to 'enum dc_status' [-Werror=enum-conversion] 5075 | return false; | ^~~~~ Convert it to return 'DC_OK', which is the same value as 'false'. Fixes: b473bd5fc333 ("drm/amd/display: refine wake up aux in retrieve link caps") Signed-off-by: Arnd Bergmann --- No idea if DC_OK is the intended return code, but it leaves the behavior unchanged and fixes the warning. --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index af9411ee3c74..95dbfa4e996a 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -5095,7 +5095,7 @@ enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link) bool vbios_lttpr_interop = link->dc->caps.vbios_lttpr_aware; if (!vbios_lttpr_interop || !link->dc->caps.extended_aux_timeout_support) - return false; + return DC_OK; /* By reading LTTPR capability, RX assumes that we will enable * LTTPR extended aux timeout if LTTPR is present. -- 2.35.1