Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2905803pxb; Tue, 24 Aug 2021 10:17:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzs/LhZAyQRLorKpKgJpqksNy1IdTiynvwqT6yqiv+IGokRL2ZaTJc2BVzIvYntUojaIPEo X-Received: by 2002:a02:5bc5:: with SMTP id g188mr36224301jab.136.1629825474235; Tue, 24 Aug 2021 10:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825474; cv=none; d=google.com; s=arc-20160816; b=ar8CztjLWzugu/X7Af8cpxR6tzFebsz6SHqVds7NwqnrgFW88zZU0pvo7f5BQpa/PC +UDjO9NxBXqGJygIBeOkEOQ5l1GWfrlzxB/qmkcD2cBGN4/583DzgKdwOY544qdnotfR 3iV8+2dxMaVBZMfDMJJROlRK/96+/dqq07JcMC6B2pwSKsd6yQxjXmVJk7JRLNxdxJ3z ZueftJHHk60MCtXRNmGPtlHgVGBapcQXggMmQ+mT1jmSb6OuKutJAkUpuLYS+whA4ubU pTxRk2+Ckz/BSHLuGI3kFo53lq8ta/2QEQwNNqPBVgeXFc/PnXX47PHUcsQRAyjZIILG urEA== 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=Losfm15mBkvVvUaCvvQp44Te9MZI3TU+SjxjgI0Rg2E=; b=P0NSOAwffl4vDtR39IcGVYainEu8aTZR2f6Dk86x7aCJdfs+rRkV7uOTwwslp1BuOt Jt2TQf7zpA+z2TLuSLM8f1fLNtW9rZ1WDn/r1Ky9PPyHOF02C5xf11tCzvvayfhwhTXt zELR23hvm8l5sMdmr3Vw5BQKnQMs5tI6JBGYEtYK/RdCkj3iox3k6v2T7Nw28XFYJQre te4D8BbHSgghqSvGk+RpYc9vGgQsEp6gc3OfpItOrH7T831/LgvKn6LRds+9YcGa7EPu Qq9lc0IlIhFWxDwoES3D5riX9cQHUNDGtNUcD/aCkHLyh60PS4MPl37lzSkMNJ1gzfuj XkzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FUpYGCt2; 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 v7si19813892ilu.137.2021.08.24.10.17.41; Tue, 24 Aug 2021 10:17:54 -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=FUpYGCt2; 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 S239832AbhHXRQq (ORCPT + 99 others); Tue, 24 Aug 2021 13:16:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:51952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235316AbhHXRNu (ORCPT ); Tue, 24 Aug 2021 13:13:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 585D761A63; Tue, 24 Aug 2021 17:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824491; bh=8bwAjELKBHfEtCgO7fakYsnNJbvNAarkcSTfOot+Cqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FUpYGCt2sAXyj/tcVcf68DKJD1nbxvSrupi69ZWCqhGQPjPYOTuWkYB7qoFnBgGYt t1vjnw8oGDZqYtmMwbKrDj/oEaB2ouik4NIzuu5+5fehAQw78MHkIZ2KHySxhVrrkR hL63yYAyc7opU1AL9jIHAi7FGDGfDVhiqv9NWm6LtWSwc+0xjXChUNUH38WqeLcBA2 uHvNQsPL2AWvWPSU2ExZNQee023Pkbc1Xzzab4pOjN7xASZGRMcb8oPFzwDQz9UTh8 EzCyEviLUvxc+HnpAxxkdThJ4emhwFKIJt/UywFf03ZuQtyndcW/WaimBI2N7M38rZ By8j2XCR3pUeg== 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.4 23/61] drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Date: Tue, 24 Aug 2021 13:00:28 -0400 Message-Id: <20210824170106.710221-24-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170106.710221-1-sashal@kernel.org> References: <20210824170106.710221-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.143-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.143-rc1 X-KernelTest-Deadline: 2021-08-26T17:01+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 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