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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64241C47DDF for ; Mon, 22 Jan 2024 14:58:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3E0810F1E7; Mon, 22 Jan 2024 14:58:31 +0000 (UTC) Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF02010EF50; Mon, 22 Jan 2024 14:58:29 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C5FCDCE2B0B; Mon, 22 Jan 2024 14:57:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A30CC43609; Mon, 22 Jan 2024 14:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705935475; bh=NABR2eoEe/Oiv+lPXCDO3bV4QQhTMcC72voA79i0h1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k0KllUKqiR8duAK5VWvR2IXMWqhz1bWyLHuDe7GrbdCgCmDZBn/9Co47a701rLdDw r4pzhOv1sGablPnFPAE1MdIUpvGDU9xlJD0NHl/OLnjpvKhJFg/fyT1Xh6KpryXyAU fPOPpDi/I4g0Z8msfq02HFcoQPm9+QGszf47ZaRvIy1JX14a4lLD106Ga505Gu+Jg/ MNeuEIzkIHPydHgxIbckL9kKlh6njC+ad403+nFYvsRXKpjQ6Mxq48JsH/tr5dzF1N YLMoEgUOjzrMb62biKBpuT3Crt6hdzplJPk6ibMvEzjSvHrpEm2QqIi6hEz6MP6dWY AtU9C25JcXzxg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.7 23/88] drm/amd/display: Fix writeback_info is not removed Date: Mon, 22 Jan 2024 09:50:56 -0500 Message-ID: <20240122145608.990137-23-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122145608.990137-1-sashal@kernel.org> References: <20240122145608.990137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7.1 Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , dillon.varone@amd.com, dri-devel@lists.freedesktop.org, Alex Hung , airlied@gmail.com, qingqing.zhuo@amd.com, Xinhui.Pan@amd.com, Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org, sunpeng.li@amd.com, Daniel Wheeler , aurabindo.pillai@amd.com, alvin.lee2@amd.com, daniel@ffwll.ch, wayne.lin@amd.com, Alex Deucher , Harry Wentland , christian.koenig@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Alex Hung [ Upstream commit ab37b88ed9de9de8d582683f7ea17059f1251a7f ] [WHY] Counter j was not updated to present the num of writeback_info when writeback pipes are removed. [HOW] update j (num of writeback info) under the correct condition. Tested-by: Daniel Wheeler Reviewed-by: Harry Wentland Signed-off-by: Alex Hung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c index 5055af147c20..37dc280e5566 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -497,11 +497,12 @@ bool dc_stream_remove_writeback(struct dc *dc, if (stream->writeback_info[i].dwb_pipe_inst == dwb_pipe_inst) stream->writeback_info[i].wb_enabled = false; - if (j < i) - /* trim the array */ + /* trim the array */ + if (j < i) { memcpy(&stream->writeback_info[j], &stream->writeback_info[i], sizeof(struct dc_writeback_info)); - j++; + j++; + } } } stream->num_wb_info = j; -- 2.43.0