From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 28/81] drm/amd/display: If one stream full updates, full update all planes Date: Tue, 7 May 2019 01:34:59 -0400 Message-ID: <20190507053554.30848-28-sashal@kernel.org> References: <20190507053554.30848-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190507053554.30848-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Bhawanpreet Lakha , David Francis , Roman Li , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , Nicholas Kazlauskas RnJvbTogRGF2aWQgRnJhbmNpcyA8RGF2aWQuRnJhbmNpc0BhbWQuY29tPgoKWyBVcHN0cmVhbSBj b21taXQgYzIzOGJmZTBiZTllZjc0MjBmNzY2OWE2OWUyN2M4YzhmNGQ4YTU2OCBdCgpbV2h5XQpP biBzb21lIGNvbXBvc2l0b3JzLCB3aXRoIHR3byBtb25pdG9ycyBhdHRhY2hlZCwgVlQgdGVybWlu YWwKc3dpdGNoIGNhbiBjYXVzZSBhIGdyYXBoaWNhbCBpc3N1ZSBieSB0aGUgZm9sbG93aW5nIG1l YW5zOgoKVGhlcmUgYXJlIHR3byBzdHJlYW1zLCBvbmUgZm9yIGVhY2ggbW9uaXRvci4gRWFjaCBz dHJlYW0gaGFzIG9uZQpwbGFuZQoKY3VycmVudCBzdGF0ZToKCU0xOlMxLT5QMQoJTTI6UzItPlAy CgpUaGUgdXNlciBjYWxscyBmb3IgYSB0ZXJtaW5hbCBzd2l0Y2ggYW5kIGEgY29tbWl0IGlzIG1h ZGUgdG8KY2hhbmdlIGJvdGggcGxhbmVzIHRvIGxpbmVhciBzd2l6emxlIG1vZGUuIEluIGF0b21p YyBjaGVjaywKYSBuZXcgZGNfc3RhdGUgaXMgY29uc3RydWN0ZWQgd2l0aCBuZXcgcGxhbmVzIG9u IGVhY2ggc3RyZWFtCgpuZXcgc3RhdGU6CglNMTpTMS0+UDMKCU0yOlMyLT5QNAoKSW4gY29tbWl0 IHRhaWwsIGVhY2ggc3RyZWFtIGlzIGNvbW1pdHRlZCwgb25lIGF0IGEgdGltZS4gVGhlIGZpcnN0 CnN0cmVhbSAoUzEpIHVwZGF0ZXMgcHJvcGVybHksIHRyaWdnZXJyaW5nIGEgZnVsbCB1cGRhdGUg YW5kIHJlcGxhY2luZwp0aGUgc3RhdGUKCmN1cnJlbnQgc3RhdGU6CglNMTpTMS0+UDMKCU0yOlMy LT5QNAoKVGhlIHVwZGF0ZSBmb3IgUzIgY29tZXMgaW4sIGJ1dCBkYyBkZXRlY3RzIHRoYXQgdGhl cmUgaXMgbm8gZGlmZmVyZW5jZQpiZXR3ZWVuIHRoZSBzdHJlYW0gYW5kIHBsYW5lIGluIHRoZSBu ZXcgYW5kIGN1cnJlbnQgc3RhdGVzLCBhbmQgc28KdHJpZ2dlcnMgYSBmYXN0IHVwZGF0ZS4gVGhl IGZhc3QgdXBkYXRlIGRvZXMgbm90IHByb2dyYW0gc3dpenpsZSwKc28gdGhlIHNlY29uZCBtb25p dG9yIGlzIGNvcnJ1cHRlZAoKW0hvd10KQWRkIGEgZmxhZyB0byBkY19wbGFuZV9zdGF0ZSB0aGF0 IGZvcmNlcyBmdWxsIHVwZGF0ZXMKCldoZW4gYSBzdHJlYW0gdW5kZXJnb2VzIGEgZnVsbCB1cGRh dGUsIHNldCB0aGlzIGZsYWcgb24gYWxsIGNoYW5nZWQKcGxhbmVzLCB0aGVuIGNsZWFyIGl0IG9u IHRoZSBjdXJyZW50IHN0cmVhbQoKU3Vic2VxdWVudCBzdHJlYW1zIHdpbGwgZ2V0IGZ1bGwgdXBk YXRlcyBhcyBhIHJlc3VsdAoKU2lnbmVkLW9mZi1ieTogRGF2aWQgRnJhbmNpcyA8RGF2aWQuRnJh bmNpc0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBOaWNob2xhcyBLYXpsYXVza2FzIDxuaWNob2xh cy5rYXpsYXVza2FzQGFtZC5jb20+ClJldmlld2VkLWJ5OiBSb21hbiBMaSA8Um9tYW4uTGlAYW1k LmNvbT4KQWNrZWQtYnk6IEJoYXdhbnByZWV0IExha2hhIDxCaGF3YW5wcmVldCBMYWtoYUBhbWQu Y29tPgpBY2tlZC1ieTogTmljaG9sYXMgS2F6bGF1c2thcyA8TmljaG9sYXMuS2F6bGF1c2thc0Bh bWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFt ZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jIHwgMTkgKysrKysrKysr KysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmggICAgICB8ICAz ICsrKwogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKaW5kZXggYmIwY2RhNzI3NjA1Li5lM2Y1ZTVkNmYwYzEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYwpAQCAtMTIxMyw2ICsx MjEzLDExIEBAIHN0YXRpYyBlbnVtIHN1cmZhY2VfdXBkYXRlX3R5cGUgZGV0X3N1cmZhY2VfdXBk YXRlKGNvbnN0IHN0cnVjdCBkYyAqZGMsCiAJCXJldHVybiBVUERBVEVfVFlQRV9GVUxMOwogCX0K IAorCWlmICh1LT5zdXJmYWNlLT5mb3JjZV9mdWxsX3VwZGF0ZSkgeworCQl1cGRhdGVfZmxhZ3Mt PmJpdHMuZnVsbF91cGRhdGUgPSAxOworCQlyZXR1cm4gVVBEQVRFX1RZUEVfRlVMTDsKKwl9CisK IAl0eXBlID0gZ2V0X3BsYW5lX2luZm9fdXBkYXRlX3R5cGUodSk7CiAJZWxldmF0ZV91cGRhdGVf dHlwZSgmb3ZlcmFsbF90eXBlLCB0eXBlKTsKIApAQCAtMTQ2Nyw2ICsxNDcyLDE0IEBAIHZvaWQg ZGNfY29tbWl0X3VwZGF0ZXNfZm9yX3N0cmVhbShzdHJ1Y3QgZGMgKmRjLAogCQl9CiAKIAkJZGNf cmVzb3VyY2Vfc3RhdGVfY29weV9jb25zdHJ1Y3Qoc3RhdGUsIGNvbnRleHQpOworCisJCWZvciAo aSA9IDA7IGkgPCBkYy0+cmVzX3Bvb2wtPnBpcGVfY291bnQ7IGkrKykgeworCQkJc3RydWN0IHBp cGVfY3R4ICpuZXdfcGlwZSA9ICZjb250ZXh0LT5yZXNfY3R4LnBpcGVfY3R4W2ldOworCQkJc3Ry dWN0IHBpcGVfY3R4ICpvbGRfcGlwZSA9ICZkYy0+Y3VycmVudF9zdGF0ZS0+cmVzX2N0eC5waXBl X2N0eFtpXTsKKworCQkJaWYgKG5ld19waXBlLT5wbGFuZV9zdGF0ZSAmJiBuZXdfcGlwZS0+cGxh bmVfc3RhdGUgIT0gb2xkX3BpcGUtPnBsYW5lX3N0YXRlKQorCQkJCW5ld19waXBlLT5wbGFuZV9z dGF0ZS0+Zm9yY2VfZnVsbF91cGRhdGUgPSB0cnVlOworCQl9CiAJfQogCiAKQEAgLTE1MTAsNiAr MTUyMywxMiBAQCB2b2lkIGRjX2NvbW1pdF91cGRhdGVzX2Zvcl9zdHJlYW0oc3RydWN0IGRjICpk YywKIAkJZGMtPmN1cnJlbnRfc3RhdGUgPSBjb250ZXh0OwogCQlkY19yZWxlYXNlX3N0YXRlKG9s ZCk7CiAKKwkJZm9yIChpID0gMDsgaSA8IGRjLT5yZXNfcG9vbC0+cGlwZV9jb3VudDsgaSsrKSB7 CisJCQlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4ID0gJmNvbnRleHQtPnJlc19jdHgucGlwZV9j dHhbaV07CisKKwkJCWlmIChwaXBlX2N0eC0+cGxhbmVfc3RhdGUgJiYgcGlwZV9jdHgtPnN0cmVh bSA9PSBzdHJlYW0pCisJCQkJcGlwZV9jdHgtPnBsYW5lX3N0YXRlLT5mb3JjZV9mdWxsX3VwZGF0 ZSA9IGZhbHNlOworCQl9CiAJfQogCS8qbGV0J3MgdXNlIGN1cnJlbnRfc3RhdGUgdG8gdXBkYXRl IHdhdGVybWFyayBldGMqLwogCWlmICh1cGRhdGVfdHlwZSA+PSBVUERBVEVfVFlQRV9GVUxMKQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmggYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaAppbmRleCA2Yzk5OTBiZWYyNjcuLjQwOTRiNGY1 MDExMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKQEAgLTUwNSw2ICs1MDUsOSBA QCBzdHJ1Y3QgZGNfcGxhbmVfc3RhdGUgewogCXN0cnVjdCBkY19wbGFuZV9zdGF0dXMgc3RhdHVz OwogCXN0cnVjdCBkY19jb250ZXh0ICpjdHg7CiAKKwkvKiBIQUNLOiBXb3JrYXJvdW5kIGZvciBm b3JjaW5nIGZ1bGwgcmVwcm9ncmFtbWluZyB1bmRlciBzb21lIGNvbmRpdGlvbnMgKi8KKwlib29s IGZvcmNlX2Z1bGxfdXBkYXRlOworCiAJLyogcHJpdmF0ZSB0byBkY19zdXJmYWNlLmMgKi8KIAll bnVtIGRjX2lycV9zb3VyY2UgaXJxX3NvdXJjZTsKIAlzdHJ1Y3Qga3JlZiByZWZjb3VudDsKLS0g CjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K YW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 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, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 38657C004C9 for ; Tue, 7 May 2019 05:36:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B822214AE for ; Tue, 7 May 2019 05:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207416; bh=clrPM4CFPlojpFNLi38ihxaDZv5nUbuSloyLlsDPuJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cKTwKWCMmpD9SjkIKOxySPXc36pD/+ytjonnbLBJeLnEt0L/3/Tsgqe8H4ziIlrxP wbTpzbxFr8oXMXN4DWgDCCzjSuMa1jTBRUl2VQLeO2awBavWOcTTiNKguRm+FjAdXK BhNR3bNHhmsalmutIpBuACjCO+yuKNfBTS1NuVMs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728199AbfEGFgy (ORCPT ); Tue, 7 May 2019 01:36:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:56626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbfEGFgw (ORCPT ); Tue, 7 May 2019 01:36:52 -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 36C5A20989; Tue, 7 May 2019 05:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207411; bh=clrPM4CFPlojpFNLi38ihxaDZv5nUbuSloyLlsDPuJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUHL9d8l1fWkmpsHc4cSZFo0D4yZgyWpPb8BTxrFgWEcp2MNmlepSqc1hiIerq29v GmiFgqhAwW1B2v9wR9gN18KIwszo5rDdxqBpF3DjZWmvsEdnyBHVRlLGazblcsudQy 77t/7AY0nAZV/UJvjWb3HXhijVdosTSycxW6gXRM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Francis , Nicholas Kazlauskas , Roman Li , Bhawanpreet Lakha , Nicholas Kazlauskas , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 28/81] drm/amd/display: If one stream full updates, full update all planes Date: Tue, 7 May 2019 01:34:59 -0400 Message-Id: <20190507053554.30848-28-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053554.30848-1-sashal@kernel.org> References: <20190507053554.30848-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: David Francis [ Upstream commit c238bfe0be9ef7420f7669a69e27c8c8f4d8a568 ] [Why] On some compositors, with two monitors attached, VT terminal switch can cause a graphical issue by the following means: There are two streams, one for each monitor. Each stream has one plane current state: M1:S1->P1 M2:S2->P2 The user calls for a terminal switch and a commit is made to change both planes to linear swizzle mode. In atomic check, a new dc_state is constructed with new planes on each stream new state: M1:S1->P3 M2:S2->P4 In commit tail, each stream is committed, one at a time. The first stream (S1) updates properly, triggerring a full update and replacing the state current state: M1:S1->P3 M2:S2->P4 The update for S2 comes in, but dc detects that there is no difference between the stream and plane in the new and current states, and so triggers a fast update. The fast update does not program swizzle, so the second monitor is corrupted [How] Add a flag to dc_plane_state that forces full updates When a stream undergoes a full update, set this flag on all changed planes, then clear it on the current stream Subsequent streams will get full updates as a result Signed-off-by: David Francis Signed-off-by: Nicholas Kazlauskas Reviewed-by: Roman Li Acked-by: Bhawanpreet Lakha Acked-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc.c | 19 +++++++++++++++++++ drivers/gpu/drm/amd/display/dc/dc.h | 3 +++ 2 files changed, 22 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index bb0cda727605..e3f5e5d6f0c1 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1213,6 +1213,11 @@ static enum surface_update_type det_surface_update(const struct dc *dc, return UPDATE_TYPE_FULL; } + if (u->surface->force_full_update) { + update_flags->bits.full_update = 1; + return UPDATE_TYPE_FULL; + } + type = get_plane_info_update_type(u); elevate_update_type(&overall_type, type); @@ -1467,6 +1472,14 @@ void dc_commit_updates_for_stream(struct dc *dc, } dc_resource_state_copy_construct(state, context); + + for (i = 0; i < dc->res_pool->pipe_count; i++) { + struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i]; + struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i]; + + if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state) + new_pipe->plane_state->force_full_update = true; + } } @@ -1510,6 +1523,12 @@ void dc_commit_updates_for_stream(struct dc *dc, dc->current_state = context; dc_release_state(old); + for (i = 0; i < dc->res_pool->pipe_count; i++) { + struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; + + if (pipe_ctx->plane_state && pipe_ctx->stream == stream) + pipe_ctx->plane_state->force_full_update = false; + } } /*let's use current_state to update watermark etc*/ if (update_type >= UPDATE_TYPE_FULL) diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 6c9990bef267..4094b4f50111 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -505,6 +505,9 @@ struct dc_plane_state { struct dc_plane_status status; struct dc_context *ctx; + /* HACK: Workaround for forcing full reprogramming under some conditions */ + bool force_full_update; + /* private to dc_surface.c */ enum dc_irq_source irq_source; struct kref refcount; -- 2.20.1