Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2891671pxb; Tue, 24 Aug 2021 10:00:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmlB0E2o49nyM55taOG2W6Gtbh++Dl1wx3DH4TwS3gN91/mkVP5d+d99oGV7jXfVP492QF X-Received: by 2002:a17:906:1856:: with SMTP id w22mr10527855eje.393.1629824410540; Tue, 24 Aug 2021 10:00:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629824410; cv=none; d=google.com; s=arc-20160816; b=BrvMftUROMLcrrQE+mzLJU0T41EtSRGj+uVEg/z5nE5bJsEqtp1sMUyEo3fvQBLJkl W53XBwM7JbtxPHRMVfOUIZcLWFyuFwFa1Q5fXGbnHraJW89w1q7ntMdwQuN8qDhMtFJc fd3ec9Y42weHMZ3yuX1wXvd+9oKyYFj0Go7ZhGByheqzM9q1zqWIgJ7/b8/OQ5R1UQSt wviW5dObHbR/D/S+G8xrzXxemBf3j08tCXV9F3Zg/0DBNIJrr3gOzAOatHAxCizROcJA 71uPV3ZAU/l1x28aEYDElxMnVyA0VtZi+1sMLnXiWT+eB/mOG8S7cwnMZcoKSWtghY8T VhBg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9zBJJBn7pQsC9LJFT9Mgd6hpzISO9pOeVFfH459ij4o=; b=oFnYLGOkClIVX4cEAhPoV3VigNworgJDSwHCoxJ8AReDOVfqn0WWi0jwKj76wmCBFM Zix55TL/MJ8gWpKtJToEy6eQctaI+RGfuL0lg+epFYT/fb7a9ovskYqkcaIlBZzMz7Ls eBS1mwbrqKSVlo/rnHOvFzS4gl0B/xhQQINQ7HEgfXZ+wFsjlmr55kIyxht1xcJG6Jbw 8qbvgnsD+fq3mt1WTQW4U1zh1w4ncNzLHw7IC8PVmysmT7igH6YXXWE5MwhVvXsqmmaV CHMaFBsOFmRfX8YLI8M8qzv+g420BnmZvKsB2eVNwp0lft80CXeFMQCBY2ried6lSNJZ frAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tTmsU+wO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gt9si2830004ejc.426.2021.08.24.09.59.46; Tue, 24 Aug 2021 10:00:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=tTmsU+wO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237940AbhHXQ6G (ORCPT + 99 others); Tue, 24 Aug 2021 12:58:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:39268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234433AbhHXQ5Q (ORCPT ); Tue, 24 Aug 2021 12:57:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EA01F613D3; Tue, 24 Aug 2021 16:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824191; bh=2PdCisfchulfra4KZ2TvEHPUVLNQ0PIY0wzfL70Lzok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tTmsU+wOiLH4HQ4h5ioeG4GRvNFgtOAYwfwog1/GZbegIxCCTobjSXuYwrhXFWqMQ SsK5kF1od0vGbG0SEjqshG0WlTpQsYB2SfPnRUNwychjzdFVDO4Lw36rJbK6xWubvI 6EKwp3CCE3QHNxbSGifLiIlzVzbW0jdY4u79A8uB1Pasukg/o7eSAvsbAesMfxaGEv 2yrr7mjWmyh5pKrEa3ZF8lP3xgw+fMXVTUK5Tqqy8Jz1wHqi9vfC7jSbR4IJZk+rVp f2LnhFk39IazZaRsgNu02S+W96UkHnewL6H8QP5f6HgBkI5Js4IBOHXmwW67swrxkm 2OeqD3mGiDKgQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bing Guo , Martin Leung , Aurabindo Pillai , Alex Deucher , Sasha Levin Subject: [PATCH 5.13 023/127] drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Date: Tue, 24 Aug 2021 12:54:23 -0400 Message-Id: <20210824165607.709387-24-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165607.709387-1-sashal@kernel.org> References: <20210824165607.709387-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.13-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.13.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.13.13-rc1 X-KernelTest-Deadline: 2021-08-26T16:55+00:00 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 3139d90017ee..23f830986f78 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c @@ -464,7 +464,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