From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 048/100] drm/amd/display: fix odm combine pipe reset Date: Fri, 18 Oct 2019 18:04:33 -0400 Message-ID: <20191018220525.9042-48-sashal@kernel.org> References: <20191018220525.9042-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191018220525.9042-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: Sasha Levin , Tony Cheng , amd-gfx@lists.freedesktop.org, Dmytro Laktyushkin , dri-devel@lists.freedesktop.org, Alex Deucher , Bhawanpreet Lakha List-Id: amd-gfx.lists.freedesktop.org RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KClsg VXBzdHJlYW0gY29tbWl0IGYyNWYwNmI2N2JhMjM3Yjc2MDkyYTZmYzUyMmIxYTk0ZTg0YmZhODUg XQoKV2UgZmFpbCB0byByZXNldCB0aGUgc2Vjb25kIG9kbSBjb21iaW5lIHBpcGUuIFRoaXMgY2hh bmdlIGZpeGVzCm9kbSBwb2ludGVyIG1hbmFnZW1lbnQuCgpTaWduZWQtb2ZmLWJ5OiBEbXl0cm8g TGFrdHl1c2hraW4gPERteXRyby5MYWt0eXVzaGtpbkBhbWQuY29tPgpSZXZpZXdlZC1ieTogVG9u eSBDaGVuZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgpBY2tlZC1ieTogQmhhd2FucHJlZXQgTGFraGEg PEJoYXdhbnByZWV0Lkxha2hhQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8 YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNh c2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjX3Jlc291cmNlLmMgfCA2ICsrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygr KSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvY29yZS9kY19yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGNfcmVzb3VyY2UuYwppbmRleCBkNDQwYjI4ZWU0M2ZiLi42ODk2ZDY5YjhjMjQwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJj ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNl LmMKQEAgLTEzOTksOSArMTM5OSw5IEBAIGJvb2wgZGNfcmVtb3ZlX3BsYW5lX2Zyb21fY29udGV4 dCgKIAkJCSAqIEZvciBoZWFkIHBpcGUgZGV0YWNoIHN1cmZhY2VzIGZyb20gcGlwZSBmb3IgdGFp bAogCQkJICogcGlwZSBqdXN0IHplcm8gaXQgb3V0CiAJCQkgKi8KLQkJCWlmICghcGlwZV9jdHgt PnRvcF9waXBlIHx8Ci0JCQkJKCFwaXBlX2N0eC0+dG9wX3BpcGUtPnRvcF9waXBlICYmCisJCQlp ZiAoIXBpcGVfY3R4LT50b3BfcGlwZSB8fCAoIXBpcGVfY3R4LT50b3BfcGlwZS0+dG9wX3BpcGUg JiYKIAkJCQkJcGlwZV9jdHgtPnRvcF9waXBlLT5zdHJlYW1fcmVzLm9wcCAhPSBwaXBlX2N0eC0+ c3RyZWFtX3Jlcy5vcHApKSB7CisJCQkJcGlwZV9jdHgtPnRvcF9waXBlID0gTlVMTDsKIAkJCQlw aXBlX2N0eC0+cGxhbmVfc3RhdGUgPSBOVUxMOwogCQkJCXBpcGVfY3R4LT5ib3R0b21fcGlwZSA9 IE5VTEw7CiAJCQl9IGVsc2UgewpAQCAtMTgwMyw4ICsxODAzLDYgQEAgZW51bSBkY19zdGF0dXMg ZGNfcmVtb3ZlX3N0cmVhbV9mcm9tX2N0eCgKIAkJCQlkYy0+cmVzX3Bvb2wtPmZ1bmNzLT5yZW1v dmVfc3RyZWFtX2Zyb21fY3R4KGRjLCBuZXdfY3R4LCBzdHJlYW0pOwogCiAJCQltZW1zZXQoZGVs X3BpcGUsIDAsIHNpemVvZigqZGVsX3BpcGUpKTsKLQotCQkJYnJlYWs7CiAJCX0KIAl9CiAKLS0g CjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=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 927C4CA9EA0 for ; Fri, 18 Oct 2019 22:20:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 638A421852 for ; Fri, 18 Oct 2019 22:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571437233; bh=sP7BL7tqYErBOvL8W0EM0ifrxBAL2ZwmaMUBXDKCsdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KkzF1d5STgZwciyfIfP8uxP8rhprSq+SYxGtK7MtrZGeaIueI3PRcOrLI16VSWLQV m8q8bH8lb7h5MgF065/cDjS8tu80gFjnk7ZrpyEr0h1PQedQHxfiWNViEDn7W4Jlep Qww4UkvHe5pEtilABPylx+niRDQoIzCePHRvHHg0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394049AbfJRWUc (ORCPT ); Fri, 18 Oct 2019 18:20:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:38596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731836AbfJRWGj (ORCPT ); Fri, 18 Oct 2019 18:06:39 -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 78629222C2; Fri, 18 Oct 2019 22:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436398; bh=sP7BL7tqYErBOvL8W0EM0ifrxBAL2ZwmaMUBXDKCsdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=valtOsQvBzlvgw7jNJ5cyJgTEKRNy5EHCpL5VXtTx1yj7OG3/oIUs5K82jSFZd5j9 wMe4aMOj0mK9yEgHYn6YnwiBle0tTBAVmUoUa0mxRxmOXRTQmcUCwrSJTQaYgnCp6Y lnM+e4HsvKf7Gc6zCEaZngFN4TgolzqoR9WcE+fI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmytro Laktyushkin , Tony Cheng , Bhawanpreet Lakha , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 048/100] drm/amd/display: fix odm combine pipe reset Date: Fri, 18 Oct 2019 18:04:33 -0400 Message-Id: <20191018220525.9042-48-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220525.9042-1-sashal@kernel.org> References: <20191018220525.9042-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: Dmytro Laktyushkin [ Upstream commit f25f06b67ba237b76092a6fc522b1a94e84bfa85 ] We fail to reset the second odm combine pipe. This change fixes odm pointer management. Signed-off-by: Dmytro Laktyushkin Reviewed-by: Tony Cheng Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index d440b28ee43fb..6896d69b8c240 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1399,9 +1399,9 @@ bool dc_remove_plane_from_context( * For head pipe detach surfaces from pipe for tail * pipe just zero it out */ - if (!pipe_ctx->top_pipe || - (!pipe_ctx->top_pipe->top_pipe && + if (!pipe_ctx->top_pipe || (!pipe_ctx->top_pipe->top_pipe && pipe_ctx->top_pipe->stream_res.opp != pipe_ctx->stream_res.opp)) { + pipe_ctx->top_pipe = NULL; pipe_ctx->plane_state = NULL; pipe_ctx->bottom_pipe = NULL; } else { @@ -1803,8 +1803,6 @@ enum dc_status dc_remove_stream_from_ctx( dc->res_pool->funcs->remove_stream_from_ctx(dc, new_ctx, stream); memset(del_pipe, 0, sizeof(*del_pipe)); - - break; } } -- 2.20.1