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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 D5DB5C38A2F for ; Sat, 18 Apr 2020 13:52:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A926A2054F for ; Sat, 18 Apr 2020 13:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587217948; bh=ktOL1ydxzqjwgC18kkjSNwKIWzjyXW14+koKA7uZfqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZfwNK7LnVY2D6QVIV7F1nVSv8ERmC8ZO07HZsfekQISApELkdP3u3G08K5E7SLF21 rRvNqe2VkazYuYdCectTx7yv7v8XXlIXfj+s6uukPYvha4jEqmD0b6tWFW9O850K8A yPKEJO2p08Wk9O5CSVXWJuPDT+qyUp70eoQuo22o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726515AbgDRNsp (ORCPT ); Sat, 18 Apr 2020 09:48:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:55238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726507AbgDRNsp (ORCPT ); Sat, 18 Apr 2020 09:48:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 28E6022250; Sat, 18 Apr 2020 13:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587217725; bh=ktOL1ydxzqjwgC18kkjSNwKIWzjyXW14+koKA7uZfqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jTr6u198wX9KaGosz0zQPFqq1/Q3CHBeJzsOydehTxkJLlig6LXi1UoMlUO1KtAPs AIKzZ0XQz5vIm2QDcuVInoK/xjmoA6uZnr0vGpm2ymgKYfYBqviqnkGxisy7i76VGs zRgoeV+OaugVl6n5SQ/qiN3ZxntiznAwdQnrLde4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Isabel Zhang , Alvin Lee , Rodrigo Siqueira , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.6 24/73] drm/amd/display: Update stream adjust in dc_stream_adjust_vmin_vmax Date: Sat, 18 Apr 2020 09:47:26 -0400 Message-Id: <20200418134815.6519-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418134815.6519-1-sashal@kernel.org> References: <20200418134815.6519-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Isabel Zhang [ Upstream commit 346d8a0a3c91888a412c2735d69daa09c00f0203 ] [Why] After v_total_min and max are updated in vrr structure, the changes are not reflected in stream adjust. When these values are read from stream adjust it does not reflect the actual state of the system. [How] Set stream adjust values equal to vrr adjust values after vrr adjust values are updated. Signed-off-by: Isabel Zhang Reviewed-by: Alvin Lee Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 04441dbcba76f..fc25600107050 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -283,6 +283,8 @@ bool dc_stream_adjust_vmin_vmax(struct dc *dc, int i = 0; bool ret = false; + stream->adjust = *adjust; + for (i = 0; i < MAX_PIPES; i++) { struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i]; -- 2.20.1