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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 24132C432BE for ; Tue, 10 Aug 2021 14:21:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D48060EBD for ; Tue, 10 Aug 2021 14:21:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241369AbhHJOVn (ORCPT ); Tue, 10 Aug 2021 10:21:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:54066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242395AbhHJOQ7 (ORCPT ); Tue, 10 Aug 2021 10:16:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 73394610A0; Tue, 10 Aug 2021 14:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628604983; bh=8bwAjELKBHfEtCgO7fakYsnNJbvNAarkcSTfOot+Cqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bu8mEwjZ+YB5IONaVHmzayYhruIUohZivSxkpTcRtu+jAfB1qRFbw6HEifBeIdhex 9PhIoUls8mQwBOBv8oNR54yFXfDvNz8Xy/dPkbJ9RojSzuMVtHva+XwYm31blOsDkD J1b/rNpk+3X+GJia5yCSRfEWos9CTQTPtmzJUIqRH4lODD8KjdMlx08QDIl/nE5wLn RRN4SrjcyZcGJYSsoF5zOPMydb+/J8kavXSqNuTCVZxwo9LtpPCBhw+tJm2pVEGnIX s+sMo7EwWizeDZfF51Ehpb0Kfb7KwCslrw8JGIoqi4LUCaaq2RWbavMRFI71wvPg84 Mnk7cAHq34+cA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bing Guo , Martin Leung , Aurabindo Pillai , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 13/13] drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Date: Tue, 10 Aug 2021 10:16:05 -0400 Message-Id: <20210810141606.3117932-13-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210810141606.3117932-1-sashal@kernel.org> References: <20210810141606.3117932-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bing Guo [ Upstream commit 06050a0f01dbac2ca33145ef19a72041206ea983 ] Why: In DCN2x, HW doesn't automatically divide MASTER_UPDATE_LOCK_DB_X by the number of pipes ODM Combined. How: Set MASTER_UPDATE_LOCK_DB_X to the value that is adjusted by the number of pipes ODM Combined. Reviewed-by: Martin Leung Acked-by: Aurabindo Pillai Signed-off-by: Bing Guo Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d5cfd5357c7..03e207333953 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c @@ -362,7 +362,7 @@ void optc2_lock_doublebuffer_enable(struct timing_generator *optc) REG_UPDATE_2(OTG_GLOBAL_CONTROL1, MASTER_UPDATE_LOCK_DB_X, - h_blank_start - 200 - 1, + (h_blank_start - 200 - 1) / optc1->opp_count, MASTER_UPDATE_LOCK_DB_Y, v_blank_start - 1); } -- 2.30.2