From patchwork Mon Dec 28 12:45:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352650 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9756290jai; Mon, 28 Dec 2020 05:44:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3AzC5/MnVyfuPJx1WWXKyK4Gnjt9//5Yt3Hz2EYfWChDtk1tFBu+y/sf+FNNFFgIghTsU X-Received: by 2002:a50:9e8b:: with SMTP id a11mr41775166edf.276.1609163056261; Mon, 28 Dec 2020 05:44:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609163056; cv=none; d=google.com; s=arc-20160816; b=iSM+ekmFoNS2WsMiMcva3nvVD+VHDVQz75riCHJibq+HZl5AWJfq0Mg6VyaMkZQXey 4LaJtdy6RNa8I79erxrppnWIMMNdR1M5kZez78po4OXURMkSufCeLwW5QnFti3KhzYTk LQJ4MflSzE+eZJlHh2S3CObjtJmZY7Dw7IolS92dlyQbcyj9aOALnOuyyxR9i99j/DBu Vq5CbMOWD2y9IFa3yeFACtKZNZY9OLwCZCgBP2OvlHWMoLxAVibyp+3w7UUTTeeoKKYs tbfSu872o/zfxd7kWCk81QAcLBQVdzLm4luTtrIUOBMmDYEixxLdxBcyxXs0v27oq3id /e5w== 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=DTkuigG1+iJzT5iQ/Ui7vRQCxfLgzHe/f/0qBrCe3bs=; b=pNEIfY8L6CpCfeYpIGIxTJlUIK2ama3C8iwTYME5TK2wDZPKIbV7v/QneUmIFIEm8q nG9+CcPeMSgC7eMWxrWHJdofh9FyWErse1O5HGIgO73ydU/5pp8ReCUSg4rWtAqTWdpl AzuzY4M4CcP7o0SdHBf2d1h7oQJl0BUhXjyyUplZKetjzYrmHrDvcDeKLGx6CigekcUu bnCPnWwv1TsRD/pzqI1ND++1ZlFDbWVoeskgWcGM22x5ub6EgLuumC3gcAM72BfFIeiz dA7Zocgwgm87JXSJr8EZsYSvR50ZGm2NlTQWYeT5vriKGu3gA7dW2U9+hvlME/gyA6zO kMmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q1yI32h1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v25si18990776ejx.201.2020.12.28.05.44.16; Mon, 28 Dec 2020 05:44:16 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q1yI32h1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S2391927AbgL1NmC (ORCPT + 14 others); Mon, 28 Dec 2020 08:42:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:42238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391921AbgL1NmC (ORCPT ); Mon, 28 Dec 2020 08:42:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id DB8DA2063A; Mon, 28 Dec 2020 13:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609162881; bh=XFJOPcPzYIpW5agZP0ah8HF++DqJfBmIMGYSQ9Vl/Qc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q1yI32h1WB5JoXAlcQFpnPgar5AxdvphsVvwW6jIN+vr37IwU8dER1W/taKEVsciG MvbfDr1aSRROY6I1MJCFXCpjUVb776dSycDDaOk9Noy8utF8yD11nYqZwQdth14lmh UN77UJzjsn6aWAQJ9SE9QCfDojN1kHPBJj7ua15Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 093/453] drm/amdgpu: fix incorrect enum type Date: Mon, 28 Dec 2020 13:45:29 +0100 Message-Id: <20201228124941.709958327@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124937.240114599@linuxfoundation.org> References: <20201228124937.240114599@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit a110f3750bf8b93764f13bd1402c7cba03d15d61 ] core_link_write_dpcd() returns enum dc_status, not ddc_result: display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode': display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enum dc_status' to 'enum ddc_result' [-Wenum-conversion] Avoid the warning by using the correct enum in the caller. Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link Training") Signed-off-by: Arnd Bergmann Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.27.0 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 6dd2334dd5e60..959eb075d11ed 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 @@ -3378,7 +3378,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode) if (edp_config_set.bits.PANEL_MODE_EDP != panel_mode_edp) { - enum ddc_result result = DDC_RESULT_UNKNOWN; + enum dc_status result = DC_ERROR_UNEXPECTED; edp_config_set.bits.PANEL_MODE_EDP = panel_mode_edp; @@ -3388,7 +3388,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode) &edp_config_set.raw, sizeof(edp_config_set.raw)); - ASSERT(result == DDC_RESULT_SUCESSFULL); + ASSERT(result == DC_OK); } } DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d "