From patchwork Wed Oct 19 08:24:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp225471wrs; Wed, 19 Oct 2022 02:43:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4U+oYdBD7VIyDj6alBok/A6AlJxtgTPp5pMAjd9kibytTMx3ggJOTewDOS59Kf3KEo1i7b X-Received: by 2002:a17:906:9c83:b0:779:c14c:55e4 with SMTP id fj3-20020a1709069c8300b00779c14c55e4mr5783397ejc.619.1666172594499; Wed, 19 Oct 2022 02:43:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172594; cv=none; d=google.com; s=arc-20160816; b=GOZ8VCOQO1X8WCKZMe+woKOhNr9qYEcNVF2Kz1IFnZNLYmqImbDjsl4Uu00vBHSJd4 Wv8/7IM59OZeBuk35X+2Rc2NHYq+AvKT0dGiS2tbJEJLtTC0CHwVUiHR61W7/e0eNAIm jR+jWScOgAqXQdXUyo1voODMtGPzPLaut8oWn9631bI3/MXK2eewhZ93/vi8M8unALGP c76hpXV7wjurmIkYe5FmCia3xS81xMLeDuaHicNwl/unux1JT3eN+sYa/KsHkZ7uzJO6 TLoQLW7rNQZDQ46E/0mBPpEGnn7/Sr/GhWNEU3Wlu/slBmJA5Rw1VDEkFM1DSBvfAXYz njWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SfDvvXMg5h/QVpqB7euuwvGnK28d/pIaEQo+5wShuAA=; b=RKoYopBXosN5gAeysY/LHt2kQhB7y+iulZ1Urnt2h/8BGLjjhlEUPoNcfx8FGnIMWj rGbNgfsdXQKGOeledsi1/RgVU9ACcPn4/wiFYseRhHNTYjEXtwkm6KCmQW6C+whoYUu5 7SiaZjk1Vp+m9/8cx2QKt5fu0Lqo2U4bxbQ43FDryUjvsoGnSGsP6i+HuolcxxVkqHgp Mkd62CJ8TTgji4u4L4z7gY7QQCUcpMIp/RJn56tr/WwFow9vbGyUU3q4Qqcak7J+rFC8 SxWTEDQNyICjvNSVv7YMC81oIcsYCKn4Pb5+SdM01P023mavT8+76NmGObS12fje/Pup Y3bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i18ghHer; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b18-20020a056402279200b00457137b2571si15664056ede.346.2022.10.19.02.42.49; Wed, 19 Oct 2022 02:43:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i18ghHer; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233694AbiJSJde (ORCPT + 99 others); Wed, 19 Oct 2022 05:33:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233767AbiJSJ3W (ORCPT ); Wed, 19 Oct 2022 05:29:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC2CBEA34D; Wed, 19 Oct 2022 02:12:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AA70861842; Wed, 19 Oct 2022 08:48:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C18F5C433C1; Wed, 19 Oct 2022 08:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169313; bh=rP8fi7/1mKRy5KGdXb8UDqgm0AaRj4fhC/uVF8esU+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i18ghHerJt+PS/WRm7eypGDHyiRvJp2hOOfvgE+asn2FgcaAw4CyNoH5MrDgvSZto C0IQ4yKsjgUFO+k7kLvpLEqUoV3ByA4nS57kWE4E05hAzR+SpPzT9ZAqV94k8eATl+ ju9AM8YZK27PNBMRd3cwjbhvU5BdDjdfFE1klnYU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aurabindo Pillai , Rodrigo Siqueira , Alex Deucher Subject: [PATCH 6.0 195/862] drm/amd/display: Enable 2 to 1 ODM policy if supported Date: Wed, 19 Oct 2022 10:24:42 +0200 Message-Id: <20221019083258.604604276@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747108594447569308?= X-GMAIL-MSGID: =?utf-8?q?1747108594447569308?= From: Rodrigo Siqueira commit 54fae65ff469a79fc0ca46f480c4e7fce50f3963 upstream. If the current configuration supports 2 to 1 ODM policy, let's also enable the windowed MPO feature. Reviewed-by: Aurabindo Pillai Signed-off-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.0.x Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c @@ -1001,6 +1001,10 @@ void dcn32_init_hw(struct dc *dc) dc_dmub_srv_query_caps_cmd(dc->ctx->dmub_srv->dmub); dc->caps.dmub_caps.psr = dc->ctx->dmub_srv->dmub->feature_caps.psr; } + + /* Enable support for ODM and windowed MPO if policy flag is set */ + if (dc->debug.enable_single_display_2to1_odm_policy) + dc->config.enable_windowed_mpo_odm = true; } static int calc_mpc_flow_ctrl_cnt(const struct dc_stream_state *stream,