From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FA3B19D881; Tue, 16 Jul 2024 14:26:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721139961; cv=none; b=Lq9ZfDt+WnbohmQOLRtJHPgA5oub/XfL7zm16y2woBXdnrQqK2Sm6stne4z5BmGUXwUwss+PE5IpMntBmuzwIc3alOOjVi0fRYSykc84dgIYMLMQw15Q2C9YgbCYsCP+D8KQ9VjL/qTsNY6d3C5phvMlAArWM/HpNFbY/fmCOhI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721139961; c=relaxed/simple; bh=lFfeEuGvPTnaQ/p4RIp+RBEGX2XyChwT1+a3MqZRhf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FSmH1ACF4zTog31YkxP46+ObflyF+T9c+E9+rY2vJggdJG7fClV6tk3iUfv09ZD9zTP4CvdFZmO8xX9+G9Hnc3IxXVV/KkWj3tsoVnxQhHMgLI8MW1gcccJZUx63Mn3+Yi9lGpYhET4btqJmPLeHfcZKDBPwezh84NvLWeSaaJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q7cAaT24; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q7cAaT24" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28D4FC4AF09; Tue, 16 Jul 2024 14:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721139961; bh=lFfeEuGvPTnaQ/p4RIp+RBEGX2XyChwT1+a3MqZRhf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7cAaT24nLVTkdM59UL6A3s9h2JtWdBHoUHwXctvImwMYQwNrOB6W+zUxGraGk5K+ MWy86RTKtTLjXFQMSnk2ITtyf7rLcH19J2AaGvHoYJEe1AiaTiJgJNDStjPFiM2qdc 9bOc8F6gf46IABiFpKeEyo7scNNxgRIqJZwHqlYQ51iyM40rd32eVh8cITDbxso5M8 mtIK/xZSkpkZt+XFUN2SuNOgqgv4Hl7phftAbnIcz0YPYX7mwZfd6HOzqWoHuLtKut KMQK6t5TRnfsWmNUF1NnuxX533oJFY8ri8yIu9wqYzkr9HX3d0nwWJrq+g6nH+7gyN g6LiALY9yLAmg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alvin Lee , Chaitanya Dhere , Nevenko Stupar , Jerry Zuo , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, jun.lei@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.9 13/22] drm/amd/display: Account for cursor prefetch BW in DML1 mode support Date: Tue, 16 Jul 2024 10:24:20 -0400 Message-ID: <20240716142519.2712487-13-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716142519.2712487-1-sashal@kernel.org> References: <20240716142519.2712487-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.9 Content-Transfer-Encoding: 8bit From: Alvin Lee [ Upstream commit 074b3a886713f69d98d30bb348b1e4cb3ce52b22 ] [Description] We need to ensure to take into account cursor prefetch BW in mode support or we may pass ModeQuery but fail an actual flip which will cause a hang. Flip may fail because the cursor_pre_bw is populated during mode programming (and mode programming is never called prior to ModeQuery). Reviewed-by: Chaitanya Dhere Reviewed-by: Nevenko Stupar Signed-off-by: Jerry Zuo Signed-off-by: Alvin Lee Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c index 6c84b0fa40f44..0782a34689a00 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c @@ -3364,6 +3364,9 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l &mode_lib->vba.UrgentBurstFactorLumaPre[k], &mode_lib->vba.UrgentBurstFactorChromaPre[k], &mode_lib->vba.NotUrgentLatencyHidingPre[k]); + + v->cursor_bw_pre[k] = mode_lib->vba.NumberOfCursors[k] * mode_lib->vba.CursorWidth[k][0] * mode_lib->vba.CursorBPP[k][0] / + 8.0 / (mode_lib->vba.HTotal[k] / mode_lib->vba.PixelClock[k]) * v->VRatioPreY[i][j][k]; } { -- 2.43.0