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=-9.8 required=3.0 tests=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 038C6C2D0DA for ; Sun, 29 Dec 2019 17:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C44AF206DB for ; Sun, 29 Dec 2019 17:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641781; bh=s0Y+GvtnvVitArBrGqBdrj6By6sFAH1+aDXh7/NF/Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UQmH21Eo8CDwEUCcGhKwbC+t3KDnzWjwfGyV61Ne4OyRajmfEy5eIzIxHgPCXR8fK mWb+rqB2Tk1Yu0i7zbsE9SCGaORQea0lYBjSBWcnJSvSGx+4afY7H+Ch+2qPt7oqjG fRRju1DqXMnJnoGpY5CYuoprhjUHQL+UNdNSW8VQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731684AbfL2Rtj (ORCPT ); Sun, 29 Dec 2019 12:49:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:33486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731674AbfL2Rtg (ORCPT ); Sun, 29 Dec 2019 12:49:36 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 2F7B4207FD; Sun, 29 Dec 2019 17:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641775; bh=s0Y+GvtnvVitArBrGqBdrj6By6sFAH1+aDXh7/NF/Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kl93DhZ5i1FGPYMCFinDxExFYbHr+v1E5h74WzQ1aq95dEyBV9czhRmjd2uMwtBKo KHTdrmtGNoYoHItfdtCm9jq0Yn/QVrCfSDQkbImN9Rfmr/jqhv2MvINvlF2C/09tEv GSdtEJntb3Q8GTr7JHxAm758F0hQh+m9hgoeypRs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhan Liu , Nicholas Kazlauskas , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 189/434] drm/amd/display: setting the DIG_MODE to the correct value. Date: Sun, 29 Dec 2019 18:24:02 +0100 Message-Id: <20191229172714.376523867@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@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: Zhan liu [ Upstream commit 967a3b85bac91c55eff740e61bf270c2732f48b2 ] [Why] This patch is for fixing Navi14 HDMI display pink screen issue. [How] Call stream->link->link_enc->funcs->setup twice. This is setting the DIG_MODE to the correct value after having been overridden by the call to transmitter control. Signed-off-by: Zhan Liu Reviewed-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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 efc1d30544bb..067f5579f452 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -2769,6 +2769,15 @@ void core_link_enable_stream( CONTROLLER_DP_TEST_PATTERN_VIDEOMODE, COLOR_DEPTH_UNDEFINED); + /* This second call is needed to reconfigure the DIG + * as a workaround for the incorrect value being applied + * from transmitter control. + */ + if (!dc_is_virtual_signal(pipe_ctx->stream->signal)) + stream->link->link_enc->funcs->setup( + stream->link->link_enc, + pipe_ctx->stream->signal); + #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT if (pipe_ctx->stream->timing.flags.DSC) { if (dc_is_dp_signal(pipe_ctx->stream->signal) || -- 2.20.1