Skip to contentSkip to conversation

Display Stream Compression (DSC) for AMD Navi

PATCH Superseded David Francis 5 participants 21 messages Aug 19, 2019 4 messages not in the archive

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Display Stream Compression (DSC) for AMD Navi

This patchset enables Display Stream Compression (DSC) on DP connectors on Navi ASICs, both SST and DSC.

8k60 and 4k144 support requires ODM combine, an AMD internal feature that may be a bit buggy right now.

Patches 1 through 5 enable DSC for SST. Most of the work was already done in the Navi promotion patches; this just hooks it up to the atomic interface. The first two reverts are of temporary changes to block off DSC. The third is of a commit that was accidentally promoted twice. The fourth and last revert fixes a potential issue with ODM combine.

Patches 6 and 7 are fixes for bugs that would be exposed by MST DSC. One fix is with the MST code and the other in the DSC code.

Patches 8, 9, and 10 are small DRM changes required for DSC MST:
FEC, a new bit in the standard; some export definitions; and a previously uninitialized variable.

Patches 11 through 14 are the DSC MST policy itself. This includes the code for detecting and validating DSC capabilities, enabling DSC over a link, computing the fair DSC configurations for multiple DSC displays, and adding to atomic state crtcs that might need reprogramming due to DSC.

David Francis (14):
Revert "drm/amd/display: skip dsc config for navi10 bring up" Revert "drm/amd/display: navi10 bring up skip dsc encoder config" Revert "drm/amd/display: add global master update lock for DCN2" Revert "drm/amd/display: Fix underscan not using proper scaling" drm/amd/display: Enable SST DSC in DM
drm/amd/display: Use dc helpers to compute timeslot distribution drm/amd/display: Initialize DSC PPS variables to 0 drm/dp-mst: Parse FEC capability on MST ports drm/dp-mst: Export symbols for dpcd read/write drm/dp-mst: Fill branch->num_ports
drm/amd/display: Validate DSC caps on MST endpoints drm/amd/display: Write DSC enable to MST DPCD drm/amd/display: MST DSC compute fair share drm/amd/display: Trigger modesets on MST DSC connectors

 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 116 +++-
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  71 +--
 .../display/amdgpu_dm/amdgpu_dm_mst_types.c   | 498 +++++++++++++++++-
 .../display/amdgpu_dm/amdgpu_dm_mst_types.h   |   5 +
 drivers/gpu/drm/amd/display/dc/core/dc.c      |  12 +-
 .../drm/amd/display/dc/core/dc_link_hwss.c    |   3 +
 .../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c  |   3 +
 .../drm/amd/display/dc/dcn20/dcn20_hwseq.c    |   4 -
 .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c |  72 +--
 .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.h |   3 -
 .../drm/amd/display/dc/dcn20/dcn20_resource.c |   7 +-
 .../drm/amd/display/dc/dcn20/dcn20_resource.h |   1 +
 .../display/dc/dcn20/dcn20_stream_encoder.c   |   8 -
 .../amd/display/dc/inc/hw/timing_generator.h  |   2 -
 drivers/gpu/drm/drm_dp_mst_topology.c         |   6 +
 include/drm/drm_dp_mst_helper.h               |   3 +
 16 files changed, 668 insertions(+), 146 deletions(-)
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

PATCH 1/14 Revert "drm/amd/display: skip dsc config for navi10 bring up"

This reverts commit 55ad81f3510ec1a1c19e6a4d8a6319812d07d256.

optc dsc config was causing warnings due to missing register definitions. With the registers restored, the function can be re-enabled

The reverted commit also disabled sanity checks and dsc power gating. The sanity check warnings are not associated with dsc, and power gating on dsc still has an issue on non-dsc monitors where the dsc hardware block is never init and so cannot respond to power gating requests. Therefore, those are left as is

---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +0 -9
index aedf9de1c947..99070e93020b 100644
@@ -191,15 +191,6 @@ void optc2_set_dsc_config(struct timing_generator *optc,
 					uint32_t dsc_slice_width)
 {
 	struct optc *optc1 = DCN10TG_FROM_TG(optc);
-	uint32_t data_format = 0;
-	/* skip if dsc mode is not changed */
-	data_format = dm_read_reg(CTX, REG(OPTC_DATA_FORMAT_CONTROL));
-
-	data_format = data_format & 0x30; /* bit5:4 */
-	data_format = data_format >> 4;
-
-	if (data_format == dsc_mode)
-		return;
 
 	REG_UPDATE(OPTC_DATA_FORMAT_CONTROL,
 		OPTC_DSC_MODE, dsc_mode);
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw

PATCH 3/14 Revert "drm/amd/display: add global master update lock for DCN2"

In reply to a message not in the archive

This reverts commit 55a6f5bbcf00a49565946c0a9b8c716313dc6c05.

This commit was accidentally promoted twice

---
 .../drm/amd/display/dc/dcn20/dcn20_hwseq.c    |  4 --
 .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 63 +------------------
 .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.h |  3 -
 .../amd/display/dc/inc/hw/timing_generator.h  |  2 -
 4 files changed, 1 insertion(+), 71 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +0 -4
index fa8a73f6c8e3..e146d1d8d45e 100644
@@ -575,10 +575,6 @@ enum dc_status dcn20_enable_stream_timing(
 			pipe_ctx->stream->signal,
 			true);
 
-	if (pipe_ctx->stream_res.tg->funcs->setup_global_lock)
-		pipe_ctx->stream_res.tg->funcs->setup_global_lock(
-				pipe_ctx->stream_res.tg);
-
 	if (odm_pipe)
 		odm_pipe->stream_res.opp->funcs->opp_pipe_clock_control(
 				odm_pipe->stream_res.opp,
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +1 -62

76 lines not on this page · raw message

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h +0 -3
index 47cb4de1564c..32a58431fd09 100644
@@ -106,9 +106,6 @@ void optc2_get_optc_source(struct timing_generator *optc,
 
 void optc2_triplebuffer_lock(struct timing_generator *optc);
 void optc2_triplebuffer_unlock(struct timing_generator *optc);
-void optc2_lock(struct timing_generator *optc);
-void optc2_lock_global(struct timing_generator *optc);
-void optc2_setup_global_lock(struct timing_generator *optc);
 void optc2_lock_doublebuffer_disable(struct timing_generator *optc);
 void optc2_lock_doublebuffer_enable(struct timing_generator *optc);
 void optc2_program_manual_trigger(struct timing_generator *optc);
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +0 -2
index f607ef24c766..e0713d6d6c8d 100644
@@ -189,10 +189,8 @@ struct timing_generator_funcs {
 	bool (*did_triggered_reset_occur)(struct timing_generator *tg);
 	void (*setup_global_swap_lock)(struct timing_generator *tg,
 							const struct dcp_gsl_params *gsl_params);
-	void (*setup_global_lock)(struct timing_generator *tg);
 	void (*unlock)(struct timing_generator *tg);
 	void (*lock)(struct timing_generator *tg);
-	void (*lock_global)(struct timing_generator *tg);
 	void (*lock_doublebuffer_disable)(struct timing_generator *tg);
 	void (*lock_doublebuffer_enable)(struct timing_generator *tg);
 #if defined(CONFIG_DRM_AMD_DC_DCN2_0)
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#4 lore raw

PATCH 4/14 Revert "drm/amd/display: Fix underscan not using proper scaling"

In reply to a message not in the archive

This reverts commit 80e80ec817f161560b4159608fb41bd289abede3.

This commit fixed an issue with underscan commits not updating all needed timing values, but through various refactors it is no longer necessary. It causes corruption on odm combine by overwriting the halved h_active in the stream timing

---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -11
index 77ac7f707ec5..1189e320062b 100644
@@ -2127,7 +2127,7 @@ void dc_commit_updates_for_stream(struct dc *dc,
 	enum surface_update_type update_type;
 	struct dc_state *context;
 	struct dc_context *dc_ctx = dc->ctx;
-	int i, j;
+	int i;
 
 	stream_status = dc_stream_get_status(stream);
 	context = dc->current_state;
@@ -2165,16 +2165,6 @@ void dc_commit_updates_for_stream(struct dc *dc,
 
 		copy_surface_update_to_plane(surface, &srf_updates[i]);
 
-		if (update_type >= UPDATE_TYPE_MED) {
-			for (j = 0; j < dc->res_pool->pipe_count; j++) {
-				struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
-
-				if (pipe_ctx->plane_state != surface)
-					continue;
-
-				resource_build_scaling_params(pipe_ctx);
-			}
-		}
 	}
 
 	copy_stream_update_to_stream(dc, context, stream, stream_update);
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#5 lore raw

PATCH 5/14 drm/amd/display: Enable SST DSC in DM

In reply to a message not in the archive

In create_stream_for_sink, check for SST DP connectors

Parse DSC caps to DC format, then, if DSC is supported, compute the config

DSC hardware will be programmed by dc_commit_state

---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++++-------
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  4 ++-
 2 files changed, 24 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21 -11
index 911fe78b47c1..84249057e181 100644
@@ -3576,6 +3576,10 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 	bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false;
 	int mode_refresh;
 	int preferred_refresh = 0;
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+	struct dsc_dec_dpcd_caps dsc_caps;
+	uint32_t link_bandwidth_kbps;
+#endif
 
 	struct dc_sink *sink = NULL;
 	if (aconnector == NULL) {
@@ -3648,17 +3652,23 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 			&mode, &aconnector->base, con_state, old_stream);
 
 #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
-	/* stream->timing.flags.DSC = 0; */
-        /*  */
-	/* if (aconnector->dc_link && */
-	/* 		aconnector->dc_link->connector_signal == SIGNAL_TYPE_DISPLAY_PORT #<{(|&& */
-	/* 		aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.is_dsc_supported|)}>#) */
-	/* 	if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc, */
-	/* 			&aconnector->dc_link->dpcd_caps.dsc_caps, */
-	/* 			dc_link_bandwidth_kbps(aconnector->dc_link, dc_link_get_link_cap(aconnector->dc_link)), */
-	/* 			&stream->timing, */
-	/* 			&stream->timing.dsc_cfg)) */
-	/* 		stream->timing.flags.DSC = 1; */
+	stream->timing.flags.DSC = 0;
+
+	if (aconnector->dc_link && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT) {
+		dc_dsc_parse_dsc_dpcd(aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.raw,
+				      aconnector->dc_link->dpcd_caps.dsc_caps.dsc_ext_caps.raw,
+				      &dsc_caps);
+		link_bandwidth_kbps = dc_link_bandwidth_kbps(aconnector->dc_link,
+							     dc_link_get_link_cap(aconnector->dc_link));
+
+		if (dsc_caps.is_dsc_supported)
+			if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc,
+						  &dsc_caps,
+						  link_bandwidth_kbps,
+						  &stream->timing,
+						  &stream->timing.dsc_cfg))
+				stream->timing.flags.DSC = 1;
+	}
 #endif
 
 	update_stream_scaling_settings(&mode, dm_state, stream);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -1
index 7cf0573ab25f..5f2c315b18ba 100644
@@ -549,7 +549,9 @@ bool dm_helpers_dp_write_dsc_enable(
 		bool enable
 )
 {
-	return false;
+	uint8_t enable_dsc = enable ? 1 : 0;
+
+	return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1);
 }
 #endif
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

Tested-by
#7 lore raw

Re: [PATCH 05/14] drm/amd/display: Enable SST DSC in DM

Mikita Lipski

Quoted 70 lines · David Francis

In create_stream_for_sink, check for SST DP connectors

Parse DSC caps to DC format, then, if DSC is supported, compute the config

DSC hardware will be programmed by dc_commit_state

---
  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++++-------
  .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  4 ++-
  2 files changed, 24 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21 -11
index 911fe78b47c1..84249057e181 100644
@@ -3576,6 +3576,10 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
  	bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false;
  	int mode_refresh;
  	int preferred_refresh = 0;
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+	struct dsc_dec_dpcd_caps dsc_caps;
+	uint32_t link_bandwidth_kbps;
+#endif
 
  	struct dc_sink *sink = NULL;
  	if (aconnector == NULL) {
@@ -3648,17 +3652,23 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
  			&mode, &aconnector->base, con_state, old_stream);
 
  #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
-	/* stream->timing.flags.DSC = 0; */
-        /*  */
-	/* if (aconnector->dc_link && */
-	/* 		aconnector->dc_link->connector_signal == SIGNAL_TYPE_DISPLAY_PORT #<{(|&& */
-	/* 		aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.is_dsc_supported|)}>#) */
-	/* 	if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc, */
-	/* 			&aconnector->dc_link->dpcd_caps.dsc_caps, */
-	/* 			dc_link_bandwidth_kbps(aconnector->dc_link, dc_link_get_link_cap(aconnector->dc_link)), */
-	/* 			&stream->timing, */
-	/* 			&stream->timing.dsc_cfg)) */
-	/* 		stream->timing.flags.DSC = 1; */
+	stream->timing.flags.DSC = 0;
+
+	if (aconnector->dc_link && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT) {
+		dc_dsc_parse_dsc_dpcd(aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.raw,
+				      aconnector->dc_link->dpcd_caps.dsc_caps.dsc_ext_caps.raw,
+				      &dsc_caps);
+		link_bandwidth_kbps = dc_link_bandwidth_kbps(aconnector->dc_link,
+							     dc_link_get_link_cap(aconnector->dc_link));
+
+		if (dsc_caps.is_dsc_supported)
+			if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc,
+						  &dsc_caps,
+						  link_bandwidth_kbps,
+						  &stream->timing,
+						  &stream->timing.dsc_cfg))
+				stream->timing.flags.DSC = 1;
+	}
  #endif
 
  	update_stream_scaling_settings(&mode, dm_state, stream);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
index 7cf0573ab25f..5f2c315b18ba 100644

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_write_dsc_enable( · line 557

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -1
@@ -549,7 +549,9 @@ bool dm_helpers_dp_write_dsc_enable(
  		bool enable
  )
  {
-	return false;
+	uint8_t enable_dsc = enable ? 1 : 0;
+
+	return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1);
  }
  #endif
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#8 lore raw

PATCH 6/14 drm/amd/display: Use dc helpers to compute timeslot distribution

In reply to a message not in the archive

We were using drm helpers to convert a timing into its bandwidth, its bandwidth into pbn, and its pbn into timeslots

These helpers
-Did not take DSC timings into account
-Used the link rate and lane count of the link's aux device,
which are not the same as the link's current cap
-Did not take FEC into account (FEC reduces the PBN per timeslot)

Use the DC helpers (dc_bandwidth_in_kbps_from_timing, dc_link_bandwidth_kbps) instead

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 41 ++++---------------
 1 file changed, 8 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +8 -33
index 5f2c315b18ba..b32c0790399a 100644
@@ -189,8 +189,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 	int slots = 0;
 	bool ret;
 	int clock;
-	int bpp = 0;
 	int pbn = 0;
+	int pbn_per_timeslot;
 
 	aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
 
@@ -205,40 +205,15 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 	mst_port = aconnector->port;
 
 	if (enable) {
-		clock = stream->timing.pix_clk_100hz / 10;
-
-		switch (stream->timing.display_color_depth) {
-
-		case COLOR_DEPTH_666:
-			bpp = 6;
-			break;
-		case COLOR_DEPTH_888:
-			bpp = 8;
-			break;
-		case COLOR_DEPTH_101010:
-			bpp = 10;
-			break;
-		case COLOR_DEPTH_121212:
-			bpp = 12;
-			break;
-		case COLOR_DEPTH_141414:
-			bpp = 14;
-			break;
-		case COLOR_DEPTH_161616:
-			bpp = 16;
-			break;
-		default:
-			ASSERT(bpp != 0);
-			break;
-		}
-
-		bpp = bpp * 3;
-
-		/* TODO need to know link rate */
+		clock = dc_bandwidth_in_kbps_from_timing(&stream->timing);
 
-		pbn = drm_dp_calc_pbn_mode(clock, bpp);
+		/* dc_bandwidth_in_kbps_from_timing already takes bpp into account */
+		pbn = drm_dp_calc_pbn_mode(clock, 1);
 
-		slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+		/* Convert kilobits per second / 64 (for 64 timeslots) to pbn (54/64 megabytes per second) */
+		pbn_per_timeslot = dc_link_bandwidth_kbps(
+				stream->link, dc_link_get_link_cap(stream->link)) / (8 * 1000 * 54);
+		slots = DIV_ROUND_UP(pbn, pbn_per_timeslot);
 		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
 
 		if (!ret)
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

#10 lore raw

Re: [PATCH 06/14] drm/amd/display: Use dc helpers to compute timeslot distribution

Quoted 9 lines · David Francis

We were using drm helpers to convert a timing into its bandwidth, its bandwidth into pbn, and its pbn into timeslots

These helpers

(quoted diff) +0 -3
-Did not take DSC timings into account
-Used the link rate and lane count of the link's aux device,
  which are not the same as the link's current cap
-Did not take FEC into account (FEC reduces the PBN per timeslot)
Quoted 5 lines

Use the DC helpers (dc_bandwidth_in_kbps_from_timing, dc_link_bandwidth_kbps) instead

Wouldn't this be a good candidate for shared DRM helpers or to modify the existing ones to support this usecase?

Seems like this would be shared across drivers.

Nicholas Kazlauskas

Quoted 57 lines
---
  .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 41 ++++---------------
  1 file changed, 8 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -32
index 5f2c315b18ba..b32c0790399a 100644
@@ -189,8 +189,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
  	int slots = 0;
  	bool ret;
  	int clock;
-	int bpp = 0;
  	int pbn = 0;
+	int pbn_per_timeslot;
 
  	aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
 
@@ -205,40 +205,15 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
  	mst_port = aconnector->port;
 
  	if (enable) {
-		clock = stream->timing.pix_clk_100hz / 10;
-
-		switch (stream->timing.display_color_depth) {
-
-		case COLOR_DEPTH_666:
-			bpp = 6;
-			break;
-		case COLOR_DEPTH_888:
-			bpp = 8;
-			break;
-		case COLOR_DEPTH_101010:
-			bpp = 10;
-			break;
-		case COLOR_DEPTH_121212:
-			bpp = 12;
-			break;
-		case COLOR_DEPTH_141414:
-			bpp = 14;
-			break;
-		case COLOR_DEPTH_161616:
-			bpp = 16;
-			break;
-		default:
-			ASSERT(bpp != 0);
-			break;
-		}
-
-		bpp = bpp * 3;
-
-		/* TODO need to know link rate */
+		clock = dc_bandwidth_in_kbps_from_timing(&stream->timing);
 
-		pbn = drm_dp_calc_pbn_mode(clock, bpp);
+		/* dc_bandwidth_in_kbps_from_timing already takes bpp into account */

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 219

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +5 -1
+		pbn = drm_dp_calc_pbn_mode(clock, 1);
 
-		slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+		/* Convert kilobits per second / 64 (for 64 timeslots) to pbn (54/64 megabytes per second) */
+		pbn_per_timeslot = dc_link_bandwidth_kbps(
+				stream->link, dc_link_get_link_cap(stream->link)) / (8 * 1000 * 54);
+		slots = DIV_ROUND_UP(pbn, pbn_per_timeslot);
  		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
 
  		if (!ret)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#11 lore raw

Re: [PATCH 06/14] drm/amd/display: Use dc helpers to compute timeslot distribution

Quoted 18 lines · David Francis
Quoted 9 lines

We were using drm helpers to convert a timing into its bandwidth, its bandwidth into pbn, and its pbn into timeslots

These helpers

(quoted diff) +0 -3
-Did not take DSC timings into account
-Used the link rate and lane count of the link's aux device,
  which are not the same as the link's current cap
-Did not take FEC into account (FEC reduces the PBN per timeslot)
Quoted 5 lines

Use the DC helpers (dc_bandwidth_in_kbps_from_timing, dc_link_bandwidth_kbps) instead

Wouldn't this be a good candidate for shared DRM helpers or to modify the existing ones to support this usecase?

Quoted 4 lines

Seems like this would be shared across drivers.

Nicholas Kazlauskas

These functions use information which is not stored in drm structs but tracked in a driver-specific way
- Whether or not FEC is enabled
- Whether or not DSC is enabled, and with what config
- The current link setting
This could be shifted into drm helpers, but it would require functions with signatures like drm_dp_calc_pbn_mode(clock, bpp, dsc_bpp)
and
drm_dp_find_vcpi_slots(mst_mgr, pbn, fec_enabled, lane_count, link_rate)
and each driver would need to convert their own structs into those fields before calling these helpers.

Is that worth it?

Quoted 58 lines
Quoted 58 lines
---
  .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 41 ++++---------------
  1 file changed, 8 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +4 -32
index 5f2c315b18ba..b32c0790399a 100644
@@ -189,8 +189,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
       int slots = 0;
       bool ret;
       int clock;
-     int bpp = 0;
       int pbn = 0;
+     int pbn_per_timeslot;
 
       aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
 
@@ -205,40 +205,15 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
       mst_port = aconnector->port;
 
       if (enable) {
-             clock = stream->timing.pix_clk_100hz / 10;
-
-             switch (stream->timing.display_color_depth) {
-
-             case COLOR_DEPTH_666:
-                     bpp = 6;
-                     break;
-             case COLOR_DEPTH_888:
-                     bpp = 8;
-                     break;
-             case COLOR_DEPTH_101010:
-                     bpp = 10;
-                     break;
-             case COLOR_DEPTH_121212:
-                     bpp = 12;
-                     break;
-             case COLOR_DEPTH_141414:
-                     bpp = 14;
-                     break;
-             case COLOR_DEPTH_161616:
-                     bpp = 16;
-                     break;
-             default:
-                     ASSERT(bpp != 0);
-                     break;
-             }
-
-             bpp = bpp * 3;
-
-             /* TODO need to know link rate */
+             clock = dc_bandwidth_in_kbps_from_timing(&stream->timing);
 
-             pbn = drm_dp_calc_pbn_mode(clock, bpp);
+             /* dc_bandwidth_in_kbps_from_timing already takes bpp into account */
+             pbn = drm_dp_calc_pbn_mode(clock, 1);
 
Quoted 8 lines

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 219

Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +4 -1
-             slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+             /* Convert kilobits per second / 64 (for 64 timeslots) to pbn (54/64 megabytes per second) */
+             pbn_per_timeslot = dc_link_bandwidth_kbps(
+                             stream->link, dc_link_get_link_cap(stream->link)) / (8 * 1000 * 54);
+             slots = DIV_ROUND_UP(pbn, pbn_per_timeslot);
               ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
 
               if (!ret)

________________________________________
From: Kazlauskas, Nicholas <[email protected]>
Sent: August 19, 2019 3:21 PM
To: Francis, David; [email protected]; [email protected]
Cc: Zuo, Jerry
Subject: Re: [PATCH 06/14] drm/amd/display: Use dc helpers to compute timeslot distribution

Quoted 9 lines · David Francis

We were using drm helpers to convert a timing into its bandwidth, its bandwidth into pbn, and its pbn into timeslots

These helpers

(quoted diff) +0 -3
-Did not take DSC timings into account
-Used the link rate and lane count of the link's aux device,
  which are not the same as the link's current cap
-Did not take FEC into account (FEC reduces the PBN per timeslot)
Quoted 5 lines

Use the DC helpers (dc_bandwidth_in_kbps_from_timing, dc_link_bandwidth_kbps) instead

Wouldn't this be a good candidate for shared DRM helpers or to modify the existing ones to support this usecase?

Seems like this would be shared across drivers.

Nicholas Kazlauskas

Quoted 57 lines
---
  .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 41 ++++---------------
  1 file changed, 8 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -32
index 5f2c315b18ba..b32c0790399a 100644
@@ -189,8 +189,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
      int slots = 0;
      bool ret;
      int clock;
-     int bpp = 0;
      int pbn = 0;
+     int pbn_per_timeslot;
 
      aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
 
@@ -205,40 +205,15 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
      mst_port = aconnector->port;
 
      if (enable) {
-             clock = stream->timing.pix_clk_100hz / 10;
-
-             switch (stream->timing.display_color_depth) {
-
-             case COLOR_DEPTH_666:
-                     bpp = 6;
-                     break;
-             case COLOR_DEPTH_888:
-                     bpp = 8;
-                     break;
-             case COLOR_DEPTH_101010:
-                     bpp = 10;
-                     break;
-             case COLOR_DEPTH_121212:
-                     bpp = 12;
-                     break;
-             case COLOR_DEPTH_141414:
-                     bpp = 14;
-                     break;
-             case COLOR_DEPTH_161616:
-                     bpp = 16;
-                     break;
-             default:
-                     ASSERT(bpp != 0);
-                     break;
-             }
-
-             bpp = bpp * 3;
-
-             /* TODO need to know link rate */
+             clock = dc_bandwidth_in_kbps_from_timing(&stream->timing);
 
-             pbn = drm_dp_calc_pbn_mode(clock, bpp);
+             /* dc_bandwidth_in_kbps_from_timing already takes bpp into account */

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 219

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +5 -1
+             pbn = drm_dp_calc_pbn_mode(clock, 1);
 
-             slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+             /* Convert kilobits per second / 64 (for 64 timeslots) to pbn (54/64 megabytes per second) */
+             pbn_per_timeslot = dc_link_bandwidth_kbps(
+                             stream->link, dc_link_get_link_cap(stream->link)) / (8 * 1000 * 54);
+             slots = DIV_ROUND_UP(pbn, pbn_per_timeslot);
              ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
 
              if (!ret)

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#12 lore raw

PATCH 7/14 drm/amd/display: Initialize DSC PPS variables to 0

In reply to a message not in the archive

For DSC MST, sometimes monitors would break out in full-screen static. The issue traced back to the PPS generation code, where these variables were being used uninitialized and were picking up garbage.

memset to 0 to avoid this

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +++
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c   | 3 +++
 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +3 -0
index 35c5467e60e8..619ac48edd05 100644
@@ -491,6 +491,9 @@ bool dp_set_dsc_pps_sdp(struct pipe_ctx *pipe_ctx, bool enable)
 		struct dsc_config dsc_cfg;
 		uint8_t dsc_packed_pps[128];
 
+		memset(&dsc_cfg, 0, sizeof(dsc_cfg));
+		memset(dsc_packed_pps, 0, 128);
+
 		/* Enable DSC hw block */
 		dsc_cfg.pic_width = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right;
 		dsc_cfg.pic_height = stream->timing.v_addressable + stream->timing.v_border_top + stream->timing.v_border_bottom;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +3 -0
index 379c9e4ac63b..16debe6d89f2 100644
@@ -207,6 +207,9 @@ static bool dsc2_get_packed_pps(struct display_stream_compressor *dsc, const str
 	struct dsc_reg_values dsc_reg_vals;
 	struct dsc_optc_config dsc_optc_cfg;
 
+	memset(&dsc_reg_vals, 0, sizeof(dsc_reg_vals));
+	memset(&dsc_optc_cfg, 0, sizeof(dsc_optc_cfg));
+
 	DC_LOG_DSC("Getting packed DSC PPS for DSC Config:");
 	dsc_config_log(dsc, dsc_cfg);
 	DC_LOG_DSC("DSC Picture Parameter Set (PPS):");
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by on v1 7/14
#13 lore raw

Re: [PATCH 07/14] drm/amd/display: Initialize DSC PPS variables to 0

Quoted 8 lines · David Francis

For DSC MST, sometimes monitors would break out in full-screen static. The issue traced back to the PPS generation code, where these variables were being used uninitialized and were picking up garbage.

memset to 0 to avoid this

Patches 1-5 and 7 are:

Quoted 25 lines
---
  drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +++
  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c   | 3 +++
  2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +3 -0
index 35c5467e60e8..619ac48edd05 100644
@@ -491,6 +491,9 @@ bool dp_set_dsc_pps_sdp(struct pipe_ctx *pipe_ctx, bool enable)
  		struct dsc_config dsc_cfg;
  		uint8_t dsc_packed_pps[128];
 
+		memset(&dsc_cfg, 0, sizeof(dsc_cfg));
+		memset(dsc_packed_pps, 0, 128);
+
  		/* Enable DSC hw block */
  		dsc_cfg.pic_width = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right;
  		dsc_cfg.pic_height = stream->timing.v_addressable + stream->timing.v_border_top + stream->timing.v_border_bottom;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +0 -0
index 379c9e4ac63b..16debe6d89f2 100644

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c static bool dsc2_get_packed_pps(struct display_stream_compressor *dsc, const str · line 215

Quoted 9 lines
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +3 -0
@@ -207,6 +207,9 @@ static bool dsc2_get_packed_pps(struct display_stream_compressor *dsc, const str
  	struct dsc_reg_values dsc_reg_vals;
  	struct dsc_optc_config dsc_optc_cfg;
 
+	memset(&dsc_reg_vals, 0, sizeof(dsc_reg_vals));
+	memset(&dsc_optc_cfg, 0, sizeof(dsc_optc_cfg));
+
  	DC_LOG_DSC("Getting packed DSC PPS for DSC Config:");
  	dsc_config_log(dsc, dsc_cfg);
  	DC_LOG_DSC("DSC Picture Parameter Set (PPS):");

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#14 lore raw

PATCH 8/14 drm/dp-mst: Parse FEC capability on MST ports

In reply to a message not in the archive

As of DP1.4, ENUM_PATH_RESOURCES returns a bit indicating if FEC can be supported up to that point in the MST network.

The bit is the first byte of the ENUM_PATH_RESOURCES ack reply, bottom-most bit (refer to section 2.11.9.4 of DP standard, v1.4)

That value is needed for FEC and DSC support

Store it on drm_dp_mst_port

---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++
 include/drm/drm_dp_mst_helper.h       | 3 +++
 2 files changed, 5 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -0
index 398e7314ea8b..53a0ad16e37b 100644
@@ -552,6 +552,7 @@ static bool drm_dp_sideband_parse_enum_path_resources_ack(struct drm_dp_sideband
 {
 	int idx = 1;
 	repmsg->u.path_resources.port_number = (raw->msg[idx] >> 4) & 0xf;
+	repmsg->u.path_resources.fec_capable = raw->msg[idx] & 0x1;
 	idx++;
 	if (idx > raw->curlen)
 		goto fail_len;
@@ -2180,6 +2181,7 @@ static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
 			DRM_DEBUG_KMS("enum path resources %d: %d %d\n", txmsg->reply.u.path_resources.port_number, txmsg->reply.u.path_resources.full_payload_bw_number,
 			       txmsg->reply.u.path_resources.avail_payload_bw_number);
 			port->available_pbn = txmsg->reply.u.path_resources.avail_payload_bw_number;
+			port->fec_capable = txmsg->reply.u.path_resources.fec_capable;
 		}
 	}
 
include/drm/drm_dp_mst_helper.h +3 -0
index 2ba6253ea6d3..e1801781fff5 100644
@@ -108,6 +108,8 @@ struct drm_dp_mst_port {
 	 * audio-capable.
 	 */
 	bool has_audio;
+
+	bool fec_capable;
 };
 
 /**
@@ -312,6 +314,7 @@ struct drm_dp_port_number_req {
 
 struct drm_dp_enum_path_resources_ack_reply {
 	u8 port_number;
+	bool fec_capable;
 	u16 full_payload_bw_number;
 	u16 avail_payload_bw_number;
 };
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#15 lore raw

PATCH 9/14 drm/dp-mst: Export symbols for dpcd read/write

In reply to a message not in the archive

To use these functions in drm driver directories, they must be exported

---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -0
index 53a0ad16e37b..5a072571cb44 100644
@@ -1512,6 +1512,7 @@ ssize_t drm_dp_mst_dpcd_read(struct drm_dp_aux *aux,
 	return drm_dp_send_dpcd_read(port->mgr, port,
 				     offset, size, buffer);
 }
+EXPORT_SYMBOL(drm_dp_mst_dpcd_read);
 
 /**
  * drm_dp_mst_dpcd_write() - write a series of bytes to the DPCD via sideband
@@ -1535,6 +1536,7 @@ ssize_t drm_dp_mst_dpcd_write(struct drm_dp_aux *aux,
 	return drm_dp_send_dpcd_write(port->mgr, port,
 				      offset, size, buffer);
 }
+EXPORT_SYMBOL(drm_dp_mst_dpcd_write);
 
 static void drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, u8 *guid)
 {
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#16 lore raw

PATCH 10/14 drm/dp-mst: Fill branch->num_ports

In reply to a message not in the archive

This field on drm_dp_mst_branch was never filled

Initialize it to zero when the list of ports is created. When a port is added to the list, increment num_ports

---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -0
index 5a072571cb44..31b7213b6036 100644
@@ -918,6 +918,7 @@ static struct drm_dp_mst_branch *drm_dp_add_mst_branch_device(u8 lct, u8 *rad)
 	INIT_LIST_HEAD(&mstb->ports);
 	kref_init(&mstb->topology_kref);
 	kref_init(&mstb->malloc_kref);
+	mstb->num_ports = 0;
 	return mstb;
 }
 
@@ -1672,6 +1673,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
 		mutex_lock(&mstb->mgr->lock);
 		drm_dp_mst_topology_get_port(port);
 		list_add(&port->next, &mstb->ports);
+		mstb->num_ports++;
 		mutex_unlock(&mstb->mgr->lock);
 	}
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#17 lore raw

PATCH 11/14 drm/amd/display: Validate DSC caps on MST endpoints

In reply to a message not in the archive

The first step in MST DSC is checking MST endpoints to see how DSC can be enabled

Case 1: DP-to-DP peer device
if the branch immediately upstream has
- PDT = DP_PEER_DEVICE_DP_MST_BRANCHING (2)
- DPCD rev. >= DP 1.4
- Exactly one input and one output
- The output has PDT = DP_PEER_DEVICE_SST_SINK (3)

In this case, DSC could be possible either on the endpoint or the peer device. Prefer the endpoint, which is possible if
- The endpoint has DP_DSC_DECOMPRESSION_IS_SUPPORTED bit set
- The endpoint has DP_FEC_CAPABLE bit set
- The peer device has DSC_PASSTHROUGH_CAPABILITY bit set (from DP v2.0)

Otherwise, use the peer device

Case 2: DP-to-HDMI peer device
If the output port has
- PDT = DP_PEER_DEVICE_DP_LEGACY_CONV (4)
- DPCD rev. >= DP 1.4
- LDPS = true
- MCS = false

In this case, DSC can only be attempted on the peer device (the output port)

Case 3: Virtual DP Sink (Internal Display Panel)
If the output port has
- DPCD rev. >= DP 1.4
- port_num >= 8

In this case, DSC can only be attempted on the peer device (the output port)

Case 4: Synaptix Workaround
If the output has
- link DPCD rev. >= DP 1.4
- link branch_dev_id = 0x90CC24 (Synaptix)
- There is exactly one branch device between the link and output

In this case, DSC can be attempted, but only using the *link* aux device's caps. This is a quirk.

Test for these cases as modes are enumerated for an MST endpoint. We cannot do this during link attach because the dc_sink object will not have been created yet

If no DSC is attempted, zero the DSC caps

Cc Wenjing Liu <[email protected]>
Cc Nikola Cornij <[email protected]>
---
 .../display/amdgpu_dm/amdgpu_dm_mst_types.c   | 123 +++++++++++++++++-
 .../display/amdgpu_dm/amdgpu_dm_mst_types.h   |   3 +
 2 files changed, 125 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +122 -1
index 16218a202b59..58571844f6d5 100644
@@ -25,6 +25,7 @@
 
 #include <linux/version.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_dp_mst_helper.h>
 #include "dm_services.h"
 #include "amdgpu.h"
 #include "amdgpu_dm.h"
@@ -189,6 +190,120 @@ static const struct drm_connector_funcs dm_dp_mst_connector_funcs = {
 	.early_unregister = amdgpu_dm_mst_connector_early_unregister,
 };
 
+bool is_virtual_dpcd(struct drm_dp_mst_port *port)
+{
+	struct drm_dp_mst_port *downstream_port;
+
+	if (!port)
+		return false;
+
+	if (port->port_num >= 8 &&
+		port->dpcd_rev >= DP_DPCD_REV_14) {
+		/* Virtual DP Sink (Internal Display Panel) */
+		return true;
+	} else if (port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV &&
+			!port->mcs &&
+			port->ldps &&
+			port->dpcd_rev >= DP_DPCD_REV_14) {
+		/* DP-to-HDMI Protocol Converter */
+		return true;
+	} else if (port->pdt == DP_PEER_DEVICE_MST_BRANCHING &&
+			port->mstb &&
+			port->dpcd_rev >= DP_DPCD_REV_14) {
+		/* DP-to-DP */
+		if (port->mstb->num_ports == 2) {
+			list_for_each_entry(downstream_port, &port->mstb->ports, next) {
+				if (!downstream_port->input &&
+						downstream_port->pdt == DP_PEER_DEVICE_SST_SINK)
+					return true;
+			}
+		}
+	}
+	return false;
+}
+
+bool synaptix_workaround(struct amdgpu_dm_connector *aconnector)
+{
+	struct drm_dp_mst_port *port = aconnector->port;
+	struct dc_link *link = aconnector->dc_sink->link;
+	u8 down_stream_port_data;
+
+	if (port->mgr->mst_primary == port->parent &&
+			link->dpcd_caps.branch_dev_id == 0x90CC24 &&
+			link->dpcd_caps.dpcd_rev.raw >= DP_DPCD_REV_14) {
+		drm_dp_mst_dpcd_read(&port->aux, DP_DOWNSTREAMPORT_PRESENT, &down_stream_port_data, 1);
+		if ((down_stream_port_data & 7) != 3)
+			return true;
+	}
+	return false;
+}
+
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+static bool validate_dsc_caps_on_connector(struct amdgpu_dm_connector *aconnector)
+{
+	u8 upstream_dsc_caps[16] = { 0 };
+	u8 endpoint_dsc_caps[16] = { 0 };
+	u8 endpoint_fec_caps = 0;
+	struct dc_sink *dc_sink = aconnector->dc_sink;
+	struct drm_dp_mst_port *output_port = aconnector->port;
+	struct drm_dp_mst_port *immediate_upstream_port;
+	struct drm_dp_mst_port *fec_port;
+
+	if (aconnector->port && aconnector->port->parent)
+		immediate_upstream_port = aconnector->port->parent->port_parent;
+	else
+		immediate_upstream_port = NULL;
+
+	fec_port = immediate_upstream_port;
+	while (fec_port) {
+		if (!fec_port->fec_capable)
+			return false;
+
+		fec_port = fec_port->parent->port_parent;
+	}
+
+	if (immediate_upstream_port)
+		drm_dp_mst_dpcd_read(&immediate_upstream_port->aux, DP_DSC_SUPPORT, upstream_dsc_caps, 16);
+	drm_dp_mst_dpcd_read(&output_port->aux, DP_DSC_SUPPORT, endpoint_dsc_caps, 16);
+	drm_dp_mst_dpcd_read(&output_port->aux, DP_FEC_CAPABILITY, &endpoint_fec_caps, 1);
+
+	if (is_virtual_dpcd(immediate_upstream_port)
+			&& (upstream_dsc_caps[0] & 0x2) /* DSC passthrough capability */
+			&& (endpoint_fec_caps & DP_FEC_CAPABLE)
+			&& (endpoint_dsc_caps[0] & DP_DSC_DECOMPRESSION_IS_SUPPORTED)) {
+		/* Enpoint decompression with DP-to-DP peer device */
+		if (!dc_dsc_parse_dsc_dpcd(endpoint_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps))
+			return false;
+
+		dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = false;
+	} else if (is_virtual_dpcd(immediate_upstream_port)) {
+		/* Virtual DPCD decompression with DP-to-DP peer device */
+		if (!dc_dsc_parse_dsc_dpcd(upstream_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps))
+			return false;
+
+		dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = true;
+	} else if (is_virtual_dpcd(output_port)) {
+		/* Virtual DPCD decompression with DP-to-HDMI or Virtual DP Sink */
+		if (!dc_dsc_parse_dsc_dpcd(endpoint_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps))
+			return false;
+
+		dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = true;
+	} else if (synaptix_workaround(aconnector)) {
+		/* Synaptix workaround */
+		aconnector = dc_sink->link->priv;
+		drm_dp_dpcd_read(&aconnector->dm_dp_aux.aux, DP_DSC_SUPPORT, upstream_dsc_caps, 16);
+		if (!dc_dsc_parse_dsc_dpcd(upstream_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps))
+			return false;
+
+		dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = true;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+#endif
+
 static int dm_dp_mst_get_modes(struct drm_connector *connector)
 {
 	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
@@ -231,10 +346,16 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
 		/* dc_link_add_remote_sink returns a new reference */
 		aconnector->dc_sink = dc_sink;
 
-		if (aconnector->dc_sink)
+		if (aconnector->dc_sink) {
 			amdgpu_dm_update_freesync_caps(
 					connector, aconnector->edid);
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+			if (!validate_dsc_caps_on_connector(aconnector))
+				memset(&aconnector->dc_sink->sink_dsc_caps,
+				       0, sizeof(aconnector->dc_sink->sink_dsc_caps));
+#endif
+		}
 	}
 
 	drm_connector_update_edid_property(
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +3 -0
index 2da851b40042..8de3d8c30f8d 100644
@@ -32,4 +32,7 @@ struct amdgpu_dm_connector;
 void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
 				       struct amdgpu_dm_connector *aconnector);
 
+bool is_virtual_dpcd(struct drm_dp_mst_port *port);
+bool synaptix_workaround(struct amdgpu_dm_connector *aconnector);
+
 #endif
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#18 lore raw

PATCH 12/14 drm/amd/display: Write DSC enable to MST DPCD

In reply to a message not in the archive

Rework the dm_helpers_write_dsc_enable callback to handle the MST case

Depending on how DSC is done, the DP_DSC_ENABLE bit needs to be set on a different point

For SST, use the link aux

For endpoint DSC over DP-to-DP peer devices, use the output port

For peer device DSC over DP-to-DP peer devices, use the upstream (peer) device

For DP-to-HDMI or virtual DP peer devices, use the output port

For the Synaptix workaround, use the link aux

Cc Wenjing Liu <[email protected]>
Cc Nikola Cornij <[email protected]>
---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +29 -1
index b32c0790399a..3d5deeed8367 100644
@@ -38,6 +38,7 @@
 #include "dc.h"
 #include "amdgpu_dm.h"
 #include "amdgpu_dm_irq.h"
+#include "amdgpu_dm_mst_types.h"
 
 #include "dm_helpers.h"
 
@@ -525,8 +526,35 @@ bool dm_helpers_dp_write_dsc_enable(
 )
 {
 	uint8_t enable_dsc = enable ? 1 : 0;
+	struct amdgpu_dm_connector *aconnector;
+
+	if (!stream)
+		return false;
+
+	if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
+		aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
+
+		if (!aconnector || !aconnector->dc_sink)
+			return false;
+
+		if (!aconnector->dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc)
+			return drm_dp_mst_dpcd_write(&aconnector->port->aux,
+						    DP_DSC_ENABLE, &enable_dsc, 1) >= 0;
+		else if (is_virtual_dpcd(aconnector->port->parent->port_parent))
+			return drm_dp_mst_dpcd_write(&aconnector->port->parent->port_parent->aux,
+						    DP_DSC_ENABLE, &enable_dsc, 1) >= 0;
+		else if (is_virtual_dpcd(aconnector->port))
+			return drm_dp_mst_dpcd_write(&aconnector->port->aux,
+						    DP_DSC_ENABLE, &enable_dsc, 1) >= 0;
+		else if (synaptix_workaround(aconnector))
+			return dm_helpers_dp_write_dpcd(ctx, stream->link,
+						DP_DSC_ENABLE, &enable_dsc, 1);
+	}
+
+	if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT)
+		return dm_helpers_dp_write_dpcd(ctx, stream->link, DP_DSC_ENABLE, &enable_dsc, 1);
 
-	return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1);
+	return false;
 }
 #endif
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#19 lore raw

PATCH 13/14 drm/amd/display: MST DSC compute fair share

In reply to a message not in the archive

If there is limited link bandwidth on a MST network, it must be divided fairly between the streams on that network

Implement an algorithm to determine the correct DSC config for each stream

The algorithm:
This
[ ] ( )
represents the range of bandwidths possible for a given stream. The [] area represents the range of DSC configs, and the () represents no DSC. The bandwidth used increases from left to right.

First, try disabling DSC on all streams
[ ] (|)
[ ] (|)
Check this against the bandwidth limits of the link and each branch (including each endpoint). If it passes, the job is done

Second, try maximum DSC compression on all streams that support DSC
[| ] ( )
[| ] ( )
If this does not pass, then enabling this combination of streams is impossible

Otherwise, divide the remaining bandwidth evenly amongst the streams
[ | ] ( )
[ | ] ( )

If one or more of the streams reach minimum compression, evenly divide the reamining bandwidth amongst the remaining streams
[ |] ( )
[ |] ( )
[ | ] ( )
[ | ] ( )

If all streams can reach minimum compression, disable compression greedily

     [      |]  ( )
     [        |]    ( )
     [                 ]                                (|)

Perform this algorithm on each full update, on each MST link with at least one DSC stream on it

After the configs are computed, call dcn20_add_dsc_to_stream_resource on each stream with DSC enabled. It is only after all streams are created that we can know which of them will need DSC.

Do all of this at the end of amdgpu atomic check. If it fails, fail check; This combination of timings cannot be supported.

Cc Wenjing Liu <[email protected]>
Cc Nikola Cornij <[email protected]>
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |   4 +
 .../display/amdgpu_dm/amdgpu_dm_mst_types.c   | 375 ++++++++++++++++++
 .../display/amdgpu_dm/amdgpu_dm_mst_types.h   |   4 +-
 .../drm/amd/display/dc/dcn20/dcn20_resource.c |   7 +-
 .../drm/amd/display/dc/dcn20/dcn20_resource.h |   1 +
 5 files changed, 388 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -0
index 84249057e181..145fd73025dc 100644
@@ -7331,6 +7331,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
 		if (ret)
 			goto fail;
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+		if (!compute_mst_dsc_configs_for_state(dm_state->context))
+			goto fail;
+#endif
 		if (dc_validate_global_state(dc, dm_state->context, false) != DC_OK) {
 			ret = -EINVAL;
 			goto fail;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +375 -0

384 lines not on this page · raw message

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +3 -1
index 8de3d8c30f8d..b7d2e4e70185 100644
@@ -34,5 +34,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
 
 bool is_virtual_dpcd(struct drm_dp_mst_port *port);
 bool synaptix_workaround(struct amdgpu_dm_connector *aconnector);
-
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+bool compute_mst_dsc_configs_for_state(struct dc_state *dc_state);
+#endif
 #endif
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +5 -2
index c59f31dcdc0d..22511b047837 100644
@@ -1439,7 +1439,7 @@ static void release_dsc(struct resource_context *res_ctx,
 
 
 #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
-static enum dc_status add_dsc_to_stream_resource(struct dc *dc,
+enum dc_status dcn20_add_dsc_to_stream_resource(struct dc *dc,
 		struct dc_state *dc_ctx,
 		struct dc_stream_state *dc_stream)
 {
@@ -1454,6 +1454,9 @@ static enum dc_status add_dsc_to_stream_resource(struct dc *dc,
 		if (pipe_ctx->stream != dc_stream)
 			continue;
 
+		if (pipe_ctx->stream_res.dsc)
+			continue;
+
 		acquire_dsc(&dc_ctx->res_ctx, pool, &pipe_ctx->stream_res.dsc);
 
 		/* The number of DSCs can be less than the number of pipes */
@@ -1511,7 +1514,7 @@ enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx,
 #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
 	/* Get a DSC if required and available */
 	if (result == DC_OK && dc_stream->timing.flags.DSC)
-		result = add_dsc_to_stream_resource(dc, new_ctx, dc_stream);
+		result = dcn20_add_dsc_to_stream_resource(dc, new_ctx, dc_stream);
 #endif
 
 	if (result == DC_OK)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +1 -0
index 44f95aa0d61e..2209ebda6ef6 100644
@@ -131,6 +131,7 @@ void dcn20_calculate_dlg_params(
 
 enum dc_status dcn20_build_mapped_resource(const struct dc *dc, struct dc_state *context, struct dc_stream_state *stream);
 enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx, struct dc_stream_state *dc_stream);
+enum dc_status dcn20_add_dsc_to_stream_resource(struct dc *dc, struct dc_state *dc_ctx, struct dc_stream_state *dc_stream);
 enum dc_status dcn20_remove_stream_from_ctx(struct dc *dc, struct dc_state *new_ctx, struct dc_stream_state *dc_stream);
 enum dc_status dcn20_get_default_swizzle_mode(struct dc_plane_state *plane_state);
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#20 lore raw

PATCH 14/14 drm/amd/display: Trigger modesets on MST DSC connectors

In reply to a message not in the archive

Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.

Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state

Cc Leo Li <[email protected]>
Cc Nicholas Kazlauskas <[email protected]>
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +80 -0
index 145fd73025dc..8d5357aec5e8 100644
@@ -6475,7 +6475,78 @@ static int do_aquire_global_lock(struct drm_device *dev,
 
 	return ret < 0 ? ret : 0;
 }
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc)
+{
+	struct drm_connector *connector;
+	struct drm_connector_state *conn_state;
+	struct drm_connector_list_iter conn_iter;
+	struct drm_crtc_state *new_crtc_state;
+	struct amdgpu_dm_connector *aconnector = NULL, *aconnector_to_add;
+	int i, j, ret;
+	struct drm_crtc *crtcs_affected[MAX_PIPES] = { 0 };
+
+	for_each_new_connector_in_state(state, connector, conn_state, i) {
+		if (conn_state->crtc != crtc)
+			continue;
+
+		aconnector = to_amdgpu_dm_connector(connector);
+		if (!aconnector->port)
+			aconnector = NULL;
+		else
+			break;
+	}
+
+	if (!aconnector)
+		return 0;
+
+	i = 0;
+	drm_connector_list_iter_begin(state->dev, &conn_iter);
+	drm_for_each_connector_iter(connector, &conn_iter) {
+		if (!connector->state || !connector->state->crtc)
+			continue;
+
+		aconnector_to_add = to_amdgpu_dm_connector(connector);
+		if (!aconnector_to_add->port)
+			continue;
+
+		if (aconnector_to_add->port->mgr != aconnector->port->mgr)
+			continue;
+
+		if (!aconnector_to_add->dc_sink)
+			continue;
+
+		if (!aconnector_to_add->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported)
+			continue;
 
+		if (i >= MAX_PIPES)
+			continue;
+
+		crtcs_affected[i] = connector->state->crtc;
+		i++;
+	}
+	drm_connector_list_iter_end(&conn_iter);
+
+	for (j = 0; j < i; j++) {
+		new_crtc_state = drm_atomic_get_crtc_state(state, crtcs_affected[j]);
+		if (IS_ERR(new_crtc_state))
+			return PTR_ERR(new_crtc_state);
+
+		new_crtc_state->mode_changed = true;
+
+		ret = drm_atomic_add_affected_connectors(state, crtcs_affected[j]);
+		if (ret)
+			return ret;
+
+		ret = drm_atomic_add_affected_planes(state, crtcs_affected[j]);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+
+}
+#endif
 static void get_freesync_config_for_crtc(
 	struct dm_crtc_state *new_crtc_state,
 	struct dm_connector_state *new_con_state)
@@ -7178,6 +7249,15 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
 			goto fail;
 	}
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
+		if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {
+			ret = add_affected_mst_dsc_crtcs(state, crtc);
+			if (ret)
+				goto fail;
+		}
+	}
+#endif
 	/*
 	 * Add all primary and overlay planes on the CRTC to the state
 	 * whenever a plane is enabled to maintain correct z-ordering
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20190819155038.1771-15-David.Francis-5C7GfCeVMHo@public.gmane.org

#22 lore raw

Re: [PATCH 14/14] drm/amd/display: Trigger modesets on MST DSC connectors

Quoted 42 lines · David Francis

Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.

Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state

Cc Leo Li <[email protected]>
Cc Nicholas Kazlauskas <[email protected]>
---
  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 80 +++++++++++++++++++
  1 file changed, 80 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16 -0
index 145fd73025dc..8d5357aec5e8 100644
@@ -6475,7 +6475,78 @@ static int do_aquire_global_lock(struct drm_device *dev,
 
  	return ret < 0 ? ret : 0;
  }
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc)
+{
+	struct drm_connector *connector;
+	struct drm_connector_state *conn_state;
+	struct drm_connector_list_iter conn_iter;
+	struct drm_crtc_state *new_crtc_state;
+	struct amdgpu_dm_connector *aconnector = NULL, *aconnector_to_add;
+	int i, j, ret;
+	struct drm_crtc *crtcs_affected[MAX_PIPES] = { 0 }; > +
+	for_each_new_connector_in_state(state, connector, conn_state, i) {
+		if (conn_state->crtc != crtc)
+			continue;
+
+		aconnector = to_amdgpu_dm_connector(connector);
+		if (!aconnector->port)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int do_aquire_global_lock(struct drm_device *dev, · line 6503

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -0
+			aconnector = NULL;
+		else
+			break;
+	}
+
+	if (!aconnector)
+		return 0;
+
+	i = 0;
+	drm_connector_list_iter_begin(state->dev, &conn_iter);

I don't like that we're grabbing the global connector lock every single time any CRTC undergoes a modeset even for ASICs that don't support DSC.

We do lock everything below in atomic check anyway for FULL updates but I'd like to avoid adding more code that does this if possible. Maybe a check at the start that only does this if the ASIC has DSC support would be OK.

Quoted 11 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +11 -0
+	drm_for_each_connector_iter(connector, &conn_iter) {
+		if (!connector->state || !connector->state->crtc)
+			continue;
+
+		aconnector_to_add = to_amdgpu_dm_connector(connector);
+		if (!aconnector_to_add->port)
+			continue;
+
+		if (aconnector_to_add->port->mgr != aconnector->port->mgr)
+			continue;
+

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int do_aquire_global_lock(struct drm_device *dev, · line 6525

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9 -0
+		if (!aconnector_to_add->dc_sink)
+			continue;
+
+		if (!aconnector_to_add->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported)
+			continue;
 
+		if (i >= MAX_PIPES)
+			continue;
+
+		crtcs_affected[i] = connector->state->crtc;

Drop this crtcs_affected array and just perform the logic below right here. We don't really need two loops here, redundant calls to drm_atomic_get_crtc_state and the other helpers are fine.

Quoted 34 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +26 -0
+		i++;
+	}
+	drm_connector_list_iter_end(&conn_iter);
+
+	for (j = 0; j < i; j++) {
+		new_crtc_state = drm_atomic_get_crtc_state(state, crtcs_affected[j]);
+		if (IS_ERR(new_crtc_state))
+			return PTR_ERR(new_crtc_state);
+
+		new_crtc_state->mode_changed = true;
+
+		ret = drm_atomic_add_affected_connectors(state, crtcs_affected[j]);
+		if (ret)
+			return ret;
+
+		ret = drm_atomic_add_affected_planes(state, crtcs_affected[j]);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+
+}
+#endif
  static void get_freesync_config_for_crtc(
  	struct dm_crtc_state *new_crtc_state,
  	struct dm_connector_state *new_con_state)
@@ -7178,6 +7249,15 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
  			goto fail;
  	}
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 7263

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7 -0
+		if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {
+			ret = add_affected_mst_dsc_crtcs(state, crtc);
+			if (ret)
+				goto fail;
+		}
+	}
+#endif
  	/*
  	 * Add all primary and overlay planes on the CRTC to the state
  	 * whenever a plane is enabled to maintain correct z-ordering

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#23 lore raw

Re: [PATCH 14/14] drm/amd/display: Trigger modesets on MST DSC connectors

Quoted 56 lines
Quoted 42 lines

Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.

Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state

Cc Leo Li <[email protected]>
Cc Nicholas Kazlauskas <[email protected]>
---
  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 80 +++++++++++++++++++
  1 file changed, 80 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16 -0
index 145fd73025dc..8d5357aec5e8 100644
@@ -6475,7 +6475,78 @@ static int do_aquire_global_lock(struct drm_device *dev,
 
       return ret < 0 ? ret : 0;
  }
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc)
+{
+     struct drm_connector *connector;
+     struct drm_connector_state *conn_state;
+     struct drm_connector_list_iter conn_iter;
+     struct drm_crtc_state *new_crtc_state;
+     struct amdgpu_dm_connector *aconnector = NULL, *aconnector_to_add;
+     int i, j, ret;
+     struct drm_crtc *crtcs_affected[MAX_PIPES] = { 0 }; > +
+     for_each_new_connector_in_state(state, connector, conn_state, i) {
+             if (conn_state->crtc != crtc)
+                     continue;
+
+             aconnector = to_amdgpu_dm_connector(connector);
+             if (!aconnector->port)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int do_aquire_global_lock(struct drm_device *dev, · line 6503

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -0
+                     aconnector = NULL;
+             else
+                     break;
+     }
+
+     if (!aconnector)
+             return 0;
+
+     i = 0;
+     drm_connector_list_iter_begin(state->dev, &conn_iter);

I don't like that we're grabbing the global connector lock every single time any CRTC undergoes a modeset even for ASICs that don't support DSC.

Quoted 5 lines

We do lock everything below in atomic check anyway for FULL updates but I'd like to avoid adding more code that does this if possible. Maybe a check at the start that only does this if the ASIC has DSC support would be OK.

Will do

Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16 -0
+     drm_for_each_connector_iter(connector, &conn_iter) {
+             if (!connector->state || !connector->state->crtc)
+                     continue;
+
+             aconnector_to_add = to_amdgpu_dm_connector(connector);
+             if (!aconnector_to_add->port)
+                     continue;
+
+             if (aconnector_to_add->port->mgr != aconnector->port->mgr)
+                     continue;
+
+             if (!aconnector_to_add->dc_sink)
+                     continue;
+
+             if (!aconnector_to_add->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported)
+                     continue;
 
Quoted 9 lines

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int do_aquire_global_lock(struct drm_device *dev, · line 6525

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -0
+             if (i >= MAX_PIPES)
+                     continue;
+
+             crtcs_affected[i] = connector->state->crtc;

Drop this crtcs_affected array and just perform the logic below right here. We don't really need two loops here, redundant calls to drm_atomic_get_crtc_state and the other helpers are fine.

Unfortunately, calling drm_atomic_get_crtc_state inside drm_for_each_connector_iter causes a lockdep warning

Quoted 31 lines
Quoted 31 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24 -0
+             i++;
+     }
+     drm_connector_list_iter_end(&conn_iter);
+
+     for (j = 0; j < i; j++) {
+             new_crtc_state = drm_atomic_get_crtc_state(state, crtcs_affected[j]);
+             if (IS_ERR(new_crtc_state))
+                     return PTR_ERR(new_crtc_state);
+
+             new_crtc_state->mode_changed = true;
+
+             ret = drm_atomic_add_affected_connectors(state, crtcs_affected[j]);
+             if (ret)
+                     return ret;
+
+             ret = drm_atomic_add_affected_planes(state, crtcs_affected[j]);
+             if (ret)
+                     return ret;
+     }
+
+     return 0;
+
+}
+#endif
  static void get_freesync_config_for_crtc(
       struct dm_crtc_state *new_crtc_state,
       struct dm_connector_state *new_con_state)
@@ -7178,6 +7249,15 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
                       goto fail;
       }
 
Quoted 12 lines

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 7263

Quoted 12 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9 -0
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+     for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
+             if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {
+                     ret = add_affected_mst_dsc_crtcs(state, crtc);
+                     if (ret)
+                             goto fail;
+             }
+     }
+#endif
       /*
        * Add all primary and overlay planes on the CRTC to the state
        * whenever a plane is enabled to maintain correct z-ordering

________________________________________
From: Kazlauskas, Nicholas <[email protected]>
Sent: August 19, 2019 3:34 PM
To: Francis, David; [email protected]; [email protected]
Cc: Li, Sun peng (Leo)
Subject: Re: [PATCH 14/14] drm/amd/display: Trigger modesets on MST DSC connectors

Quoted 42 lines · David Francis

Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.

Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state

Cc Leo Li <[email protected]>
Cc Nicholas Kazlauskas <[email protected]>
---
  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 80 +++++++++++++++++++
  1 file changed, 80 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16 -0
index 145fd73025dc..8d5357aec5e8 100644
@@ -6475,7 +6475,78 @@ static int do_aquire_global_lock(struct drm_device *dev,
 
      return ret < 0 ? ret : 0;
  }
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc)
+{
+     struct drm_connector *connector;
+     struct drm_connector_state *conn_state;
+     struct drm_connector_list_iter conn_iter;
+     struct drm_crtc_state *new_crtc_state;
+     struct amdgpu_dm_connector *aconnector = NULL, *aconnector_to_add;
+     int i, j, ret;
+     struct drm_crtc *crtcs_affected[MAX_PIPES] = { 0 }; > +
+     for_each_new_connector_in_state(state, connector, conn_state, i) {
+             if (conn_state->crtc != crtc)
+                     continue;
+
+             aconnector = to_amdgpu_dm_connector(connector);
+             if (!aconnector->port)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int do_aquire_global_lock(struct drm_device *dev, · line 6503

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -0
+                     aconnector = NULL;
+             else
+                     break;
+     }
+
+     if (!aconnector)
+             return 0;
+
+     i = 0;
+     drm_connector_list_iter_begin(state->dev, &conn_iter);

I don't like that we're grabbing the global connector lock every single time any CRTC undergoes a modeset even for ASICs that don't support DSC.

We do lock everything below in atomic check anyway for FULL updates but I'd like to avoid adding more code that does this if possible. Maybe a check at the start that only does this if the ASIC has DSC support would be OK.

Quoted 11 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +11 -0
+     drm_for_each_connector_iter(connector, &conn_iter) {
+             if (!connector->state || !connector->state->crtc)
+                     continue;
+
+             aconnector_to_add = to_amdgpu_dm_connector(connector);
+             if (!aconnector_to_add->port)
+                     continue;
+
+             if (aconnector_to_add->port->mgr != aconnector->port->mgr)
+                     continue;
+

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int do_aquire_global_lock(struct drm_device *dev, · line 6525

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9 -0
+             if (!aconnector_to_add->dc_sink)
+                     continue;
+
+             if (!aconnector_to_add->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported)
+                     continue;
 
+             if (i >= MAX_PIPES)
+                     continue;
+
+             crtcs_affected[i] = connector->state->crtc;

Drop this crtcs_affected array and just perform the logic below right here. We don't really need two loops here, redundant calls to drm_atomic_get_crtc_state and the other helpers are fine.

Quoted 34 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +26 -0
+             i++;
+     }
+     drm_connector_list_iter_end(&conn_iter);
+
+     for (j = 0; j < i; j++) {
+             new_crtc_state = drm_atomic_get_crtc_state(state, crtcs_affected[j]);
+             if (IS_ERR(new_crtc_state))
+                     return PTR_ERR(new_crtc_state);
+
+             new_crtc_state->mode_changed = true;
+
+             ret = drm_atomic_add_affected_connectors(state, crtcs_affected[j]);
+             if (ret)
+                     return ret;
+
+             ret = drm_atomic_add_affected_planes(state, crtcs_affected[j]);
+             if (ret)
+                     return ret;
+     }
+
+     return 0;
+
+}
+#endif
  static void get_freesync_config_for_crtc(
      struct dm_crtc_state *new_crtc_state,
      struct dm_connector_state *new_con_state)
@@ -7178,6 +7249,15 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
                      goto fail;
      }
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
+     for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 7263

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7 -0
+             if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {
+                     ret = add_affected_mst_dsc_crtcs(state, crtc);
+                     if (ret)
+                             goto fail;
+             }
+     }
+#endif
      /*
       * Add all primary and overlay planes on the CRTC to the state
       * whenever a plane is enabled to maintain correct z-ordering

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#24 lore raw

PATCH 2/14 Revert "drm/amd/display: navi10 bring up skip dsc encoder config"

In reply to David Francis

This reverts commit 5f2fd347eeff7d4ce271920efd47baaa18fe968c.

Re-enable enc2_dp_set_dsc_config. This function caused warnings due to missing register definitions. With the registers added, this now works

---
 .../gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c   | 8 --------
 1 file changed, 8 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c +0 -8
index 6d54942ab98b..a4e67286cdad 100644
@@ -277,14 +277,6 @@ static void enc2_dp_set_dsc_config(struct stream_encoder *enc,
 					uint32_t dsc_slice_width)
 {
 	struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
-	uint32_t dsc_value = 0;
-
-	dsc_value = REG_READ(DP_DSC_CNTL);
-
-	/* dsc disable skip */
-	if ((dsc_value & 0x3) == 0x0)
-		return;
-
 
 	REG_UPDATE_2(DP_DSC_CNTL,
 			DP_DSC_MODE, dsc_mode,
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel