Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1724621ybz; Sat, 18 Apr 2020 07:13:15 -0700 (PDT) X-Google-Smtp-Source: APiQypI5/qBF31XYlR/gQVKOd15a7G4mDPJe/rhTMTsmoDNM6CUtRIlozaeC2JDbxXaZWYTTyNiP X-Received: by 2002:aa7:cb0f:: with SMTP id s15mr7114455edt.164.1587219195250; Sat, 18 Apr 2020 07:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587219195; cv=none; d=google.com; s=arc-20160816; b=UBJ+miwCsqlpsDuF3RIDzPKttEAq5P4Sz1gDfkVOO32fWXlv1Z5InQm/vr0YC7P/WI 32ZTFRzRxnhST4AZACz2etz1YZZKVib6OYkEqXbDLp5FLi1bF15fI41SdhzqAMgeeea3 l0UCo8A95YYqwUHp0YjkrtbaBDiov08OdI1RSSa79nQTcbZMHuFmsqXW+0TisG1fCwFL aitQ4Jx9/QFWSIos5GHF4W2/O6J7zeZKuDVh4H+UfvYqJ22TDkEi8PzCuYHaqm1FqWm1 0h8iGptQnSTSgB6sjca3rZOW8rgeZ3uZJb01fmK2GV7NwXAHPrfTM5C4nnzXnHutu1Ts h4WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T3X+ssC9VWgMEyxtYLYdlNLPB/BO5s9IeUXIOrAEM6Q=; b=HIqLQ1HckFGK5bVDw3Ess+/8ORZIe3Kpnr5FKfbK6+bmF0j1tBC2ZaVviZ21KESZ69 RljhM8X9gtI/3yg8HfjSOkaNQmuZ3vZj1+ibdZbHf527XNLYm7yggEd6eJWH5CGV5r/k MSFUKW6mu/3yYIC7C4YzGp0uY69JPRQwtxURx1gODgLWFUjtEpH6u1XHKXKoYcYdukRb yVgj8jpE1rLQAtTu+oTIyp6W43ULhXxH5DbUkQBPSb7meg+rm6RuGhIbp/Og71tBQXMO X5h/jPaXS1QCIe5yPSr78rWwTljlEUqOtLbAL4W2X2Tk37ufd8df6V8+iENDQCm5Rasu dnqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cNOpOwh2; 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 z21si9996197edq.21.2020.04.18.07.12.52; Sat, 18 Apr 2020 07:13:15 -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=default header.b=cNOpOwh2; 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 S1726619AbgDROJm (ORCPT + 99 others); Sat, 18 Apr 2020 10:09:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:37154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726381AbgDROJh (ORCPT ); Sat, 18 Apr 2020 10:09:37 -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 8966C22264; Sat, 18 Apr 2020 14:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587218977; bh=t+ZPscPzbyfoTQHlhnzdFV0Ms4DnznSLNomF0dIU/q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cNOpOwh21cNpoqE8mlZgZwlPEpugpnJXu/TnAQFSec9ehhL+VpUdlY0b1kuj2iTyl /9x16LcXozkIUjKvRxxEZJ59nJw9tSG2/dOwEcra/V9l/f+6UtUHVLJkOx4lOX4O6H UUeFpwhc2/9y6UGnP13xUuI/g34N/vZ1XYa+1g90= 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.5 22/75] drm/amd/display: Update stream adjust in dc_stream_adjust_vmin_vmax Date: Sat, 18 Apr 2020 10:08:17 -0400 Message-Id: <20200418140910.8280-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 8904a85186aab..7fdbb47e8c259 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