From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 079/192] drm/amd/display: Clear stream->mode_changed after commit Date: Wed, 27 Mar 2019 14:08:31 -0400 Message-ID: <20190327181025.13507-79-sashal@kernel.org> References: <20190327181025.13507-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190327181025.13507-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org, Nicholas Kazlauskas , amd-gfx@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org RnJvbTogTmljaG9sYXMgS2F6bGF1c2thcyA8bmljaG9sYXMua2F6bGF1c2thc0BhbWQuY29tPgoK WyBVcHN0cmVhbSBjb21taXQgZDhkMmYxNzRiY2MyYzI2YzM0ODVjNzBlMGM2ZmUyMmIyN2JjZTcz OSBdCgpbV2h5XQpUaGUgc3RyZWFtLT5tb2RlX2NoYW5nZWQgZmxhZyBjYW4gcGVyc2lzdCBpbiB0 aGUgZm9sbG93aW5nIHNlcXVlbmNlCm9mIGF0b21pYyBjb21taXRzOgoKQ29tbWl0IDE6CkVuYWJs ZSBDUlRDMCAobW9kZV9jaGFuZ2VkID0gdHJ1ZSksIEVuYWJsZSBDUlRDMSAobW9kZV9jaGFuZ2Vk ID0gdHJ1ZSkKCkNvbW1pdCAyOgpEaXNhYmxlIENSVEMxIChtb2RlX2NoYW5nZWQgPSBmYWxzZSkK CkluIHRoaXMgc2VxdWVuY2Ugd2Ugd2FudCB0byBrZWVwIHRoZSBleGl0aW5nIENSVEMwIGJ1dCBp dCdzIG5vdCBpbiB0aGUKYXRvbWljIHN0YXRlIGZvciB0aGUgY29tbWl0IHNpbmNlIGl0IGhhc24n dCBiZWVuIG1vZGlmaWVkLiBJbiB0aGlzIGNhc2UKdGhlIHN0cmVhbS0+bW9kZV9jaGFuZ2VkIGZs YWcgcGVyc2lzdHMgYXMgdHJ1ZSBhbmQgd2UgZG9uJ3QgcmUtcHJvZ3JhbQp0aGUgcGxhbmVzIGZv ciB0aGUgZXhpc3Rpbmcgc3RyZWFtLgoKW0hvd10KVGhlIGZsYWcgbmVlZHMgdG8gYmUgY2xlYXJl ZCBhbmQgaXQgbWFrZXMgdGhlIG1vc3Qgc2Vuc2UgdG8gZG8gaXQgd2l0aGluCkRDIGFmdGVyIHRo ZSBzdGF0ZSBoYXMgYmVlbiBjb21taXR0ZWQuIE5vdGhpbmcgZm9sbG93aW5nIGRjX2NvbW1pdF9z dGF0ZQpzaG91bGQgdGhpbmsgdGhhdCB0aGUgc3RyZWFtJ3MgbW9kZSBoYXMgY2hhbmdlZC4KClNp Z25lZC1vZmYtYnk6IE5pY2hvbGFzIEthemxhdXNrYXMgPG5pY2hvbGFzLmthemxhdXNrYXNAYW1k LmNvbT4KUmV2aWV3ZWQtYnk6IExlbyBMaSA8c3VucGVuZy5saUBhbWQuY29tPgpBY2tlZC1ieTog VG9ueSBDaGVuZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNo ZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmlu IDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv Y29yZS9kYy5jIHwgMyArKysKIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKykKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYwppbmRleCA5MDQ1ZTZmYTA3ODAuLmJi MGNkYTcyNzYwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Nv cmUvZGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCkBA IC05NTgsNiArOTU4LDkgQEAgc3RhdGljIGVudW0gZGNfc3RhdHVzIGRjX2NvbW1pdF9zdGF0ZV9u b19jaGVjayhzdHJ1Y3QgZGMgKmRjLCBzdHJ1Y3QgZGNfc3RhdGUgKmMKIAkvKiBwcGxpYiBpcyBu b3RpZmllZCBpZiBkaXNwX251bSBjaGFuZ2VkICovCiAJZGMtPmh3c3Muc2V0X2JhbmR3aWR0aChk YywgY29udGV4dCwgdHJ1ZSk7CiAKKwlmb3IgKGkgPSAwOyBpIDwgY29udGV4dC0+c3RyZWFtX2Nv dW50OyBpKyspCisJCWNvbnRleHQtPnN0cmVhbXNbaV0tPm1vZGVfY2hhbmdlZCA9IGZhbHNlOwor CiAJZGNfcmVsZWFzZV9zdGF0ZShkYy0+Y3VycmVudF9zdGF0ZSk7CiAKIAlkYy0+Y3VycmVudF9z dGF0ZSA9IGNvbnRleHQ7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbA== 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 7ED3DC43381 for ; Wed, 27 Mar 2019 18:12:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49C302147C for ; Wed, 27 Mar 2019 18:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710366; bh=p/og8pn/YFx5Lg7fsIAArDOb7J0jx4Uo21Wa/X2cxnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tBIVrnIwHFz6VHrl4wBph7TPePtepcPneYkzxUEtHgJI+gMwpXiqW7AKxYNlWKXE9 lnlVXqSCqKbYGcyu8WmfZieMzPWAz8gmu2UA8YgDXKkc8aUl9BSElatQV0RqqAHqt9 l87S5Y7NvcuFxrM31V+NXhe5rIf5pBCYf3jIeAwA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389255AbfC0SMo (ORCPT ); Wed, 27 Mar 2019 14:12:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:55098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389246AbfC0SMk (ORCPT ); Wed, 27 Mar 2019 14:12:40 -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 283002054F; Wed, 27 Mar 2019 18:12:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710359; bh=p/og8pn/YFx5Lg7fsIAArDOb7J0jx4Uo21Wa/X2cxnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JCgMrCUGGjq9aRkyYf2f2LnufVtF/QcvvweW/bmb01TZ+8LPJKi1sysmubiyd9i9D VaknyVUgGW1DWVaLmTVwVX+kbEVg3BBg+OZ1qypbCFaKbHkd9dN0jZjuXUcIH+K0Yo tj+gPL2mSxc30hGxKveJurA6M2xAWvasjd0D+m/M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicholas Kazlauskas , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 079/192] drm/amd/display: Clear stream->mode_changed after commit Date: Wed, 27 Mar 2019 14:08:31 -0400 Message-Id: <20190327181025.13507-79-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327181025.13507-1-sashal@kernel.org> References: <20190327181025.13507-1-sashal@kernel.org> MIME-Version: 1.0 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: Nicholas Kazlauskas [ Upstream commit d8d2f174bcc2c26c3485c70e0c6fe22b27bce739 ] [Why] The stream->mode_changed flag can persist in the following sequence of atomic commits: Commit 1: Enable CRTC0 (mode_changed = true), Enable CRTC1 (mode_changed = true) Commit 2: Disable CRTC1 (mode_changed = false) In this sequence we want to keep the exiting CRTC0 but it's not in the atomic state for the commit since it hasn't been modified. In this case the stream->mode_changed flag persists as true and we don't re-program the planes for the existing stream. [How] The flag needs to be cleared and it makes the most sense to do it within DC after the state has been committed. Nothing following dc_commit_state should think that the stream's mode has changed. Signed-off-by: Nicholas Kazlauskas Reviewed-by: Leo Li Acked-by: Tony Cheng Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 9045e6fa0780..bb0cda727605 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -958,6 +958,9 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c /* pplib is notified if disp_num changed */ dc->hwss.set_bandwidth(dc, context, true); + for (i = 0; i < context->stream_count; i++) + context->streams[i]->mode_changed = false; + dc_release_state(dc->current_state); dc->current_state = context; -- 2.19.1