Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2899880pxb; Tue, 24 Aug 2021 10:10:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBT0hBMfp5FUbnfmJQXF/v/6YKgHKGjA/BbeuqeuCBSgcsgxCkk9ui30JmdrINw21UDyZd X-Received: by 2002:a02:cb46:: with SMTP id k6mr35739764jap.15.1629825010390; Tue, 24 Aug 2021 10:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825010; cv=none; d=google.com; s=arc-20160816; b=rWFlp0Xy3cFH1glYSZV9NH8CrWMDjexBf1LY7j41E2wHOf0F17CFES6P5ZWHxGbDAT qs7tTXvxSafV8GSTepvFAfDerKndt0WEhOZza2GJzRm1NrhBeJ1yFenH/xPH5sWEi2Zk DkdzAXPK7gIC2ArRQAWKqaI5aOJBpvS3PWB0/JkhtzgB6g672tz9OCR9IBO21vubwxcV a2HL2HiYK2Ryh+CiKn0I0s/8LyiS4XMNZEkQe2K3Z/PXSI24eww+yrnf7SHVe1Ymy3o6 LEUqpxOxkm6RGeVjEg2dilSG9kzpqSFyEI+WuRWhIXULPIxC1EimgSHrFBcDY1/YjTk4 g/4A== 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=GMgkRRrbLYcpP37/4nR3lP44c8HT/gXbW9yn2zT47R0=; b=h+KpB96JV4VgsqIU4zZGhknI53RI0r1sGoAM3RAc+QRaYAUaLh1cS0qniJfUwNBIoK FUX22DtGeVkychJziUcziJb07/sON9E4X/lN0ko0hy4MiBEW/YnRxdOLZibpNl96j2Om 0MI7TRTWyjr/1sF41S9vXS4V6epDQl2uS+PAkCJIPYWTLeNxfiljZQM1wK8itIUtcnNa 85nrbq05vMd/3/J8f79NkoJuvAcyE20mEnbBPukHEVCbLAhW2iDJv6mzPndhLhlw1B44 /DpjLZi9YpvYIziHGqXHgrCkfi7sGi+1BIb0Ft6EGCWS2acNUnZpbGZ9l0wG1H7zCF86 6CJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HzutxEc5; 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 g8si18414939jal.26.2021.08.24.10.09.56; Tue, 24 Aug 2021 10:10: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=HzutxEc5; 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 S238570AbhHXRIX (ORCPT + 99 others); Tue, 24 Aug 2021 13:08:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:47424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238847AbhHXRGO (ORCPT ); Tue, 24 Aug 2021 13:06:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8102161462; Tue, 24 Aug 2021 16:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824382; bh=ixnNRBzBMRUstrfz7/QL7Rs11C2V3vFa7QdKKFaNhZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzutxEc5OEWE3cbFaudLI3ibCG2Y+00RV19p6O51G3oBsCn9udornT/LIN9pUyNTd 2xMaRscm6XzwETJ/8Y/BgARd3sSxW5tEGQX9VXO1cWwJCupgzA0h1vEBOPdyA7yJx2 PR1kyF6bO1JOhL5vMdiJnbBf3ZCexVrJNxLneMZd1nu53bwTn/bwrIZxXXEOWBtN2p 8WzOowajc8BaSpC4Z/ZLmaX/pS8CAa0Svh3Tnki0Vm7OTGbDvLZM1Z6T9LGb+JgDYZ h2j/lBwMvSmmMGSdaj4rk/poctNt5j/5MfzD7Sgzit5SBzfMgCBFz7BkLpG618fx2J O5xroETaUu/og== 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.10 32/98] drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Date: Tue, 24 Aug 2021 12:58:02 -0400 Message-Id: <20210824165908.709932-33-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165908.709932-1-sashal@kernel.org> References: <20210824165908.709932-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.61-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.10.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.10.61-rc1 X-KernelTest-Deadline: 2021-08-26T16:58+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 d8b18c515d06..e3cfb442a062 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c @@ -357,7 +357,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