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 E477AC2D0DA for ; Sun, 29 Dec 2019 18:10:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B59CF20748 for ; Sun, 29 Dec 2019 18:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643007; bh=dT2u6tnP0SjCCmVPHuAARurqhNxrvVeh29ZCBtjl+Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=d9n4sDD7MQ8ZXQ0zyBmIrmWpv2RMJD65inLt34rrQA8M8b4hQiiUe3NvzRpOpWpHJ B7LNtbvMF5kKmePiSIJA0xt283YnByPASJAISbAc94o+vN3fudQl4ANvfws7HpbydH 7WzOMjZTfybrUGNB4xRw46ln26B3l8sv0hjomnjI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730843AbfL2SKG (ORCPT ); Sun, 29 Dec 2019 13:10:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:53612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730766AbfL2Ro7 (ORCPT ); Sun, 29 Dec 2019 12:44:59 -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 D4A70208C4; Sun, 29 Dec 2019 17:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641499; bh=dT2u6tnP0SjCCmVPHuAARurqhNxrvVeh29ZCBtjl+Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PdwvuGzEv3zRHK8zPyogtiopdBOa5PmXKOdIo9UWLZi1jDTCE7gkEdUBBaT69C1J5 BcQBHCWqrjZebL2psWnIRWKbtvlO+abP/xjP3OA7yfpNRsmKHcJH52/mwhRr3x4kDC QXingTWNpue6lgvcGeXUecmXmHk8BoRP7x5Z9wyo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikola Cornij , Dmytro Laktyushkin , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 090/434] drm/amd/display: Set number of pipes to 1 if the second pipe was disabled Date: Sun, 29 Dec 2019 18:22:23 +0100 Message-Id: <20191229172707.527745301@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: Nikola Cornij [ Upstream commit 2fef0faa1cdc5d41ce3ef83f7b8f7e7ecb02d700 ] [why] Some ODM-related register settings are inconsistently updated by VBIOS, causing the state in DC to be invalid, which would then end up crashing in certain use-cases (such as disable/enable device). [how] Check the enabled status of the second pipe when determining the number of OPTC sources. If the second pipe is disabled, set the number of sources to 1 regardless of other settings (that may not be updated correctly). Signed-off-by: Nikola Cornij Reviewed-by: Dmytro Laktyushkin Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c index 2137e2be2140..dda90995ba93 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c @@ -287,6 +287,10 @@ void optc2_get_optc_source(struct timing_generator *optc, *num_of_src_opp = 2; else *num_of_src_opp = 1; + + /* Work around VBIOS not updating OPTC_NUM_OF_INPUT_SEGMENT */ + if (*src_opp_id_1 == 0xf) + *num_of_src_opp = 1; } void optc2_set_dwb_source(struct timing_generator *optc, -- 2.20.1