All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Lin <PingLei.Lin@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Harry Wentland <harry.wentland@amd.com>,
	Leo Li <sunpeng.li@amd.com>,
	Aurabindo Pillai <aurabindo.pillai@amd.com>,
	Roman Li <roman.li@amd.com>, Wayne Lin <wayne.lin@amd.com>,
	Tom Chung <chiahsuan.chung@amd.com>,
	"Fangzhi Zuo" <jerry.zuo@amd.com>,
	Dan Wheeler <daniel.wheeler@amd.com>, Ray Wu <Ray.Wu@amd.com>,
	Ivan Lipski <ivan.lipski@amd.com>, Alex Hung <alex.hung@amd.com>,
	James Lin <PingLei.Lin@amd.com>,
	Chenyu Chen <Chen-Yu.Chen@amd.com>,
	Tony Cheng <tony.cheng@amd.com>, James Lin <pinglei.lin@amd.com>
Subject: [PATCH 27/33] drm/amd/display: Keep an unchanged stream in the DC2 commit
Date: Tue, 17 Nov 2026 05:51:04 +0800	[thread overview]
Message-ID: <20261116215641.2800595-28-PingLei.Lin@amd.com> (raw)
In-Reply-To: <20261116215641.2800595-1-PingLei.Lin@amd.com>

From: Tony Cheng <tony.cheng@amd.com>

[Why]
The DC2 non-seamless commit builder disables every current stream and
enables every new stream. A commit that removes one of two streams
blanks the other stream, or fails when that stream shows a plane.

[How]
Do not program a stream that is in both states on the same pipes with
the same planes and blocks. The checks, the step walkers and the Core2
software state skip that stream.

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Signed-off-by: James Lin <pinglei.lin@amd.com>
---
 .../amd/display/dc/bls_builder/bls_builder.h  |  8 +++++
 .../dc/bls_builder/dcn401_builder_internal.h  | 10 ++----
 .../bls_builder/dcn401_non_seamless_builder.c | 31 ++++++++++++-------
 .../dc/bls_builder/dcn401_seamless_builder.c  | 15 +++++++--
 .../gpu/drm/amd/display/dc/core2/dc_core2.c   | 16 +++++++---
 5 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder.h b/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder.h
index 879ff188264d..f899c27ea836 100644
--- a/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder.h
+++ b/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder.h
@@ -133,3 +133,11 @@ struct bls_builder {
 
 const struct bls_builder *bls_builder_create(struct dc *dc,
 		enum bls_builder_name name);
+
+/*
+ * stream is in both states on the same pipes, each with the same plane
+ * and blocks. DCN_DECL_NON_SEAMLESS_COMMIT leaves such a stream alone.
+ */
+bool dcn401_stream_unchanged(const struct dc_state *current_state,
+		const struct dc_state *new_state,
+		const struct dc_stream_state *stream);
diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_builder_internal.h b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_builder_internal.h
index 35ad8982db9a..2d832017f613 100644
--- a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_builder_internal.h
+++ b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_builder_internal.h
@@ -74,13 +74,6 @@ const struct pipe_ctx *dcn401_otg_master(const struct dc_state *state,
 /* The index of stream in state, or -1. */
 int dcn401_stream_index(const struct dc_state *state,
 		const struct dc_stream_state *stream);
-/*
- * stream is in both states on the same pipes, each with the same plane
- * and blocks.
- */
-bool dcn401_stream_unchanged(const struct dc_state *current_state,
-		const struct dc_state *new_state,
-		const struct dc_stream_state *stream);
 
 
 /* What both builders need of the dc, before either state. */
@@ -92,7 +85,8 @@ enum bls_builder_result dcn401_check_stream_support(const struct dc *dc,
 
 /*
  * pipe is NULL only for the bandwidth and p-state steps. The walkers
- * expand only stream when it is set.
+ * expand only stream when it is set, else each stream that is not
+ * unchanged.
  */
 struct dcn401_commit_step_args {
 	struct dc *dc;
diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c
index bfbe2e0e7eb2..dcd1c8a50429 100644
--- a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c
+++ b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c
@@ -10,10 +10,11 @@
 #include "state_facts/state_facts.h"
 
 /*
- * DCN_DECL_NON_SEAMLESS_COMMIT for virtual streams without planes. It
- * disables every current stream, each with one or two planes, one per DPP
- * pipe, then enables every new stream, each with no plane. Planes are
- * added later by DCN_DECL_SEAMLESS_UPDATE, not by this commit. Each
+ * DCN_DECL_NON_SEAMLESS_COMMIT for virtual streams. It disables every
+ * current stream, each with one or two planes, one per DPP pipe, then
+ * enables every new stream, each with no plane. A stream that is
+ * unchanged keeps its pipes and planes, and the commit programs none of
+ * them. Planes are added later by DCN_DECL_SEAMLESS_UPDATE. Each
  * stream is in ODM bypass, 2:1 or 3:1, with one OPP head and at most one
  * DPP pipe per slice.
  *
@@ -120,19 +121,23 @@ static enum bls_builder_result dcn401_check_new_stream(
 
 static enum bls_builder_result dcn401_check_commit_state_support(
 		const struct dc *dc, const struct dc_state *current_state,
-		const struct dc_state *new_state)
+		const struct dc_state *new_state, bool is_current)
 {
-	const struct dc_state *state = dcn401_checked_state(current_state,
-			new_state);
+	const struct dc_state *state = is_current ? current_state : new_state;
 	enum bls_builder_result result;
 	unsigned int i;
 
-	result = dcn401_check_stream_support(dc, current_state, new_state);
+	result = dcn401_check_stream_support(dc, is_current ? state : NULL,
+			is_current ? NULL : state);
 	for (i = 0; result == BLS_BUILD_SUCCESS && i < state->stream_count;
-			i++)
-		result = current_state ?
+			i++) {
+		if (dcn401_stream_unchanged(current_state, new_state,
+				state->streams[i]))
+			continue;
+		result = is_current ?
 				dcn401_check_current_stream(dc, state, i) :
 				dcn401_check_new_stream(dc, state, i);
+	}
 	return result;
 }
 
@@ -175,10 +180,12 @@ static enum bls_builder_result dcn401_check_non_seamless_commit_support(
 		return result;
 	CHECK_CONDITION(stream_config_update, "stream config update is set");
 
-	result = dcn401_check_commit_state_support(dc, current_state, NULL);
+	result = dcn401_check_commit_state_support(dc, current_state,
+			new_state, true);
 	if (result != BLS_BUILD_SUCCESS)
 		return result;
-	result = dcn401_check_commit_state_support(dc, NULL, new_state);
+	result = dcn401_check_commit_state_support(dc, current_state,
+			new_state, false);
 	if (result != BLS_BUILD_SUCCESS)
 		return result;
 
diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c
index 178598f18517..3f0285763d52 100644
--- a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c
+++ b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c
@@ -2152,6 +2152,15 @@ static void dcn401_add_steps(struct block_sequence_state *sequence,
 	}
 }
 
+static bool dcn401_walks_stream(const struct dcn401_commit_step_args *args,
+		const struct dc_stream_state *stream)
+{
+	if (args->stream)
+		return stream == args->stream;
+	return !dcn401_stream_unchanged(args->current_state, args->new_state,
+			stream);
+}
+
 static void dcn401_add_per_otg_master(struct block_sequence_state *sequence,
 		const struct dcn401_commit_step_args *state_args,
 		struct dc_state *state,
@@ -2161,7 +2170,7 @@ static void dcn401_add_per_otg_master(struct block_sequence_state *sequence,
 	unsigned int i;
 
 	for (i = 0; i < state->stream_count; i++) {
-		if (args.stream && state->streams[i] != args.stream)
+		if (!dcn401_walks_stream(&args, state->streams[i]))
 			continue;
 		args.pipe = resource_get_otg_master_for_stream(
 				&state->res_ctx, state->streams[i]);
@@ -2180,7 +2189,7 @@ static void dcn401_add_per_opp_head(struct block_sequence_state *sequence,
 	int j, n;
 
 	for (i = 0; i < state->stream_count; i++) {
-		if (args.stream && state->streams[i] != args.stream)
+		if (!dcn401_walks_stream(&args, state->streams[i]))
 			continue;
 		n = resource_get_opp_heads_for_stream(state->streams[i],
 				&state->res_ctx, opp_heads);
@@ -2202,7 +2211,7 @@ static void dcn401_add_per_dpp_pipe(struct block_sequence_state *sequence,
 	int j, n;
 
 	for (i = 0; i < state->stream_count; i++) {
-		if (args.stream && state->streams[i] != args.stream)
+		if (!dcn401_walks_stream(&args, state->streams[i]))
 			continue;
 		n = resource_get_dpp_pipes_for_stream(state->streams[i],
 				&state->res_ctx, dpp_pipes);
diff --git a/drivers/gpu/drm/amd/display/dc/core2/dc_core2.c b/drivers/gpu/drm/amd/display/dc/core2/dc_core2.c
index 90bcf02ded00..ce2b14bb7a5a 100644
--- a/drivers/gpu/drm/amd/display/dc/core2/dc_core2.c
+++ b/drivers/gpu/drm/amd/display/dc/core2/dc_core2.c
@@ -245,12 +245,18 @@ enum dc_status core2_commit_state_hw(struct dc *dc, struct dc_state *context)
 
 	core2_commit_prepare_done(dc, context);
 	for (i = 0; i < current_state->stream_count; i++)
-		core2_commit_disable_done(dc, resource_get_otg_master_for_stream(
-				&current_state->res_ctx,
-				current_state->streams[i]));
+		if (!dcn401_stream_unchanged(current_state, context,
+				current_state->streams[i]))
+			core2_commit_disable_done(dc,
+					resource_get_otg_master_for_stream(
+					&current_state->res_ctx,
+					current_state->streams[i]));
 	for (i = 0; i < context->stream_count; i++)
-		core2_commit_enable_done(resource_get_otg_master_for_stream(
-				&context->res_ctx, context->streams[i]));
+		if (!dcn401_stream_unchanged(current_state, context,
+				context->streams[i]))
+			core2_commit_enable_done(
+					resource_get_otg_master_for_stream(
+					&context->res_ctx, context->streams[i]));
 	return DC_OK;
 }
 
-- 
2.43.0


  parent reply	other threads:[~2026-11-17 17:17 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 21:50 [PATCH 00/33] DC Patches November 23, 2026 James Lin
2026-11-16 21:50 ` [PATCH 01/33] drm/amd/display: Clear OTG_AUTO_FORCE_VSYNC_MODE on OTG disable James Lin
2026-11-16 21:50 ` [PATCH 02/33] drm/amd/display: Rename DPMS to DPMS_v1 James Lin
2026-11-16 21:50 ` [PATCH 03/33] drm/amd/display: Power up eDP when detect link James Lin
2026-11-16 21:50 ` [PATCH 04/33] drm/amd/display: Add DPMS-v2 files James Lin
2026-11-16 21:50 ` [PATCH 05/33] drm/amd/display: Refactor DP retrain link HW sequence James Lin
2026-11-16 21:50 ` [PATCH 06/33] drm/amd/display: add extra 0.25 line reserved for TSetup/TCalc inefficiency James Lin
2026-11-16 21:50 ` [PATCH 07/33] drm/amd/display: Use panel luminance range for AUX backlight in power module James Lin
2026-11-16 21:50 ` [PATCH 08/33] drm/amd/display: Read PWM back linearly with the linear backlight curve James Lin
2026-11-16 21:50 ` [PATCH 09/33] drm/amd/display: Add API to set brightness percent James Lin
2026-11-16 21:50 ` [PATCH 10/33] drm/amd/display: Pass linear brightness percent to power module James Lin
2026-11-16 21:50 ` [PATCH 11/33] drm/amd/display: Add DPMS-v2 types James Lin
2026-11-16 21:50 ` [PATCH 12/33] drm/amd/display: Always apply 0ppm pixel clock adjustment James Lin
2026-11-16 21:50 ` [PATCH 13/33] drm/amd/display: Add otg versions of get_vblank_counter/scanoutpos James Lin
2026-11-16 21:50 ` [PATCH 14/33] drm/amd/display: Queue vblank control work to sleepable context James Lin
2026-11-16 21:50 ` [PATCH 15/33] drm/amd/display: Fix KUnit tests for vblank control rework James Lin
2026-11-16 21:50 ` [PATCH 16/33] drm/amd/display: Add urgent request and assertion probes James Lin
2026-11-16 21:50 ` [PATCH 17/33] drm/amd/display: Fix G7 P-state aperture addresses James Lin
2026-11-16 21:50 ` [PATCH 18/33] drm/amd/display: Set stream min/max refresh from VRR config James Lin
2026-11-16 21:50 ` [PATCH 19/33] drm/amd/display: Add DC2 wrapped initialization for DCN401 James Lin
2026-11-16 21:50 ` [PATCH 20/33] drm/amd/display: Honor the Replay stream regeneration wait event James Lin
2026-11-16 21:50 ` [PATCH 21/33] drm/amd/display: Disable Replay when link off frame count is below 2 James Lin
2026-11-16 21:50 ` [PATCH 22/33] drm/amd/display: Skip DSC padding borrow estimate for zero padding James Lin
2026-11-16 21:51 ` [PATCH 23/33] drm/amd/display: Drop unused DC interfaces James Lin
2026-11-16 21:51 ` [PATCH 24/33] drm/amd/display: Let the DC2 commit replace or keep a stream James Lin
2026-11-16 21:51 ` [PATCH 25/33] drm/amd/display: Support two streams in the dcn401 DC2 builders James Lin
2026-11-16 21:51 ` [PATCH 26/33] drm/amd/display: Add a plane beside a kept plane in DC2 update James Lin
2026-11-16 21:51 ` James Lin [this message]
2026-11-16 21:51 ` [PATCH 28/33] drm/amd/display: Change the ODM and MPC layout " James Lin
2026-11-16 21:51 ` [PATCH 29/33] drm/amd/display: Give the DC2 builders State pipe facts James Lin
2026-11-16 21:51 ` [PATCH 30/33] drm/amd/display: Add RGBA8888 surface pixel format support James Lin
2026-11-16 21:51 ` [PATCH 31/33] drm/amd/display: Fix DCE crossbar for RGBA8888 surface format James Lin
2026-11-16 21:51 ` [PATCH 32/33] drm/amd/display: [FW Promotion] Release 0.1.85.0 James Lin
2026-11-16 21:51 ` [PATCH 33/33] drm/amd/display: Promote DC to 3.2.408 James Lin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261116215641.2800595-28-PingLei.Lin@amd.com \
    --to=pinglei.lin@amd.com \
    --cc=Chen-Yu.Chen@amd.com \
    --cc=Ray.Wu@amd.com \
    --cc=alex.hung@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=aurabindo.pillai@amd.com \
    --cc=chiahsuan.chung@amd.com \
    --cc=daniel.wheeler@amd.com \
    --cc=harry.wentland@amd.com \
    --cc=ivan.lipski@amd.com \
    --cc=jerry.zuo@amd.com \
    --cc=roman.li@amd.com \
    --cc=sunpeng.li@amd.com \
    --cc=tony.cheng@amd.com \
    --cc=wayne.lin@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.