From patchwork Wed Jan 26 09:29:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1584396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JkJMj09V6z9tB1 for ; Wed, 26 Jan 2022 20:29:37 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nCecN-0000WD-6J; Wed, 26 Jan 2022 09:29:31 +0000 Received: from mail-pf1-f172.google.com ([209.85.210.172]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nCecL-0000Ud-Os for kernel-team@lists.ubuntu.com; Wed, 26 Jan 2022 09:29:29 +0000 Received: by mail-pf1-f172.google.com with SMTP id n32so13080201pfv.11 for ; Wed, 26 Jan 2022 01:29:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gnf0eUp/ijP6mEjyWBdJ/hKXZMp/BDWDXGgcywqS86A=; b=n7rQDdKdGbyeTVcIz1C44X6zlX38lcnjZA1a0W2Tij66wlLH2OMJm3dAVfuxtudZko COWZLPCEyu/B17UevOSmQ7GUAWK2Ba/y9hXKEPG0ikkn+l0kOqZc3OZpIOTZAjsN+q0o 5OMGlPsoB01ozAFVyP4t3oFjjA1tPTDSuStJLfT/A9ZbmeCe/gArVoLbk0BFAEvb2PPs PM2meBpNAQg8hMiN0OUUHRW//XXDxAcEMq1Tckh4wiViqxYE/NvYo9UYSVqBH7/qE/tx qmNmmgBBlkwxoi8q2Np07iH7Rghyshcem26K1atCweVHKPajq6R2XHv3HtLBkB2Ek4s9 Rd6A== X-Gm-Message-State: AOAM530wr+0tkWzAA62p6cRf2PS6nLXRng3WDdRqTOrnURel5kxYqM9p qonuZuZkYMLqC6EGcekXZlDX5aKnxJMfsME5 X-Google-Smtp-Source: ABdhPJzBpgqYnUzEqt55x+XNihcO2sHh8l9T3YU4UNdEK5/T6tNq5pZE+vEJ5aCELqp5uv0ciec4Lg== X-Received: by 2002:a63:81c3:: with SMTP id t186mr13811586pgd.462.1643189367836; Wed, 26 Jan 2022 01:29:27 -0800 (PST) Received: from localhost (218-173-156-6.dynamic-ip.hinet.net. [218.173.156.6]) by smtp.gmail.com with ESMTPSA id c7sm1378332pfo.131.2022.01.26.01.29.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 01:29:27 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4][SRU][oem-5.14/jammy] drm/amd/display: Fix surface optimization regression on Carrizo Date: Wed, 26 Jan 2022 17:29:19 +0800 Message-Id: <20220126092921.298422-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220126092921.298422-1-vicamo.yang@canonical.com> References: <20220126092921.298422-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.172; envelope-from=vicamo@gmail.com; helo=mail-pf1-f172.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Nicholas Kazlauskas BugLink: https://bugs.launchpad.net/bugs/1957026 [Why] DCE legacy optimization path isn't well tested under new DC optimization flow which can result in underflow occuring when initializing X11 on Carrizo. [How] Retain the legacy optimization flow for DCE and keep the new one for DCN to satisfy optimizations being correctly applied for ASIC that can support it. Fixes: 34316c1e561db0 ("drm/amd/display: Optimize bandwidth on following fast update") Reported-by: Tom St Denis Tested-by: Tom St Denis Reviewed-by: Harry Wentland Signed-off-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher (cherry picked from commit 62e5a7e2333a9f5395f6a9db766b7b06c949fe7a) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 6fb804022de7d..100e3c30bfd0c 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -3049,8 +3049,13 @@ void dc_commit_updates_for_stream(struct dc *dc, if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state) new_pipe->plane_state->force_full_update = true; } - } else if (update_type == UPDATE_TYPE_FAST) { - /* Previous frame finished and HW is ready for optimization. */ + } else if (update_type == UPDATE_TYPE_FAST && dc_ctx->dce_version >= DCE_VERSION_MAX) { + /* + * Previous frame finished and HW is ready for optimization. + * + * Only relevant for DCN behavior where we can guarantee the optimization + * is safe to apply - retain the legacy behavior for DCE. + */ dc_post_update_surfaces_to_stream(dc); } @@ -3109,6 +3114,12 @@ void dc_commit_updates_for_stream(struct dc *dc, } } + /* Legacy optimization path for DCE. */ + if (update_type >= UPDATE_TYPE_FULL && dc_ctx->dce_version < DCE_VERSION_MAX) { + dc_post_update_surfaces_to_stream(dc); + TRACE_DCE_CLOCK_STATE(&context->bw_ctx.bw.dce); + } + return; }