From patchwork Tue May 17 08:28:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1632107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=WTbywWfA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 4L2Tmb6L1wz9s0r for ; Tue, 17 May 2022 18:29:03 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nqsZe-0007pJ-4U; Tue, 17 May 2022 08:28:58 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nqsZb-0007m5-AX for kernel-team@lists.ubuntu.com; Tue, 17 May 2022 08:28:55 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E131D3F5F4 for ; Tue, 17 May 2022 08:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652776134; bh=4nlvKKZrUeIIhtyku8hWOGRRSa9ib/KJt3Z3re94TFY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WTbywWfAwTGf0QRhXQCCVo/dITmV7s8Pef+1J9E8/lWTOTVZwSoazvrIBoMH0pkxq FBmy4lAvUiryVbkKIWBgHnBArY5KJSc6rl6NagjyKKPf+rrFQIa86C2x8adh0eXDH8 OlbgjbRmI+FxRNDJkw7MYiU+2Oun/sXTd2AF0GhBMOqkjg/6uEBSUywr6j1dO0mgKy zWuSEzAw5m3m5HcYeZiXUpZCjnqFBHBmutcxYuMThAU1ZryjyR3MIdUl/UCUGC+A1g xY37QFrEpGlccxz5t4OZ/HVyhUNnZF+ZDYku9zpI7rnce3Ce+wPu/YHouo3R6R7vTX C9iRDXcVmDY8A== Received: by mail-pj1-f70.google.com with SMTP id oa7-20020a17090b1bc700b001df2567933eso1091053pjb.4 for ; Tue, 17 May 2022 01:28:54 -0700 (PDT) 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=4nlvKKZrUeIIhtyku8hWOGRRSa9ib/KJt3Z3re94TFY=; b=ixm4ynHrWw3p1XcVFwcyOThzN3ct+Y7KNfSlOoCM8bfow5txLpuMNRncqbIlsneBu8 k5KDSLGii7jnHgwe655LBi8vEJiQi12mUT2yzhH3bebak2aWxTVVMQHT5iFr97kZ08cm 5jOcmj1f2Ok9kQ5FcfEtsqOpa4pALvjU2v3klwCUg1vuDkxrUiBJhPiy54a5hT6tqqYL DJ+IcgQqjZuUKLlpNOvHRH4zbxp1i+q0usRJDqDisPpwh7T8kw9l9DSJ42Gaj9OgfUiY N9GgikvDvRpSEXJC9dJq1CLtmdE8btivoQLkIJdKdrDXfYmfAp3bno+QwJVdmsPyhhOA iKpQ== X-Gm-Message-State: AOAM5321oKfbBkSoI+VISbnGotAePmis8F1W+O986erDnUsbFgRuNyvJ sqhSklrFgrhkQOIDtfRU8AQomz4kNaKfClveds459rAKAlPuVQ5eN60tdMuq+qoqRoYdU+l3Cd0 +xEX30xGthk9OXiDUY/bTecBes6JotQ7qSpf63IrrEg== X-Received: by 2002:a17:902:f708:b0:153:839f:bf2c with SMTP id h8-20020a170902f70800b00153839fbf2cmr21632668plo.113.1652776123344; Tue, 17 May 2022 01:28:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpxTGaar/I/Q5qlDzO8NJdyBSOVFIU7WlF2AF5B/zFncowDMU3IayZ6kNeuveIev+kc4KAYg== X-Received: by 2002:a17:902:f708:b0:153:839f:bf2c with SMTP id h8-20020a170902f70800b00153839fbf2cmr21632650plo.113.1652776122907; Tue, 17 May 2022 01:28:42 -0700 (PDT) Received: from canonical.com (2001-b011-3815-15f4-c141-ca82-0c2a-eff1.dynamic-ip6.hinet.net. [2001:b011:3815:15f4:c141:ca82:c2a:eff1]) by smtp.gmail.com with ESMTPSA id y2-20020a17090322c200b0015e8d4eb23bsm8675970plg.133.2022.05.17.01.28.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 01:28:42 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/5 V2][SRU][J/OEM-5.14] drm/amd/display: Query all entries in assignment table during updates. Date: Tue, 17 May 2022 16:28:30 +0800 Message-Id: <20220517082831.30516-5-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220517082831.30516-1-koba.ko@canonical.com> References: <20220517082831.30516-1-koba.ko@canonical.com> MIME-Version: 1.0 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: Jimmy Kizito BugLink: https://bugs.launchpad.net/bugs/1971417 [Why] Stream ordering and count can vary from one state to the next. Only checking a subset of entries in the encoder assignment table can lead to invalid encoder assignments. [How] Check all entries in encoder assignment table when querying it. Reviewed-by: Jun Lei Acked-by: Anson Jacob Tested-by: Daniel Wheeler Signed-off-by: Jimmy Kizito Signed-off-by: Alex Deucher (cherry picked from commit aadb06f9c9729ee3af1543f54da966644ebc5be7) Signed-off-by: Koba Ko --- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c index c6ff6c797d11d..5376e1d7d69a2 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c @@ -217,7 +217,7 @@ static struct link_encoder *get_link_enc_used_by_link( .link_id = link->link_id, .ep_type = link->ep_type}; - for (i = 0; i < state->stream_count; i++) { + for (i = 0; i < MAX_PIPES; i++) { struct link_enc_assignment assignment = state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i]; if (assignment.valid == true && are_ep_ids_equal(&assignment.ep_id, &ep_id)) @@ -520,6 +520,7 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state) uint8_t dig_stream_count = 0; int matching_stream_ptrs = 0; int eng_ids_per_ep_id[MAX_PIPES] = {0}; + int valid_bitmap = 0; /* (1) No. valid entries same as stream count. */ for (i = 0; i < MAX_PIPES; i++) { @@ -601,5 +602,15 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state) is_valid = valid_entries && valid_stream_ptrs && valid_uniqueness && valid_avail && valid_streams; ASSERT(is_valid); + if (is_valid == false) { + valid_bitmap = + (valid_entries & 0x1) | + ((valid_stream_ptrs & 0x1) << 1) | + ((valid_uniqueness & 0x1) << 2) | + ((valid_avail & 0x1) << 3) | + ((valid_streams & 0x1) << 4); + dm_error("Invalid link encoder assignments: 0x%x\n", valid_bitmap); + } + return is_valid; }