Skip to contentSkip to conversation

DC Patches April 27, 2022

PATCH Superseded Wayne Lin 2 participants 5 messages Apr 27, 2022 – May 2, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Wayne Lin

author
#0 lore raw

cover DC Patches April 27, 2022

This DC patchset brings improvements in multiple areas. In summary, we highlight:

* Have optc3 function accessible to newer DCN
* Add CM boot option for USB4 tunneling
* Fix system hang issue when game resolution is changed
* Remove outdated register for dcn3+
* Add new DSC interface to disconnect from pipe
* Clean up pixel format types in enum surface_pixel_format

---

Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.115.0

Aric Cyr (2):
drm/amd/display: Clean up pixel format types
drm/amd/display: 3.2.184

Eric Bernstein (1):
drm/amd/display: Add new DSC interface to disconnect from pipe

Evgenii Krasnikov (1):
Revert "drm/amd/display: Reset cached PSR parameters after hibernate"

Jimmy Kizito (1):
drm/amd/display: Add Connection Manager boot option.

Lee, Alvin (1):
drm/amd/display: Make OPTC3 function accessible to other DCN

Tse, Kaitlyn (1):
drm/amd/display: Remove outdated register for dcn3+

 drivers/gpu/drm/amd/display/dc/core/dc_link.c |  7 +---
 drivers/gpu/drm/amd/display/dc/dc.h           |  2 +-
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h  |  3 +-
 .../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c  | 11 ++++++
 .../gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h  |  5 ---
 .../gpu/drm/amd/display/dc/dcn30/dcn30_optc.h |  2 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h   |  1 +
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h   |  1 +
 .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h   | 36 ++++++++++++++++++-
 .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c |  1 +
 10 files changed, 54 insertions(+), 15 deletions(-)
Signature · 1 line
2.36.0
author
#1 lore raw

PATCH 1/8 drm/amd/display: Make OPTC3 function accessible to other DCN

From: "Lee, Alvin" <[email protected]>

[Why]
Newer DCN should use optc3

[How]
Declare optc3 vmin/vmax function in header.

---
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h +1 -1
index 736e63bc80c2..97f11ef6e9f0 100644
@@ -344,5 +344,5 @@ void optc3_set_timing_db_mode(struct timing_generator *optc, bool enable);
 void optc3_set_odm_bypass(struct timing_generator *optc,
 		const struct dc_crtc_timing *dc_crtc_timing);
 void optc3_tg_init(struct timing_generator *optc);
-
+void optc3_set_vtotal_min_max(struct timing_generator *optc, int vtotal_min, int vtotal_max);
 #endif /* __DC_OPTC_DCN30_H__ */
Signature · 1 line
2.36.0
author
#2 lore raw

PATCH 2/8 drm/amd/display: Add Connection Manager boot option.

In reply to Wayne Lin

From: Jimmy Kizito <[email protected]>

[Why]
Boot up behaviour may differ depending on the Connection Manager handling USB4 tunneling.

[How]
Send boot option to firmware to indicate Connection Manager.

---
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h       | 1 +
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h   | 3 ++-
 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dmub/dmub_srv.h +1 -0
index 56757a286a03..f5cb8932bd5c 100644
@@ -243,6 +243,7 @@ struct dmub_srv_hw_params {
 	bool power_optimization;
 	bool dpia_supported;
 	bool disable_dpia;
+	bool usb4_cm_version;
 };
 
 /**
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +2 -1
index 05c8d91ad4ab..e24f117e831e 100644
@@ -350,8 +350,9 @@ union dmub_fw_boot_options {
 		uint32_t power_optimization: 1;
 		uint32_t diag_env: 1; /* 1 if diagnostic environment */
 		uint32_t gpint_scratch8: 1; /* 1 if GPINT is in scratch8*/
+		uint32_t usb4_cm_version: 1; /**< USB4 CM Version */
 
-		uint32_t reserved : 18; /**< reserved */
+		uint32_t reserved : 17; /**< reserved */
 	} bits; /**< boot bits */
 	uint32_t all; /**< 32-bit access to bits */
 };
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c +1 -0
index 82c651535628..7c9330a61ac1 100644
@@ -340,6 +340,7 @@ void dmub_dcn31_enable_dmub_boot_options(struct dmub_srv *dmub, const struct dmu
 	boot_options.bits.z10_disable = params->disable_z10;
 	boot_options.bits.dpia_supported = params->dpia_supported;
 	boot_options.bits.enable_dpia = params->disable_dpia ? 0 : 1;
+	boot_options.bits.usb4_cm_version = params->usb4_cm_version;
 	boot_options.bits.power_optimization = params->power_optimization;
 
 	boot_options.bits.sel_mux_phy_c_d_phy_f_g = (dmub->asic == DMUB_ASIC_DCN31B) ? 1 : 0;
Signature · 1 line
2.36.0
author
#3 lore raw

PATCH 3/8 Revert "drm/amd/display: Reset cached PSR parameters after hibernate"

In reply to Wayne Lin

From: Evgenii Krasnikov <[email protected]>

This reverts commit cee342f2d6a8b57ef8209720d5892d0ee22fd3c8.

Commit cee342f2d6a8 ("drm/amd/display: Reset cached PSR parameters after hibernate") causes a system hang when game resolution is changed. Revert it.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -6
index 1eddf2785153..3d13ee32a3db 100644
@@ -3317,14 +3317,9 @@ bool dc_link_setup_psr(struct dc_link *link,
 	 */
 	psr_context->frame_delay = 0;
 
-	if (psr) {
+	if (psr)
 		link->psr_settings.psr_feature_enabled = psr->funcs->psr_copy_settings(psr,
 			link, psr_context, panel_inst);
-		if (link->psr_settings.psr_feature_enabled) {
-			link->psr_settings.psr_power_opt = 0;
-			link->psr_settings.psr_allow_active = 0;
-		}
-	}
 	else
 		link->psr_settings.psr_feature_enabled = dmcu->funcs->setup_psr(dmcu, link, psr_context);
 
Signature · 1 line
2.36.0
Tested-by on the v1 series
#4 lore raw
In reply to Wayne Lin

[Public]

Hi all,

This week this patchset was tested on the following systems:

HP Envy 360, with Ryzen 5 4500U, with the following display types: eDP 1080p 60hz, 4k 60hz (via USB-C to DP/HDMI), 1440p 144hz (via USB-C to DP/HDMI), 1680*1050 60hz (via USB-C to DP and then DP to DVI/VGA)

Lenovo Thinkpad T14s Gen2 with AMD Ryzen 5 5650U, with the following display types: eDP 1080p 60hz, 4k 60hz (via USB-C to DP/HDMI), 1440p 144hz (via USB-C to DP/HDMI), 1680*1050 60hz (via USB-C to DP and then DP to DVI/VGA)

Sapphire Pulse RX5700XT with the following display types:
4k 60hz (via DP/HDMI), 1440p 144hz (via DP/HDMI), 1680*1050 60hz (via DP to DVI/VGA)

Reference AMD RX6800 with the following display types:
4k 60hz (via DP/HDMI and USB-C to DP/HDMI), 1440p 144hz (via USB-C to DP/HDMI and USB-C to DP/HDMI), 1680*1050 60hz (via DP to DVI/VGA)

Included testing using a Startech DP 1.4 MST hub at 2x 4k 60hz and DSC via USB-C to DP DSC Hub with 3x 4k 60hz.

Tested on Ubuntu 22.04 with Kernel Version 5.16

Thank you,

Dan Wheeler
Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
Facebook | Twitter | amd.com

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Wayne Lin
Sent: April 26, 2022 10:40 PM
To: [email protected]
Cc: Wang, Chao-kai (Stylon) <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Wentland, Harry <[email protected]>; Zhuo, Qingqing (Lillian) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Li, Roman <[email protected]>; Chiu, Solomon <[email protected]>; Pillai, Aurabindo <[email protected]>; Lin, Wayne <[email protected]>; Lakha, Bhawanpreet <[email protected]>; Gutierrez, Agustin <[email protected]>; Kotarac, Pavle <[email protected]>
Subject: [PATCH 0/8] DC Patches April 27, 2022

This DC patchset brings improvements in multiple areas. In summary, we highlight:

* Have optc3 function accessible to newer DCN
* Add CM boot option for USB4 tunneling
* Fix system hang issue when game resolution is changed
* Remove outdated register for dcn3+
* Add new DSC interface to disconnect from pipe
* Clean up pixel format types in enum surface_pixel_format

---

Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.115.0

Aric Cyr (2):
drm/amd/display: Clean up pixel format types
drm/amd/display: 3.2.184

Eric Bernstein (1):
drm/amd/display: Add new DSC interface to disconnect from pipe

Evgenii Krasnikov (1):
Revert "drm/amd/display: Reset cached PSR parameters after hibernate"

Jimmy Kizito (1):
drm/amd/display: Add Connection Manager boot option.

Lee, Alvin (1):
drm/amd/display: Make OPTC3 function accessible to other DCN

Tse, Kaitlyn (1):
drm/amd/display: Remove outdated register for dcn3+

 drivers/gpu/drm/amd/display/dc/core/dc_link.c |  7 +---
 drivers/gpu/drm/amd/display/dc/dc.h           |  2 +-
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h  |  3 +-  .../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c  | 11 ++++++  .../gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h  |  5 ---  .../gpu/drm/amd/display/dc/dcn30/dcn30_optc.h |  2 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h   |  1 +
 drivers/gpu/drm/amd/display/dmub/dmub_srv.h   |  1 +
 .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h   | 36 ++++++++++++++++++-
 .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c |  1 +
 10 files changed, 54 insertions(+), 15 deletions(-)

--
2.36.0