DC Patches November 28 2022
cover DC Patches November 28 2022
This DC patchset brings improvements in multiple areas. In summary, we have:
* Program output transfer function when required
* Fix arthmetic errror in MALL size caluclations for subvp
* DCC Meta pitch used for MALL allocation
* Debugfs entry to tell if connector is DPIA link
* Use largest vready_offset in pipe group
* Fixes race condition in DPIA Aux transfer
Alvin Lee (3):
drm/amd/display: Retain phantom pipes when min transition into subvp drm/amd/display: Don't overwrite subvp pipe info in fast updates drm/amd/display: Fix DTBCLK disable requests and SRC_SEL programming
Aric Cyr (1):
drm/amd/display: 3.2.214
Dillon Varone (4):
drm/amd/display: MALL SS calculations should iterate over all pipes
for cursor
drm/amd/display: Use DCC meta pitch for MALL allocation requirements drm/amd/display: Fix arithmetic error in MALL size calculations for
subvp
drm/amd/display: program output tf when required
Dmytro Laktyushkin (1):
drm/amd/display: set per pipe dppclk to 0 when dpp is off
Stylon Wang (2):
drm/amd/display: Fix race condition in DPIA AUX transfer drm/amd/display: Create debugfs to tell if connector is DPIA link
Wesley Chalmers (1):
drm/amd/display: Use the largest vready_offset in pipe group
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 151 +++++++++--------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 23 ++- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 10 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 23 ++- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 30 +++- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 34 +++- .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 6 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 8 +- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 66 +++++--- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 13 +- .../display/dc/dcn32/dcn32_resource_helpers.c | 15 +- .../amd/display/dc/dcn321/dcn321_resource.c | 2 + .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 3 + .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 9 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 4 +- 19 files changed, 277 insertions(+), 152 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/12 drm/amd/display: Fix race condition in DPIA AUX transfer
From: Stylon Wang <[email protected]>
[Why]
This fix was intended for improving on coding style but in the process uncovers a race condition, which explains why we are getting incorrect length in DPIA AUX replies. Due to the call path of DPIA AUX going from DC back to DM layer then again into DC and the added complexities on top of current DC AUX implementation, a proper fix to rely on current dc_lock to address the race condition is difficult without a major overhual on how DPIA AUX is implemented.
[How]
- Add a mutex dpia_aux_lock to protect DPIA AUX transfers
- Remove DMUB_ASYNC_TO_SYNC_ACCESS_* codes and rely solely on aux_return_code_type for error reporting and handling
- Separate SET_CONFIG from DPIA AUX transfer because they have quiet different processing logic
- Remove unnecessary type casting to and from void * type
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 151 +++++++++--------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 10 +- 3 files changed, 91 insertions(+), 87 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +73 -78
@@ -147,14 +147,6 @@ MODULE_FIRMWARE(FIRMWARE_NAVI12_DMCU);/* Number of bytes in PSP footer for firmware. */ #define PSP_FOOTER_BYTES 0x100 -/* -* DMUB Async to Sync Mechanism Status -*/ -#define DMUB_ASYNC_TO_SYNC_ACCESS_FAIL 1 -#define DMUB_ASYNC_TO_SYNC_ACCESS_TIMEOUT 2 -#define DMUB_ASYNC_TO_SYNC_ACCESS_SUCCESS 3 -#define DMUB_ASYNC_TO_SYNC_ACCESS_INVALID 4 -/** * DOC: overview *
@@ -1442,6 +1434,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)memset (&init_params,0 ,sizeof (init_params));#endif +mutex_init (&adev->dm.dpia_aux_lock);mutex_init (&adev->dm.dc_lock);mutex_init (&adev->dm.audio_lock);
@@ -1806,6 +1799,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)mutex_destroy (&adev->dm.audio_lock);mutex_destroy (&adev->dm.dc_lock); +mutex_destroy (&adev->dm.dpia_aux_lock);return ; }
@@ -10211,91 +10205,92 @@ uint32_t dm_read_reg_func(const struct dc_context *ctx, uint32_t address,return value; } -static int amdgpu_dm_set_dmub_async_sync_status (bool is_cmd_aux, -struct dc_context *ctx, -uint8_t status_type, -uint32_t *operation_result) +int amdgpu_dm_process_dmub_aux_transfer_sync ( +struct dc_context *ctx, +unsigned int link_index, +struct aux_payload *payload, +enum aux_return_code_type *operation_result) {struct amdgpu_device *adev = ctx->driver_context; -int return_status =-1 ;struct dmub_notification *p_notify = adev->dm.dmub_notify; +int ret =-1 ; -if (is_cmd_aux) { -if (status_type ==DMUB_ASYNC_TO_SYNC_ACCESS_SUCCESS ) { - return_status = p_notify->aux_reply.length; - *operation_result = p_notify->result; - }else if (status_type ==DMUB_ASYNC_TO_SYNC_ACCESS_TIMEOUT ) { - *operation_result =AUX_RET_ERROR_TIMEOUT ; - }else if (status_type ==DMUB_ASYNC_TO_SYNC_ACCESS_FAIL ) { - *operation_result =AUX_RET_ERROR_ENGINE_ACQUIRE ; - }else if (status_type ==DMUB_ASYNC_TO_SYNC_ACCESS_INVALID ) { - *operation_result =AUX_RET_ERROR_INVALID_REPLY ; - }else { - *operation_result =AUX_RET_ERROR_UNKNOWN ; +mutex_lock (&adev->dm.dpia_aux_lock); +if (!dc_process_dmub_aux_transfer_async (ctx->dc, link_index, payload)) { + *operation_result =AUX_RET_ERROR_ENGINE_ACQUIRE ; + goto out; + } + +if (!wait_for_completion_timeout (&adev->dm.dmub_aux_transfer_done,10 *HZ )) { +DRM_ERROR ("wait_for_completion_timeout timeout!" ); + *operation_result =AUX_RET_ERROR_TIMEOUT ; + goto out; + } + +if (p_notify->result !=AUX_RET_SUCCESS ) { +/* +* Transient states before tunneling is enabled could +* lead to this error. We can ignore this for now. +*/ +if (p_notify->result !=AUX_RET_ERROR_PROTOCOL_ERROR ) { +DRM_WARN ("DPIA AUX failed on 0x%x(%d), error %d\n" , + payload->address, payload->length, + p_notify->result); } - }else { -if (status_type ==DMUB_ASYNC_TO_SYNC_ACCESS_SUCCESS ) { - return_status =0 ; - *operation_result = p_notify->sc_status; - }else { - *operation_result =SET_CONFIG_UNKNOWN_ERROR ; + *operation_result =AUX_RET_ERROR_INVALID_REPLY ; + goto out; + } + + + payload->reply[0 ] = adev->dm.dmub_notify->aux_reply.command; +if (!payload->write && p_notify->aux_reply.length && + (payload->reply[0 ] ==AUX_TRANSACTION_REPLY_AUX_ACK )) { + +if (payload->length != p_notify->aux_reply.length) { +DRM_WARN ("invalid read length %d from DPIA AUX 0x%x(%d)!\n" , + p_notify->aux_reply.length, + payload->address, payload->length); + *operation_result =AUX_RET_ERROR_INVALID_REPLY ; + goto out; } - } -return return_status; +memcpy (payload->data, p_notify->aux_reply.data, + p_notify->aux_reply.length); + } + +/* success */ + ret = p_notify->aux_reply.length; + *operation_result = p_notify->result; +out: +mutex_unlock (&adev->dm.dpia_aux_lock); +return ret; } -int amdgpu_dm_process_dmub_aux_transfer_sync (bool is_cmd_aux,struct dc_context *ctx, -unsigned int link_index,void *cmd_payload,void *operation_result) +int amdgpu_dm_process_dmub_set_config_sync ( +struct dc_context *ctx, +unsigned int link_index, +struct set_config_cmd_payload *payload, +enum set_config_status *operation_result) {struct amdgpu_device *adev = ctx->driver_context; -int ret =0 ; +bool is_cmd_complete; +int ret; -if (is_cmd_aux) { -dc_process_dmub_aux_transfer_async (ctx->dc, - link_index, (struct aux_payload *)cmd_payload); - }else if (dc_process_dmub_set_config_async (ctx->dc, link_index, - (struct set_config_cmd_payload *)cmd_payload, - adev->dm.dmub_notify)) { -return amdgpu_dm_set_dmub_async_sync_status (is_cmd_aux, - ctx,DMUB_ASYNC_TO_SYNC_ACCESS_SUCCESS , - (uint32_t *)operation_result); - } +mutex_lock (&adev->dm.dpia_aux_lock); + is_cmd_complete =dc_process_dmub_set_config_async (ctx->dc, + link_index, payload, adev->dm.dmub_notify); - ret =wait_for_completion_timeout (&adev->dm.dmub_aux_transfer_done,10 *HZ ); -if (ret ==0 ) { +if (is_cmd_complete ||wait_for_completion_timeout (&adev->dm.dmub_aux_transfer_done,10 *HZ )) { + ret =0 ; + *operation_result = adev->dm.dmub_notify->sc_status; + }else {DRM_ERROR ("wait_for_completion_timeout timeout!" ); -return amdgpu_dm_set_dmub_async_sync_status (is_cmd_aux, - ctx,DMUB_ASYNC_TO_SYNC_ACCESS_TIMEOUT , - (uint32_t *)operation_result); - } - -if (is_cmd_aux) { -if (adev->dm.dmub_notify->result ==AUX_RET_SUCCESS ) { -struct aux_payload *payload = (struct aux_payload *)cmd_payload; - - payload->reply[0 ] = adev->dm.dmub_notify->aux_reply.command; -if (!payload->write && adev->dm.dmub_notify->aux_reply.length && - payload->reply[0 ] ==AUX_TRANSACTION_REPLY_AUX_ACK ) { - -if (payload->length != adev->dm.dmub_notify->aux_reply.length) { -DRM_WARN ("invalid read from DPIA AUX %x(%d) got length %d!\n" , - payload->address, payload->length, - adev->dm.dmub_notify->aux_reply.length); -return amdgpu_dm_set_dmub_async_sync_status (is_cmd_aux, ctx, -DMUB_ASYNC_TO_SYNC_ACCESS_INVALID , - (uint32_t *)operation_result); - } + ret =-1 ; + *operation_result =SET_CONFIG_UNKNOWN_ERROR ; + } -memcpy (payload->data, adev->dm.dmub_notify->aux_reply.data, - adev->dm.dmub_notify->aux_reply.length); - } - } - } - -return amdgpu_dm_set_dmub_async_sync_status (is_cmd_aux, - ctx,DMUB_ASYNC_TO_SYNC_ACCESS_SUCCESS , - (uint32_t *)operation_result); +mutex_unlock (&adev->dm.dpia_aux_lock); +return ret; }/*
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +14 -3
@@ -59,7 +59,9 @@#include "signal_types.h" #include "amdgpu_dm_crc.h" struct aux_payload ; +struct set_config_cmd_payload ;enum aux_return_code_type ; +enum set_config_status ;/* Forward declarations */ struct amdgpu_device ;
@@ -542,6 +544,13 @@ struct amdgpu_display_manager {* occurred on certain intel platform */ bool aux_hpd_discon_quirk; + +/** +* @dpia_aux_lock: +* +* Guards access to DPIA AUX +*/ +struct mutex dpia_aux_lock; };enum dsc_clock_force_state {
@@ -785,9 +794,11 @@ void amdgpu_dm_update_connector_after_detect(extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs; -int amdgpu_dm_process_dmub_aux_transfer_sync (bool is_cmd_aux, -struct dc_context *ctx,unsigned int link_index, -void *payload,void *operation_result); +int amdgpu_dm_process_dmub_aux_transfer_sync (struct dc_context *ctx,unsigned int link_index, +struct aux_payload *payload,enum aux_return_code_type *operation_result); + +int amdgpu_dm_process_dmub_set_config_sync (struct dc_context *ctx,unsigned int link_index, +struct set_config_cmd_payload *payload,enum set_config_status *operation_result);bool check_seamless_boot_capability (struct amdgpu_device *adev);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +4 -6
@@ -817,9 +817,8 @@ int dm_helper_dmub_aux_transfer_sync(struct aux_payload *payload, enum aux_return_code_type *operation_result) { - return amdgpu_dm_process_dmub_aux_transfer_sync(true, ctx, - link->link_index, (void *)payload, - (void *)operation_result); + return amdgpu_dm_process_dmub_aux_transfer_sync(ctx,link->link_index, payload, +operation_result ); } int dm_helpers_dmub_set_config_sync(struct dc_context *ctx,
@@ -827,9 +826,8 @@ int dm_helpers_dmub_set_config_sync(struct dc_context *ctx,struct set_config_cmd_payload *payload, enum set_config_status *operation_result) { - return amdgpu_dm_process_dmub_aux_transfer_sync(false, ctx, - link->link_index, (void *)payload, - (void *)operation_result); + return amdgpu_dm_process_dmub_set_config_sync(ctx,link->link_index, payload, +operation_result ); }void dm_set_dcn_clocks (struct dc_context *ctx,struct dc_clocks *clks)
Signature · 1 line
2.34.1
PATCH 2/12 drm/amd/display: Use the largest vready_offset in pipe group
In reply to jdhillonFrom: Wesley Chalmers <[email protected]>
[WHY]
Corruption can occur in LB if vready_offset is not large enough. DML calculates vready_offset for each pipe, but we currently select the top pipe's vready_offset, which is not necessarily enough for all pipes in the group.
[HOW]
Wherever program_global_sync is currently called, iterate through the entire pipe group and find the highest vready_offset.
--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 30 +++++++++++++++++-- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 29 ++++++++++++++++-- 2 files changed, 55 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +28 -2
@@ -869,6 +869,32 @@ static void false_optc_underflow_wa( tg->funcs->clear_optc_underflow (tg); } +static int calculate_vready_offset_for_group (struct pipe_ctx *pipe) +{ +struct pipe_ctx *other_pipe; +int vready_offset = pipe->pipe_dlg_param.vready_offset; + +/* Always use the largest vready_offset of all connected pipes */ +for (other_pipe = pipe->bottom_pipe; other_pipe !=NULL ; other_pipe = other_pipe->bottom_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->top_pipe; other_pipe !=NULL ; other_pipe = other_pipe->top_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->next_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->next_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->prev_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->prev_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } + +return vready_offset; +} + enum dc_status dcn10_enable_stream_timing( struct pipe_ctx *pipe_ctx, struct dc_state *context,
@@ -912,7 +938,7 @@ enum dc_status dcn10_enable_stream_timing( pipe_ctx->stream_res.tg->funcs->program_timing( pipe_ctx->stream_res.tg, &stream->timing, - pipe_ctx->pipe_dlg_param.vready_offset, + calculate_vready_offset_for_group(pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width,
@@ -2908,7 +2934,7 @@ void dcn10_program_pipe( pipe_ctx->stream_res.tg->funcs->program_global_sync ( pipe_ctx->stream_res.tg, - pipe_ctx->pipe_dlg_param.vready_offset, +calculate_vready_offset_for_group (pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width);
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +27 -2
@@ -1652,6 +1652,31 @@ static void dcn20_update_dchubp_dpp( hubp->funcs->phantom_hubp_post_enable (hubp); } +static int calculate_vready_offset_for_group (struct pipe_ctx *pipe) +{ +struct pipe_ctx *other_pipe; +int vready_offset = pipe->pipe_dlg_param.vready_offset; + +/* Always use the largest vready_offset of all connected pipes */ +for (other_pipe = pipe->bottom_pipe; other_pipe !=NULL ; other_pipe = other_pipe->bottom_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->top_pipe; other_pipe !=NULL ; other_pipe = other_pipe->top_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->next_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->next_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } +for (other_pipe = pipe->prev_odm_pipe; other_pipe !=NULL ; other_pipe = other_pipe->prev_odm_pipe) { +if (other_pipe->pipe_dlg_param.vready_offset > vready_offset) + vready_offset = other_pipe->pipe_dlg_param.vready_offset; + } + +return vready_offset; +} static void dcn20_program_pipe( struct dc *dc,
@@ -1670,7 +1695,7 @@ static void dcn20_program_pipe( && !pipe_ctx->prev_odm_pipe) { pipe_ctx->stream_res.tg->funcs->program_global_sync ( pipe_ctx->stream_res.tg, - pipe_ctx->pipe_dlg_param.vready_offset, +calculate_vready_offset_for_group (pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width);
@@ -2067,7 +2092,7 @@ bool dcn20_update_bandwidth( pipe_ctx->stream_res.tg->funcs->program_global_sync ( pipe_ctx->stream_res.tg, - pipe_ctx->pipe_dlg_param.vready_offset, +calculate_vready_offset_for_group (pipe_ctx), pipe_ctx->pipe_dlg_param.vstartup_start, pipe_ctx->pipe_dlg_param.vupdate_offset, pipe_ctx->pipe_dlg_param.vupdate_width);
Signature · 1 line
2.34.1
PATCH 3/12 drm/amd/display: Create debugfs to tell if connector is DPIA link
In reply to jdhillonFrom: Stylon Wang <[email protected]>
[Why]
Tests need to tell if display is connected via USB4 DPIA link. Currently this is only possible via analyzing dmesg logs.
[How]
Create a per-connector debugfs entry to report if the link is tunneled via USB4 DPIA.
--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +22 -1
@@ -2639,6 +2639,25 @@ static int dp_mst_progress_status_show(struct seq_file *m, void *unused)return 0 ; } +/* +* Reports whether the connected display is a USB4 DPIA tunneled display +* Example usage: cat /sys/kernel/debug/dri/0/DP-8/is_dpia_link +*/ +static int is_dpia_link_show (struct seq_file *m,void *data) +{ +struct drm_connector *connector = m->private; +struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector); +struct dc_link *link = aconnector->dc_link; + +if (connector->status != connector_status_connected) +return -ENODEV ; + +seq_printf (m,"%s\n" , (link->ep_type ==DISPLAY_ENDPOINT_USB4_DPIA ) ?"yes" : + (link->ep_type ==DISPLAY_ENDPOINT_PHY ) ?"no" :"unknown" ); + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (dp_dsc_fec_support);DEFINE_SHOW_ATTRIBUTE (dmub_fw_state);DEFINE_SHOW_ATTRIBUTE (dmub_tracebuffer);
@@ -2650,6 +2669,7 @@ DEFINE_SHOW_ATTRIBUTE(internal_display);DEFINE_SHOW_ATTRIBUTE (psr_capability);DEFINE_SHOW_ATTRIBUTE (dp_is_mst_connector);DEFINE_SHOW_ATTRIBUTE (dp_mst_progress_status); +DEFINE_SHOW_ATTRIBUTE (is_dpia_link);static const struct file_operations dp_dsc_clock_en_debugfs_fops = { .owner =THIS_MODULE ,
@@ -2794,7 +2814,8 @@ static const struct { {"max_bpc", &dp_max_bpc_debugfs_fops}, {"dsc_disable_passthrough", &dp_dsc_disable_passthrough_debugfs_fops}, {"is_mst_connector", &dp_is_mst_connector_fops}, - {"mst_progress_status", &dp_mst_progress_status_fops} + {"mst_progress_status", &dp_mst_progress_status_fops}, + {"is_dpia_link", &is_dpia_link_fops} };#ifdef CONFIG_DRM_AMD_DC_HDCP
Signature · 1 line
2.34.1
PATCH 4/12 drm/amd/display: MALL SS calculations should iterate over all pipes for cursor
In reply to jdhillonFrom: Dillon Varone <[email protected]>
[Description]
MALL SS allocation calculations should iterate over all pipes to determine the the allocation size required for HW cursor.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +1 -1
@@ -316,8 +316,8 @@ static uint32_t dcn32_calculate_cab_allocation(struct dc *dc, struct dc_state *c cache_lines_used += (((cursor_size +DCN3_2_MALL_MBLK_SIZE_BYTES -1 ) /DCN3_2_MALL_MBLK_SIZE_BYTES ) *DCN3_2_MALL_MBLK_SIZE_BYTES ) / dc->caps.cache_line_size +2 ; +break ; } -break ; } }
Signature · 1 line
2.34.1
PATCH 5/12 drm/amd/display: Use DCC meta pitch for MALL allocation requirements
In reply to jdhillonFrom: Dillon Varone <[email protected]>
[Description]
Calculations for determining DCC meta size should be pitch*height*bpp/256.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 6 +++--- .../drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +3 -3
@@ -262,11 +262,11 @@ static uint32_t dcn32_calculate_cab_allocation(struct dc *dc, struct dc_state *c num_mblks = ((mall_alloc_width_blk_aligned + mblk_width -1 ) / mblk_width) * ((mall_alloc_height_blk_aligned + mblk_height -1 ) / mblk_height); -/* For DCC: -* meta_num_mblk = CEILING(full_mblk_width_ub_l*full_mblk_height_ub_l*Bpe/256/mblk_bytes, 1) +/*For DCC: +* meta_num_mblk = CEILING(meta_pitch*full_vp_height*Bpe/256/mblk_bytes, 1) */ if (pipe->plane_state->dcc.enable) - num_mblks += (mall_alloc_width_blk_aligned * mall_alloc_width_blk_aligned * bytes_per_pixel + + num_mblks += (pipe->plane_state->dcc.meta_pitch * pipe->plane_res.scl_data.viewport.height * bytes_per_pixel + (256 *DCN3_2_MALL_MBLK_SIZE_BYTES ) -1 ) / (256 *DCN3_2_MALL_MBLK_SIZE_BYTES ); bytes_in_mall = num_mblks *DCN3_2_MALL_MBLK_SIZE_BYTES ;
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +8 -3
@@ -121,14 +121,19 @@ uint32_t dcn32_helper_calculate_num_ways_for_subvp(struct dc *dc, struct dc_stat*/ num_mblks = ((mall_alloc_width_blk_aligned + mblk_width -1 ) / mblk_width) * ((mall_alloc_height_blk_aligned + mblk_height -1 ) / mblk_height); + +/*For DCC: +* meta_num_mblk = CEILING(meta_pitch*full_vp_height*Bpe/256/mblk_bytes, 1) +*/ +if (pipe->plane_state->dcc.enable) + num_mblks += (pipe->plane_state->dcc.meta_pitch * pipe->plane_res.scl_data.viewport.height * bytes_per_pixel + + (256 *DCN3_2_MALL_MBLK_SIZE_BYTES ) -1 ) / (256 *DCN3_2_MALL_MBLK_SIZE_BYTES ); + bytes_in_mall = num_mblks *DCN3_2_MALL_MBLK_SIZE_BYTES ;// cache lines used is total bytes / cache_line size. Add +2 for worst case alignment // (MALL is 64-byte aligned) cache_lines_per_plane = bytes_in_mall / dc->caps.cache_line_size +2 ; -/* For DCC divide by 256 */ -if (pipe->plane_state->dcc.enable) - cache_lines_per_plane = cache_lines_per_plane + (cache_lines_per_plane /256 ) +1 ; cache_lines_used += cache_lines_per_plane; } }
Signature · 1 line
2.34.1
PATCH 6/12 drm/amd/display: Retain phantom pipes when min transition into subvp
In reply to jdhillonFrom: Alvin Lee <[email protected]>
[Description]
- When entering into a SubVP config that requires a minimal transition we need to retain phantom pipes and also restore the mall config
- This is because the min transition will remove phantom pipes from the context (shallow copy) and not restore it's original state
- This is just a workaround, and needs a proper fix
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 21 ++++++++++++++++++- drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 ++++++++++ .../drm/amd/display/dc/dcn32/dcn32_resource.c | 2 ++ .../drm/amd/display/dc/dcn32/dcn32_resource.h | 11 ---------- .../amd/display/dc/dcn321/dcn321_resource.c | 2 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 2 ++ 6 files changed, 37 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +20 -1
@@ -3954,6 +3954,7 @@ bool dc_update_planes_and_stream(struct dc *dc,struct dc_state *context;enum surface_update_type update_type;int i; +struct mall_temp_config mall_temp_config;/* In cases where MPO and split or ODM are used transitions can * cause underflow. Apply stream configuration with minimal pipe
@@ -3985,11 +3986,29 @@ bool dc_update_planes_and_stream(struct dc *dc,/* on plane removal, minimal state is the new one */ if (force_minimal_pipe_splitting && !is_plane_addition) { +/* Since all phantom pipes are removed in full validation, +* we have to save and restore the subvp/mall config when +* we do a minimal transition since the flags marking the +* pipe as subvp/phantom will be cleared (dc copy constructor +* creates a shallow copy). +*/ +if (dc->res_pool->funcs->save_mall_state) + dc->res_pool->funcs->save_mall_state (dc, context, &mall_temp_config);if (!commit_minimal_transition_state (dc, context)) {dc_release_state (context);return false; } - +if (dc->res_pool->funcs->restore_mall_state) + dc->res_pool->funcs->restore_mall_state (dc, context, &mall_temp_config); + +/* If we do a minimal transition with plane removal and the context +* has subvp we also have to retain back the phantom stream / planes +* since the refcount is decremented as part of the min transition +* (we commit a state with no subvp, so the phantom streams / planes +* had to be removed). +*/ +if (dc->res_pool->funcs->retain_phantom_pipes) + dc->res_pool->funcs->retain_phantom_pipes (dc, context); update_type =UPDATE_TYPE_FULL ; }
drivers/gpu/drm/amd/display/dc/dc_stream.h +11 -0
@@ -160,6 +160,17 @@ struct mall_stream_config {struct dc_stream_state *paired_stream;// master / slave stream }; +/* Temp struct used to save and restore MALL config +* during validation. +* +* TODO: Move MALL config into dc_state instead of stream struct +* to avoid needing to save/restore. +*/ +struct mall_temp_config { +struct mall_stream_config mall_stream_config[MAX_PIPES ]; +bool is_phantom_plane[MAX_PIPES ]; +}; +struct dc_stream_state {// sink is deprecated, new code should not reference // this pointer
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +2 -0
@@ -2055,6 +2055,8 @@ static struct resource_funcs dcn32_res_pool_funcs = { .add_phantom_pipes = dcn32_add_phantom_pipes, .remove_phantom_pipes = dcn32_remove_phantom_pipes, .retain_phantom_pipes = dcn32_retain_phantom_pipes, + .save_mall_state = dcn32_save_mall_state, + .restore_mall_state = dcn32_restore_mall_state, };
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h +0 -11
@@ -45,17 +45,6 @@extern struct _vcs_dpi_ip_params_st dcn3_2_ip;extern struct _vcs_dpi_soc_bounding_box_st dcn3_2_soc; -/* Temp struct used to save and restore MALL config -* during validation. -* -* TODO: Move MALL config into dc_state instead of stream struct -* to avoid needing to save/restore. -*/ -struct mall_temp_config { -struct mall_stream_config mall_stream_config[MAX_PIPES ]; -bool is_phantom_plane[MAX_PIPES ]; -}; -struct dcn32_resource_pool {struct resource_pool base; };
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +2 -0
@@ -1622,6 +1622,8 @@ static struct resource_funcs dcn321_res_pool_funcs = { .add_phantom_pipes = dcn32_add_phantom_pipes, .remove_phantom_pipes = dcn32_remove_phantom_pipes, .retain_phantom_pipes = dcn32_retain_phantom_pipes, + .save_mall_state = dcn32_save_mall_state, + .restore_mall_state = dcn32_restore_mall_state, };
drivers/gpu/drm/amd/display/dc/inc/core_types.h +2 -0
@@ -243,6 +243,8 @@ struct resource_funcs {bool (*remove_phantom_pipes)(struct dc *dc,struct dc_state *context);void (*retain_phantom_pipes)(struct dc *dc,struct dc_state *context);void (*get_panel_config_defaults)(struct dc_panel_config *panel_config); +void (*save_mall_state)(struct dc *dc,struct dc_state *context,struct mall_temp_config *temp_config); +void (*restore_mall_state)(struct dc *dc,struct dc_state *context,struct mall_temp_config *temp_config); };struct audio_support {
Signature · 1 line
2.34.1
PATCH 7/12 drm/amd/display: Fix arithmetic error in MALL size calculations for subvp
In reply to jdhillonFrom: Dillon Varone <[email protected]>
[Description]
Need to subtract unused section of the viewport when calculating required space in MALL for subvp instead of adding, to prevent over allocation.
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +2 -2
@@ -97,14 +97,14 @@ uint32_t dcn32_helper_calculate_num_ways_for_subvp(struct dc *dc, struct dc_stat* FLOOR(vp_x_start, blk_width) */ full_vp_width_blk_aligned = ((pipe->plane_res.scl_data.viewport.x + - pipe->plane_res.scl_data.viewport.width + mblk_width -1 ) / mblk_width * mblk_width) + + pipe->plane_res.scl_data.viewport.width + mblk_width -1 ) / mblk_width * mblk_width) - (pipe->plane_res.scl_data.viewport.x / mblk_width * mblk_width);/* full_vp_height_blk_aligned = FLOOR(vp_y_start + full_vp_height + blk_height - 1, blk_height) - * FLOOR(vp_y_start, blk_height) */ full_vp_height_blk_aligned = ((pipe->plane_res.scl_data.viewport.y + - full_vp_height + mblk_height -1 ) / mblk_height * mblk_height) + + full_vp_height + mblk_height -1 ) / mblk_height * mblk_height) - (pipe->plane_res.scl_data.viewport.y / mblk_height * mblk_height);/* mall_alloc_width_blk_aligned_l/c = full_vp_width_blk_aligned_l/c */
Signature · 1 line
2.34.1
PATCH 8/12 drm/amd/display: program output tf when required
In reply to jdhillonFrom: Dillon Varone <[email protected]>
[Description]
Output transfer function must be programmed per pipe as part of a front end update when the plane changes, or output transfer function changes for a given plane.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +4 -1
@@ -1741,7 +1741,10 @@ static void dcn20_program_pipe(* only do gamma programming for powering on, internal memcmp to avoid * updating on slave planes */ -if (pipe_ctx->update_flags.bits.enable || pipe_ctx->stream->update_flags.bits.out_tf) +if (pipe_ctx->update_flags.bits.enable || + pipe_ctx->update_flags.bits.plane_changed || + pipe_ctx->stream->update_flags.bits.out_tf || + pipe_ctx->plane_state->update_flags.bits.output_tf_change) hws->funcs.set_output_transfer_func (dc, pipe_ctx, pipe_ctx->stream);/* If the pipe has been enabled or has a different opp, we
Signature · 1 line
2.34.1
PATCH 9/12 drm/amd/display: Don't overwrite subvp pipe info in fast updates
In reply to jdhillonFrom: Alvin Lee <[email protected]>
[Description]
- This is a workaround to avoid concurrency issues -- a fast update creates a shallow copy of the dc current_state, and removes all subvp/phantom related flags.
- We want to prevent the fast update thread from removing those flags in case there's another thread running that requires the info for proper programming
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 64 +++++++++++-------- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 2 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 4 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 2 +- 5 files changed, 44 insertions(+), 30 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -1
@@ -3061,7 +3061,7 @@ static bool update_planes_and_stream_state(struct dc *dc,* Ensures that we have enough pipes for newly added MPO planes */ if (dc->res_pool->funcs->remove_phantom_pipes) - dc->res_pool->funcs->remove_phantom_pipes (dc, context); + dc->res_pool->funcs->remove_phantom_pipes (dc, context, false);/*remove old surfaces from context */ if (!dc_rem_all_planes_for_stream (dc, stream, context)) {
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +39 -25
83 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h +1 -1
@@ -70,7 +70,7 @@ bool dcn32_release_post_bldn_3dlut( struct dc_transfer_func **shaper);bool dcn32_remove_phantom_pipes (struct dc *dc, -struct dc_state *context); +struct dc_state *context,bool fast_update);void dcn32_retain_phantom_pipes (struct dc *dc,struct dc_state *context);
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +2 -2
@@ -1203,7 +1203,7 @@ static void dcn32_full_validate_bw_helper(struct dc *dc,// If SubVP pipe config is unsupported (or cannot be used for UCLK switching) // remove phantom pipes and repopulate dml pipes if (!found_supported_config) { - dc->res_pool->funcs->remove_phantom_pipes (dc, context); + dc->res_pool->funcs->remove_phantom_pipes (dc, context, false); vba->DRAMClockChangeSupport[*vlevel][vba->maxMpcComb] = dm_dram_clock_change_unsupported; *pipe_cnt = dc->res_pool->funcs->populate_dml_pipes (dc, context, pipes, false);
@@ -1515,7 +1515,7 @@ bool dcn32_internal_validate_bw(struct dc *dc,return false;// For each full update, remove all existing phantom pipes first - dc->res_pool->funcs->remove_phantom_pipes (dc, context); + dc->res_pool->funcs->remove_phantom_pipes (dc, context, fast_validate); dc->res_pool->funcs->update_soc_for_wm_a (dc, context);
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -1
@@ -240,7 +240,7 @@ struct resource_funcs {unsigned int pipe_cnt, unsigned int index); -bool (*remove_phantom_pipes)(struct dc *dc,struct dc_state *context); +bool (*remove_phantom_pipes)(struct dc *dc,struct dc_state *context,bool fast_update);void (*retain_phantom_pipes)(struct dc *dc,struct dc_state *context);void (*get_panel_config_defaults)(struct dc_panel_config *panel_config);void (*save_mall_state)(struct dc *dc,struct dc_state *context,struct mall_temp_config *temp_config);
Signature · 1 line
2.34.1
PATCH 10/12 drm/amd/display: Fix DTBCLK disable requests and SRC_SEL programming
In reply to jdhillonFrom: Alvin Lee <[email protected]>
[Description]
- When transitioning FRL / DP2 is not required, we will always request DTBCLK = 0Mhz, but PMFW returns the min freq
- This causes us to make DTBCLK requests every time we call optimize after transitioning from FRL to non-FRL
- If DTBCLK is not required, request the min instead (then we only need to make 1 extra request at boot time)
- Also when programming PIPE_DTO_SRC_SEL, don't programming for DP first, just programming once for the required selection (programming DP on an HDMI connection then switching back causes corruption)
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +1 -1
@@ -438,7 +438,7 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base, }if (!new_clocks->dtbclk_en) { - new_clocks->ref_dtbclk_khz =0 ; + new_clocks->ref_dtbclk_khz = clk_mgr_base->bw_params->clk_table.entries[0 ].dtbclk_mhz *1000 ; }/* clock limits are received with MHz precision, divide by 1000 to prevent setting clocks at every call */
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +1 -5
@@ -225,11 +225,7 @@ static void dccg32_set_dtbclk_dto( }else {REG_UPDATE_2 (OTG_PIXEL_RATE_CNTL [params->otg_inst],DTBCLK_DTO_ENABLE [params->otg_inst],0 , -PIPE_DTO_SRC_SEL [params->otg_inst],1 ); -if (params->is_hdmi) -REG_UPDATE (OTG_PIXEL_RATE_CNTL [params->otg_inst], -PIPE_DTO_SRC_SEL [params->otg_inst],0 ); - +PIPE_DTO_SRC_SEL [params->otg_inst], params->is_hdmi ?0 :1 );REG_WRITE (DTBCLK_DTO_MODULO [params->otg_inst],0 );REG_WRITE (DTBCLK_DTO_PHASE [params->otg_inst],0 ); }
Signature · 1 line
2.34.1
PATCH 11/12 drm/amd/display: set per pipe dppclk to 0 when dpp is off
In reply to jdhillonFrom: Dmytro Laktyushkin <[email protected]>
The 'commit 52e4fdf09ebc ("drm/amd/display: use low clocks for no plane configs")' introduced a change that set low clock values for DCN31 and DCN32. As a result of these changes, DC started to spam the log with the following warning:
------------[ cut here ]------------ WARNING: CPU: 8 PID: 1486 at drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_dccg.c:58 dccg2_update_dpp_dto+0x3f/0xf0 [amdgpu] [..] CPU: 8 PID: 1486 Comm: kms_atomic Tainted: G W 5.18.0+ #1 RIP: 0010:dccg2_update_dpp_dto+0x3f/0xf0 [amdgpu] RSP: 0018:ffffbbd8025334d0 EFLAGS: 00010206 RAX: 00000000000001ee RBX: ffffa02c87dd3de0 RCX: 00000000000a7f80 RDX: 000000000007dec3 RSI: 0000000000000000 RDI: ffffa02c87dd3de0 RBP: ffffbbd8025334e8 R08: 0000000000000001 R09: 0000000000000005 R10: 00000000000331a0 R11: ffffffffc0b03d80 R12: ffffa02ca576d000 R13: ffffa02cd02c0000 R14: 00000000001453bc R15: ffffa02cdc280000 [..] dcn20_update_clocks_update_dpp_dto+0x4e/0xa0 [amdgpu] dcn32_update_clocks+0x5d9/0x650 [amdgpu] dcn20_prepare_bandwidth+0x49/0x100 [amdgpu] dcn30_prepare_bandwidth+0x63/0x80 [amdgpu] dc_commit_state_no_check+0x39d/0x13e0 [amdgpu] dc_commit_streams+0x1f9/0x3b0 [amdgpu] dc_commit_state+0x37/0x120 [amdgpu] amdgpu_dm_atomic_commit_tail+0x5e5/0x2520 [amdgpu] ? _raw_spin_unlock_irqrestore+0x1f/0x40 ? down_trylock+0x2c/0x40 ? vprintk_emit+0x186/0x2c0 ? vprintk_default+0x1d/0x20 ? vprintk+0x4e/0x60
We can easily trigger this issue by using a 4k@120 or a 2k@165 and running some of the kms_atomic tests. This warning is triggered because the per-pipe clock update is not happening; this commit fixes this issue by ensuring that DPPCLK is updated when calculating the watermark and dlg is invoked.
--- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 3 +++ drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +3 -0
@@ -559,6 +559,9 @@ void dcn31_calculate_wm_and_dlg_fp( context->bw_ctx.bw.dcn.clk.dramclk_khz =0 ; context->bw_ctx.bw.dcn.clk.fclk_khz =0 ; context->bw_ctx.bw.dcn.clk.p_state_change_support = true; +for (i =0 ; i < dc->res_pool->pipe_count; i++) +if (context->res_ctx.pipe_ctx[i].stream) + context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz =0 ; } }
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +4 -1
@@ -1320,7 +1320,10 @@ static void dcn32_calculate_dlg_params(struct dc *dc, struct dc_state *context,if (context->bw_ctx.bw.dcn.clk.dppclk_khz < pipes[pipe_idx].clks_cfg.dppclk_mhz *1000 ) context->bw_ctx.bw.dcn.clk.dppclk_khz = pipes[pipe_idx].clks_cfg.dppclk_mhz *1000 ; - context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz = pipes[pipe_idx].clks_cfg.dppclk_mhz *1000 ; +if (context->res_ctx.pipe_ctx[i].plane_state) + context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz = pipes[pipe_idx].clks_cfg.dppclk_mhz *1000 ; +else + context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz =0 ; context->res_ctx.pipe_ctx[i].pipe_dlg_param = pipes[pipe_idx].pipe.dest; pipe_idx++; }
Signature · 1 line
2.34.1
PATCH 12/12 drm/amd/display: 3.2.214
In reply to jdhillonFrom: Aric Cyr <[email protected]>
This version brings along following fixes:
-Program output transfer function when required -Fix arthmetic errror in MALL size caluclations for subvp -DCC Meta pitch used for MALL allocation -Debugfs entry to tell if connector is DPIA link -Use largest vready_offset in pipe group
-Fixes race condition in DPIA Aux transfer
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -47,7 +47,7 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.213" +#define DC_VER "3.2.214"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.34.1
[AMD Official Use Only - General]
Hi all,
This week this patchset was tested on the following systems:
HP Envy 360, with Ryzen 5 4500U
Lenovo Thinkpad T14s Gen2, with AMD Ryzen 5 5650U
Lenovo Thinkpad T13s Gen4 with AMD Ryzen 5 6600U
Sapphire Pulse RX5700XT
Reference AMD RX6800
These systems were tested on the following display types:
eDP, (1080p 60hz [4500U, 5650U]) (1920x1200 [6600U])
VGA and DVI (1680x1050 60HZ [DP to VGA/DVI, USB-C to DVI/VGA]) DP/HDMI/USB-C (1440p 170hz, 4k 60hz, 4k 144hz [Includes USB-C to DP/HDMI adapters])
MST tested with Startech MST14DP123DP and 2x 4k 60Hz displays
DSC tested with Cable Matters 101075 (DP to 3x DP), and 201375 (USB-C to 3x DP) with 3x 4k60 displays HP Hook G2 with 1 and 2 4k60 Displays
The testing is a mix of automated and manual tests. Manual testing includes (but is not limited to):
Changing display configurations and settings
Benchmark testing
Feature testing (Freesync, etc.)
Automated testing includes (but is not limited to):
Script testing (scripts to automate some of the manual checks) IGT testing
The patchset consists of the amd-staging-drm-next branch (Head commit - 1ee359db35f2c487a063412168724d3a55b72123 -> drm/amdgpu: enable RAS poison for VCN 2.6) with new patches added on top of it. This branch is used for both Ubuntu and Chrome OS testing (ChromeOS on a bi-weekly basis).
Tested on Ubuntu 22.04 and Chrome OS
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
amd.com
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
Facebook | Twitter | amd.com
-----Original Message-----
From: Dhillon, Jasdeep <[email protected]>
Sent: November 24, 2022 4:14 PM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Lakha, Bhawanpreet <[email protected]>; Siqueira, Rodrigo <[email protected]>; Pillai, Aurabindo <[email protected]>; Zhuo, Qingqing (Lillian) <[email protected]>; Li, Roman <[email protected]>; Lin, Wayne <[email protected]>; Wang, Chao-kai (Stylon) <[email protected]>; Chiu, Solomon <[email protected]>; Kotarac, Pavle <[email protected]>; Gutierrez, Agustin <[email protected]>; Dhillon, Jasdeep <[email protected]>; Wheeler, Daniel <[email protected]>
Subject: [PATCH 00/12] DC Patches November 28 2022
This DC patchset brings improvements in multiple areas. In summary, we have:
* Program output transfer function when required
* Fix arthmetic errror in MALL size caluclations for subvp
* DCC Meta pitch used for MALL allocation
* Debugfs entry to tell if connector is DPIA link
* Use largest vready_offset in pipe group
* Fixes race condition in DPIA Aux transfer
Alvin Lee (3):
drm/amd/display: Retain phantom pipes when min transition into subvp drm/amd/display: Don't overwrite subvp pipe info in fast updates drm/amd/display: Fix DTBCLK disable requests and SRC_SEL programming
Aric Cyr (1):
drm/amd/display: 3.2.214
Dillon Varone (4):
drm/amd/display: MALL SS calculations should iterate over all pipes
for cursor
drm/amd/display: Use DCC meta pitch for MALL allocation requirements drm/amd/display: Fix arithmetic error in MALL size calculations for
subvp
drm/amd/display: program output tf when required
Dmytro Laktyushkin (1):
drm/amd/display: set per pipe dppclk to 0 when dpp is off
Stylon Wang (2):
drm/amd/display: Fix race condition in DPIA AUX transfer drm/amd/display: Create debugfs to tell if connector is DPIA link
Wesley Chalmers (1):
drm/amd/display: Use the largest vready_offset in pipe group
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 151 +++++++++--------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 23 ++- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 10 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 23 ++- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 30 +++- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 34 +++- .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 6 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 8 +- .../drm/amd/display/dc/dcn32/dcn32_resource.c | 66 +++++--- .../drm/amd/display/dc/dcn32/dcn32_resource.h | 13 +- .../display/dc/dcn32/dcn32_resource_helpers.c | 15 +- .../amd/display/dc/dcn321/dcn321_resource.c | 2 + .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 3 + .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 9 +- .../gpu/drm/amd/display/dc/inc/core_types.h | 4 +- 19 files changed, 277 insertions(+), 152 deletions(-)
--
2.34.1