From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54B28C2D0DB for ; Wed, 22 Jan 2020 13:21:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2634F24688 for ; Wed, 22 Jan 2020 13:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699319; bh=/eE6De9bd/obPBfI1sCrVlL2CEwXPM8wDtngzyOWKgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sBYzHXgQwTwZrqeio6/erYstEQI+aYd2U1ylYw/YNQJVMj6jBW69qEO1xqWGq8Jk7 z4fT3AQ+i//LLY3sr6LP4j8WLGU5E6elv5jUrFO9iAh4uCHk7kHvQxQQPCj2qcC6ZW gSMiSL2CeehXPY9qcGonOLfoXUwDAv9vIGdDrux4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730380AbgAVNV6 (ORCPT ); Wed, 22 Jan 2020 08:21:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:39290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729440AbgAVNV5 (ORCPT ); Wed, 22 Jan 2020 08:21:57 -0500 Received: from localhost (unknown [84.241.205.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A2A0205F4; Wed, 22 Jan 2020 13:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699316; bh=/eE6De9bd/obPBfI1sCrVlL2CEwXPM8wDtngzyOWKgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dwdJua+tS1HaR8T9Cz3r7+dmtvs4amvmmbjkGeewVeAAgiX/MRBOuMvM6lg7YfHRr LU9qON7yWkUVzJOQ3rVCLZ2uC1pncLsVwIXj5OIsrxKaIdyX3YzW4tfoamH1rOSDV2 XV9y8Y+kD8E7hzPb75C2GIpYOzeCkFDMo+wCv4uc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harry Wentland , Mario Kleiner , Martin Leung , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 106/222] drm/amd/display: Reorder detect_edp_sink_caps before link settings read. Date: Wed, 22 Jan 2020 10:28:12 +0100 Message-Id: <20200122092841.327644984@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mario Kleiner [ Upstream commit 3b7c59754cc22760760a84ebddb8e0b1e8dd871b ] read_current_link_settings_on_detect() on eDP 1.4+ may use the edp_supported_link_rates table which is set up by detect_edp_sink_caps(), so that function needs to be called first. Reviewed-by: Harry Wentland Signed-off-by: Mario Kleiner Cc: Martin Leung Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 793aa8e8ec9a..c0f1c62c59b4 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -809,8 +809,8 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason) } case SIGNAL_TYPE_EDP: { - read_edp_current_link_settings_on_detect(link); detect_edp_sink_caps(link); + read_edp_current_link_settings_on_detect(link); sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX; sink_caps.signal = SIGNAL_TYPE_EDP; -- 2.20.1