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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 711C7C2D0CE for ; Sun, 29 Dec 2019 18:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BDFB207E0 for ; Sun, 29 Dec 2019 18:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643058; bh=i7pFDxDMxBxFq1gXluXcIXMqojXanOmX46ZyKYyuAJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S+FiIap0CWw9RDQ5QLUKOzrB0OgEW7sxdRP0qE2c0i2zEZa1ixQHOw7X7dWJ+ZByH 03t5GGSdhXX3ptt6ioBPfeZ2Maglf9Ne6tLcuC3dHsJ001aZGUhBfTgbmzjvAxH00M 8yQ4KETwJoNU5K58WP7Oa4uRzP18ShNyPH97NYzk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730548AbfL2Rnr (ORCPT ); Sun, 29 Dec 2019 12:43:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:51444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbfL2Rnq (ORCPT ); Sun, 29 Dec 2019 12:43:46 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3033820718; Sun, 29 Dec 2019 17:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641425; bh=i7pFDxDMxBxFq1gXluXcIXMqojXanOmX46ZyKYyuAJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dRfIHeTwa8uGxTLVcbgvNqxN2m3NvES6yZQQ452KfL7sqeMGYpqLX7tZRwgTPfLrc m76Ck8SzTxMRa7ciuCnh8w5PAXDBzGoe5C17qAilJri4euUjhRwrS+0Ol2ptXwS6rs TOTKE1vZZZ0MobxMpIHgMwRmvZOPfUSUbNcavMhE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikita Lipski , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 058/434] drm/amd/display: Rebuild mapped resources after pipe split Date: Sun, 29 Dec 2019 18:21:51 +0100 Message-Id: <20191229172705.703095248@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mikita Lipski [ Upstream commit 387596ef2859c37d564ce15abddbc9063a132e2c ] [why] The issue is specific for linux, as on timings such as 8K@60 or 4K@144 DSC should be working in combination with ODM Combine in order to ensure that we can run those timings. The validation for those timings was passing, but when pipe split was happening second pipe wasn't being programmed. [how] Rebuild mapped resources if we split stream for ODM. Signed-off-by: Mikita Lipski Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index 3980c7b78259..ebe67c34dabf 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -2474,6 +2474,7 @@ bool dcn20_fast_validate_bw( &context->res_ctx, dc->res_pool, pipe, hsplit_pipe)) goto validate_fail; + dcn20_build_mapped_resource(dc, context, pipe->stream); } else dcn20_split_stream_for_mpc( &context->res_ctx, dc->res_pool, -- 2.20.1