* [PATCH 1/8] drm/amd/display: Make OPTC3 function accessible to other DCN
2022-04-27 2:39 [PATCH 0/8] DC Patches April 27, 2022 Wayne Lin
@ 2022-04-27 2:39 ` Wayne Lin
2022-04-27 2:39 ` [PATCH 2/8] drm/amd/display: Add Connection Manager boot option Wayne Lin
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Wayne Lin @ 2022-04-27 2:39 UTC (permalink / raw)
To: amd-gfx
Cc: stylon.wang, Sunpeng.Li, Harry.Wentland, qingqing.zhuo,
Rodrigo.Siqueira, roman.li, solomon.chiu, Aurabindo.Pillai,
Lee, Alvin, Harry Vanzylldejong, wayne.lin, Bhawanpreet.Lakha,
agustin.gutierrez, pavle.kotarac
From: "Lee, Alvin" <Alvin.Lee2@amd.com>
[Why]
Newer DCN should use optc3
[How]
Declare optc3 vmin/vmax function in header.
Reviewed-by: Harry Vanzylldejong <Harry.Vanzylldejong@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com>
---
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h
index 736e63bc80c2..97f11ef6e9f0 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h
@@ -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__ */
--
2.36.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/8] drm/amd/display: Add Connection Manager boot option.
2022-04-27 2:39 [PATCH 0/8] DC Patches April 27, 2022 Wayne Lin
2022-04-27 2:39 ` [PATCH 1/8] drm/amd/display: Make OPTC3 function accessible to other DCN Wayne Lin
@ 2022-04-27 2:39 ` Wayne Lin
2022-04-27 2:39 ` [PATCH 3/8] Revert "drm/amd/display: Reset cached PSR parameters after hibernate" Wayne Lin
2022-05-02 16:14 ` [PATCH 0/8] DC Patches April 27, 2022 Wheeler, Daniel
3 siblings, 0 replies; 6+ messages in thread
From: Wayne Lin @ 2022-04-27 2:39 UTC (permalink / raw)
To: amd-gfx
Cc: stylon.wang, Jun Lei, Sunpeng.Li, Harry.Wentland, qingqing.zhuo,
Rodrigo.Siqueira, roman.li, solomon.chiu, Aurabindo.Pillai,
wayne.lin, Jimmy Kizito, Bhawanpreet.Lakha, agustin.gutierrez,
pavle.kotarac
From: Jimmy Kizito <Jimmy.Kizito@amd.com>
[Why]
Boot up behaviour may differ depending on the Connection Manager
handling USB4 tunneling.
[How]
Send boot option to firmware to indicate Connection Manager.
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Jimmy Kizito <Jimmy.Kizito@amd.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
index 56757a286a03..f5cb8932bd5c 100644
--- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
+++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
@@ -243,6 +243,7 @@ struct dmub_srv_hw_params {
bool power_optimization;
bool dpia_supported;
bool disable_dpia;
+ bool usb4_cm_version;
};
/**
diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index 05c8d91ad4ab..e24f117e831e 100644
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -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 */
};
diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
index 82c651535628..7c9330a61ac1 100644
--- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
+++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
@@ -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;
--
2.36.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/8] Revert "drm/amd/display: Reset cached PSR parameters after hibernate"
2022-04-27 2:39 [PATCH 0/8] DC Patches April 27, 2022 Wayne Lin
2022-04-27 2:39 ` [PATCH 1/8] drm/amd/display: Make OPTC3 function accessible to other DCN Wayne Lin
2022-04-27 2:39 ` [PATCH 2/8] drm/amd/display: Add Connection Manager boot option Wayne Lin
@ 2022-04-27 2:39 ` Wayne Lin
2022-05-02 16:14 ` [PATCH 0/8] DC Patches April 27, 2022 Wheeler, Daniel
3 siblings, 0 replies; 6+ messages in thread
From: Wayne Lin @ 2022-04-27 2:39 UTC (permalink / raw)
To: amd-gfx
Cc: stylon.wang, Jayendran Ramani, Evgenii Krasnikov, Sunpeng.Li,
Harry.Wentland, qingqing.zhuo, Rodrigo.Siqueira, roman.li,
solomon.chiu, Aurabindo.Pillai, Harry Vanzylldejong, wayne.lin,
Bhawanpreet.Lakha, agustin.gutierrez, pavle.kotarac
From: Evgenii Krasnikov <Evgenii.Krasnikov@amd.com>
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.
Reviewed-by: Jayendran Ramani <Jayendran.Ramani@amd.com>
Reviewed-by: Harry Vanzylldejong <Harry.Vanzylldejong@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Evgenii Krasnikov <Evgenii.Krasnikov@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 1eddf2785153..3d13ee32a3db 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -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);
--
2.36.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH 0/8] DC Patches April 27, 2022
2022-04-27 2:39 [PATCH 0/8] DC Patches April 27, 2022 Wayne Lin
` (2 preceding siblings ...)
2022-04-27 2:39 ` [PATCH 3/8] Revert "drm/amd/display: Reset cached PSR parameters after hibernate" Wayne Lin
@ 2022-05-02 16:14 ` Wheeler, Daniel
3 siblings, 0 replies; 6+ messages in thread
From: Wheeler, Daniel @ 2022-05-02 16:14 UTC (permalink / raw)
To: Lin, Wayne, amd-gfx@lists.freedesktop.org
Cc: Wang, Chao-kai (Stylon), Li, Sun peng (Leo), Lakha, Bhawanpreet,
Zhuo, Qingqing (Lillian), Siqueira, Rodrigo, Li, Roman,
Chiu, Solomon, Pillai, Aurabindo, Lin, Wayne, Wentland, Harry,
Gutierrez, Agustin, Kotarac, Pavle
[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
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
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 <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Wayne Lin
Sent: April 26, 2022 10:40 PM
To: amd-gfx@lists.freedesktop.org
Cc: Wang, Chao-kai (Stylon) <Stylon.Wang@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Wentland, Harry <Harry.Wentland@amd.com>; Zhuo, Qingqing (Lillian) <Qingqing.Zhuo@amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; Li, Roman <Roman.Li@amd.com>; Chiu, Solomon <Solomon.Chiu@amd.com>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com>; Lin, Wayne <Wayne.Lin@amd.com>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>; Gutierrez, Agustin <Agustin.Gutierrez@amd.com>; Kotarac, Pavle <Pavle.Kotarac@amd.com>
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
^ permalink raw reply [flat|nested] 6+ messages in thread