DC Patches Aug 6, 2021
cover DC Patches Aug 6, 2021
This DC patchset brings improvements in multiple areas. In summary, we highlight:
- Fix memory allocation in dm IRQ context to use GFP_ATOMIC
- Increase timeout threshold for DMCUB reset
- Clear GPINT after DMCUB has reset
- Add AUX I2C tracing
- Fix code commenting style
- Some refactoring
- Remove invalid assert for ODM + MPC case
Anson Jacob (1):
drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work
Anthony Koo (2):
drm/amd/display: [FW Promotion] Release 0.0.78
drm/amd/display: 3.2.148
Ashley Thomas (1):
drm/amd/display: Add AUX I2C tracing.
Eric Bernstein (1):
drm/amd/display: Remove invalid assert for ODM + MPC case
Nicholas Kazlauskas (2):
drm/amd/display: Clear GPINT after DMCUB has reset drm/amd/display: Increase timeout threshold for DMCUB reset
Roy Chan (5):
drm/amd/display: fix missing writeback disablement if plane is removed drm/amd/display: refactor the codes to centralize the stream/pipe
checking logic
drm/amd/display: refactor the cursor programing codes drm/amd/display: fix incorrect CM/TF programming sequence in dwb drm/amd/display: Correct comment style
Wenjing Liu (1):
drm/amd/display: add authentication_complete in hdcp output
.../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 62 ++++-- .../gpu/drm/amd/display/dc/core/dc_stream.c | 106 ++++++---- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 192 +++++++++++++++++- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 +- .../drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 90 +++++--- .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 1 - .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 6 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 18 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 + .../display/modules/hdcp/hdcp1_transition.c | 8 +- .../display/modules/hdcp/hdcp2_transition.c | 4 +- .../drm/amd/display/modules/hdcp/hdcp_log.c | 74 +++++++ .../drm/amd/display/modules/hdcp/hdcp_log.h | 72 ------- .../drm/amd/display/modules/inc/mod_hdcp.h | 1 + 18 files changed, 479 insertions(+), 198 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/13 drm/amd/display: Remove invalid assert for ODM + MPC case
From: Eric Bernstein <[email protected]>
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +0 -1
@@ -1788,7 +1788,6 @@ static bool dcn30_split_stream_for_mpc_or_odm( } pri_pipe->next_odm_pipe = sec_pipe; sec_pipe->prev_odm_pipe = pri_pipe; -ASSERT (sec_pipe->top_pipe ==NULL );if (!sec_pipe->top_pipe) sec_pipe->stream_res.opp = pool->opps[pipe_idx];
Signature · 1 line
2.25.1
PATCH 2/13 drm/amd/display: fix missing writeback disablement if plane is removed
In reply to Anson JacobFrom: Roy Chan <[email protected]>
[Why]
If the plane has been removed, the writeback disablement logic doesn't run
[How]
fix the logic order
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 ++++++++------ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +++++++++++- 2 files changed, 19 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +8 -6
@@ -1723,13 +1723,15 @@ void dcn20_program_front_end_for_ctx( pipe = pipe->bottom_pipe; } -/* Program secondary blending tree and writeback pipes */ - pipe = &context->res_ctx.pipe_ctx[i]; -if (!pipe->prev_odm_pipe && pipe->stream->num_wb_info >0 - && (pipe->update_flags.raw || pipe->plane_state->update_flags.raw || pipe->stream->update_flags.raw) - && hws->funcs.program_all_writeback_pipes_in_tree) - hws->funcs.program_all_writeback_pipes_in_tree (dc, pipe->stream, context); } +/* Program secondary blending tree and writeback pipes */ + pipe = &context->res_ctx.pipe_ctx[i]; +if (!pipe->top_pipe && !pipe->prev_odm_pipe + && pipe->stream && pipe->stream->num_wb_info >0 + && (pipe->update_flags.raw || (pipe->plane_state && pipe->plane_state->update_flags.raw) + || pipe->stream->update_flags.raw) + && hws->funcs.program_all_writeback_pipes_in_tree) + hws->funcs.program_all_writeback_pipes_in_tree (dc, pipe->stream, context); } }
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +11 -1
@@ -398,12 +398,22 @@ void dcn30_program_all_writeback_pipes_in_tree(for (i_pipe =0 ; i_pipe < dc->res_pool->pipe_count; i_pipe++) {struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i_pipe]; +if (!pipe_ctx->plane_state) +continue ; +if (pipe_ctx->plane_state == wb_info.writeback_source_plane) { wb_info.mpcc_inst = pipe_ctx->plane_res.mpcc_inst;break ; } } -ASSERT (wb_info.mpcc_inst !=-1 ); + +if (wb_info.mpcc_inst ==-1 ) { +/* Disable writeback pipe and disconnect from MPCC +* if source plane has been removed +*/ + dc->hwss.disable_writeback (dc, wb_info.dwb_pipe_inst); +continue ; + }ASSERT (wb_info.dwb_pipe_inst < dc->res_pool->res_cap->num_dwb); dwb = dc->res_pool->dwbc[wb_info.dwb_pipe_inst];
Signature · 1 line
2.25.1
PATCH 3/13 drm/amd/display: refactor the codes to centralize the stream/pipe checking logic
In reply to Anson JacobFrom: Roy Chan <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 62 ++++++++++++++++-------- 1 file changed, 41 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +41 -21
@@ -1481,6 +1481,22 @@ bool dc_validate_seamless_boot_timing(const struct dc *dc,return true; } +static inline bool should_update_pipe_for_stream ( +struct dc_state *context, +struct pipe_ctx *pipe_ctx, +struct dc_stream_state *stream) +{ +return (pipe_ctx->stream && pipe_ctx->stream == stream); +} + +static inline bool should_update_pipe_for_plane ( +struct dc_state *context, +struct pipe_ctx *pipe_ctx, +struct dc_plane_state *plane_state) +{ +return (pipe_ctx->plane_state == plane_state); +} + void dc_enable_stereo( struct dc *dc, struct dc_state *context,
@@ -1491,12 +1507,15 @@ void dc_enable_stereo(struct pipe_ctx *pipe;for (i =0 ; i <MAX_PIPES ; i++) { -if (context !=NULL ) +if (context !=NULL ) { pipe = &context->res_ctx.pipe_ctx[i]; -else + }else { + context = dc->current_state; pipe = &dc->current_state->res_ctx.pipe_ctx[i]; -for (j =0 ; pipe && j < stream_count; j++) { -if (streams[j] && streams[j] == pipe->stream && + } + +for (j =0 ; pipe && j < stream_count; j++) { +if (should_update_pipe_for_stream (context, pipe, streams[j]) && dc->hwss.setup_stereo) dc->hwss.setup_stereo (pipe, dc); }
@@ -2623,6 +2642,7 @@ static void commit_planes_for_stream(struct dc *dc, {int i, j;struct pipe_ctx *top_pipe_to_program =NULL ; +bool should_lock_all_pipes = (update_type !=UPDATE_TYPE_FAST );#if defined(CONFIG_DRM_AMD_DC_DCN )dc_z10_restore (dc);
@@ -2694,7 +2714,7 @@ static void commit_planes_for_stream(struct dc *dc, top_pipe_to_program->stream_res.tg); } -if ((update_type !=UPDATE_TYPE_FAST ) && dc->hwss.interdependent_update_lock) +if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) dc->hwss.interdependent_update_lock (dc, context, true);else /* Lock the top pipe while updating plane addrs, since freesync requires
@@ -2717,7 +2737,7 @@ static void commit_planes_for_stream(struct dc *dc,if (dc->hwss.program_front_end_for_ctx) dc->hwss.program_front_end_for_ctx (dc, context); -if ((update_type !=UPDATE_TYPE_FAST ) && dc->hwss.interdependent_update_lock) +if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) dc->hwss.interdependent_update_lock (dc, context, false);else dc->hwss.pipe_control_lock (dc, top_pipe_to_program, false);
@@ -2733,14 +2753,14 @@ static void commit_planes_for_stream(struct dc *dc,struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];if (!pipe_ctx->plane_state)continue ; -if (pipe_ctx->plane_state != plane_state) +if (should_update_pipe_for_plane (context, pipe_ctx, plane_state))continue ; - plane_state->triplebuffer_flips = false; + pipe_ctx->plane_state->triplebuffer_flips = false;if (update_type ==UPDATE_TYPE_FAST && dc->hwss.program_triplebuffer !=NULL && - !plane_state->flip_immediate && dc->debug.enable_tri_buf) { + !pipe_ctx->plane_state->flip_immediate && dc->debug.enable_tri_buf) {/*triple buffer for VUpdate only*/ - plane_state->triplebuffer_flips = true; + pipe_ctx->plane_state->triplebuffer_flips = true; } }if (update_type ==UPDATE_TYPE_FULL ) {
@@ -2756,8 +2776,7 @@ static void commit_planes_for_stream(struct dc *dc,if (!pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe && - pipe_ctx->stream && - pipe_ctx->stream == stream) { +should_update_pipe_for_stream (context, pipe_ctx, stream)) {struct dc_stream_status *stream_status =NULL ;if (!pipe_ctx->plane_state)
@@ -2810,15 +2829,15 @@ static void commit_planes_for_stream(struct dc *dc,for (j =0 ; j < dc->res_pool->pipe_count; j++) {struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; -if (pipe_ctx->stream != stream) +if (!should_update_pipe_for_stream (context, pipe_ctx, stream))continue ; -if (pipe_ctx->plane_state != plane_state) +if (!should_update_pipe_for_plane (context, pipe_ctx, plane_state))continue ;// GSL has to be used for flip immediate dc->hwss.set_flip_control_gsl (pipe_ctx, - plane_state->flip_immediate); + pipe_ctx->plane_state->flip_immediate); } }
@@ -2829,25 +2848,26 @@ static void commit_planes_for_stream(struct dc *dc,for (j =0 ; j < dc->res_pool->pipe_count; j++) {struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; -if (pipe_ctx->stream != stream) +if (!should_update_pipe_for_stream (context, pipe_ctx, stream))continue ; -if (pipe_ctx->plane_state != plane_state) +if (!should_update_pipe_for_plane (context, pipe_ctx, plane_state))continue ; +/*program triple buffer after lock based on flip type*/ if (dc->hwss.program_triplebuffer !=NULL && dc->debug.enable_tri_buf) {/*only enable triplebuffer for fast_update*/ dc->hwss.program_triplebuffer ( - dc, pipe_ctx, plane_state->triplebuffer_flips); + dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips); } -if (srf_updates[i].flip_addr) +if (pipe_ctx->plane_state->update_flags.bits.addr_update) dc->hwss.update_plane_addr (dc, pipe_ctx); } } } -if ((update_type !=UPDATE_TYPE_FAST ) && dc->hwss.interdependent_update_lock) +if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) dc->hwss.interdependent_update_lock (dc, context, false);else dc->hwss.pipe_control_lock (dc, top_pipe_to_program, false);
@@ -2891,7 +2911,7 @@ static void commit_planes_for_stream(struct dc *dc,continue ;if (pipe_ctx->bottom_pipe || pipe_ctx->next_odm_pipe || - !pipe_ctx->stream || pipe_ctx->stream != stream || + !pipe_ctx->stream || !should_update_pipe_for_stream (context, pipe_ctx, stream) || !pipe_ctx->plane_state->update_flags.bits.addr_update || pipe_ctx->plane_state->skip_manual_trigger)continue ;
Signature · 1 line
2.25.1
PATCH 4/13 drm/amd/display: refactor the cursor programing codes
In reply to Anson JacobFrom: Roy Chan <[email protected]>
--- .../gpu/drm/amd/display/dc/core/dc_stream.c | 106 +++++++++++------- 1 file changed, 65 insertions(+), 41 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +65 -41
@@ -246,6 +246,40 @@ struct dc_stream_status *dc_stream_get_status(return dc_stream_get_status_from_state (dc->current_state, stream); } +static void program_cursor_attributes ( +struct dc *dc, +struct dc_stream_state *stream, +const struct dc_cursor_attributes *attributes) +{ +int i; +struct resource_context *res_ctx; +struct pipe_ctx *pipe_to_program =NULL ; + +if (!stream) +return ; + + res_ctx = &dc->current_state->res_ctx; + +for (i =0 ; i <MAX_PIPES ; i++) { +struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i]; + +if (pipe_ctx->stream != stream) +continue ; + +if (!pipe_to_program) { + pipe_to_program = pipe_ctx; + dc->hwss.cursor_lock (dc, pipe_to_program, true); + } + + dc->hwss.set_cursor_attribute (pipe_ctx); +if (dc->hwss.set_cursor_sdr_white_level) + dc->hwss.set_cursor_sdr_white_level (pipe_ctx); + } + +if (pipe_to_program) + dc->hwss.cursor_lock (dc, pipe_to_program, false); +} +#ifndef TRIM_FSFT /* * dc_optimize_timing_for_fsft() - dc to optimize timing
@@ -270,10 +304,7 @@ bool dc_stream_set_cursor_attributes(struct dc_stream_state *stream, const struct dc_cursor_attributes *attributes) { - int i; struct dc *dc; -struct resource_context *res_ctx; -struct pipe_ctx *pipe_to_program =NULL ;#if defined(CONFIG_DRM_AMD_DC_DCN )bool reset_idle_optimizations = false;#endif
@@ -293,7 +324,6 @@ bool dc_stream_set_cursor_attributes( } dc = stream->ctx->dc; - res_ctx = &dc->current_state->res_ctx; stream->cursor_attributes = *attributes;#if defined(CONFIG_DRM_AMD_DC_DCN )
@@ -305,11 +335,39 @@ bool dc_stream_set_cursor_attributes( }#endif +program_cursor_attributes (dc, stream, attributes); + +#if defined(CONFIG_DRM_AMD_DC_DCN ) +/* re-enable idle optimizations if necessary */ +if (reset_idle_optimizations) +dc_allow_idle_optimizations (dc, true); + +#endif +return true; +} + +static void program_cursor_position ( +struct dc *dc, +struct dc_stream_state *stream, +const struct dc_cursor_position *position) +{ +int i; +struct resource_context *res_ctx; +struct pipe_ctx *pipe_to_program =NULL ; + +if (!stream) +return ; + + res_ctx = &dc->current_state->res_ctx;for (i =0 ; i <MAX_PIPES ; i++) {struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i]; -if (pipe_ctx->stream != stream) +if (pipe_ctx->stream != stream || + (!pipe_ctx->plane_res.mi && !pipe_ctx->plane_res.hubp) || + !pipe_ctx->plane_state || + (!pipe_ctx->plane_res.xfm && !pipe_ctx->plane_res.dpp) || + (!pipe_ctx->plane_res.ipp && !pipe_ctx->plane_res.dpp))continue ;if (!pipe_to_program) {
@@ -317,31 +375,18 @@ bool dc_stream_set_cursor_attributes( dc->hwss.cursor_lock (dc, pipe_to_program, true); } - dc->hwss.set_cursor_attribute (pipe_ctx); -if (dc->hwss.set_cursor_sdr_white_level) - dc->hwss.set_cursor_sdr_white_level (pipe_ctx); + dc->hwss.set_cursor_position (pipe_ctx); }if (pipe_to_program) dc->hwss.cursor_lock (dc, pipe_to_program, false); - -#if defined(CONFIG_DRM_AMD_DC_DCN ) -/* re-enable idle optimizations if necessary */ -if (reset_idle_optimizations) -dc_allow_idle_optimizations (dc, true); - -#endif -return true; }bool dc_stream_set_cursor_position (struct dc_stream_state *stream,const struct dc_cursor_position *position) { -int i;struct dc *dc; -struct resource_context *res_ctx; -struct pipe_ctx *pipe_to_program =NULL ;#if defined(CONFIG_DRM_AMD_DC_DCN )bool reset_idle_optimizations = false;#endif
@@ -357,7 +402,6 @@ bool dc_stream_set_cursor_position( } dc = stream->ctx->dc; - res_ctx = &dc->current_state->res_ctx;#if defined(CONFIG_DRM_AMD_DC_DCN )dc_z10_restore (dc);
@@ -370,27 +414,7 @@ bool dc_stream_set_cursor_position(#endif stream->cursor_position = *position; -for (i =0 ; i <MAX_PIPES ; i++) { -struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i]; - -if (pipe_ctx->stream != stream || - (!pipe_ctx->plane_res.mi && !pipe_ctx->plane_res.hubp) || - !pipe_ctx->plane_state || - (!pipe_ctx->plane_res.xfm && !pipe_ctx->plane_res.dpp) || - (!pipe_ctx->plane_res.ipp && !pipe_ctx->plane_res.dpp)) -continue ; - -if (!pipe_to_program) { - pipe_to_program = pipe_ctx; - dc->hwss.cursor_lock (dc, pipe_to_program, true); - } - - dc->hwss.set_cursor_position (pipe_ctx); - } - -if (pipe_to_program) - dc->hwss.cursor_lock (dc, pipe_to_program, false); - +program_cursor_position (dc, stream, position);#if defined(CONFIG_DRM_AMD_DC_DCN )/* re-enable idle optimizations if necessary */ if (reset_idle_optimizations)
Signature · 1 line
2.25.1
PATCH 5/13 drm/amd/display: fix incorrect CM/TF programming sequence in dwb
In reply to Anson JacobFrom: Roy Chan <[email protected]>
[How]
the programming sequeune was for old asic.
the correct programming sequeunce should be similar to the one used in mpc. the fix is copied from the mpc programming sequeunce.
--- .../drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 90 +++++++++++++------ 1 file changed, 64 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c +64 -26
@@ -49,6 +49,11 @@static void dwb3_get_reg_field_ogam (struct dcn30_dwbc *dwbc30,struct dcn3_xfer_func_reg *reg) { + reg->shifts.field_region_start_base = dwbc30->dwbc_shift->DWB_OGAM_RAMA_EXP_REGION_START_BASE_B; + reg->masks.field_region_start_base = dwbc30->dwbc_mask->DWB_OGAM_RAMA_EXP_REGION_START_BASE_B; + reg->shifts.field_offset = dwbc30->dwbc_shift->DWB_OGAM_RAMA_OFFSET_B; + reg->masks.field_offset = dwbc30->dwbc_mask->DWB_OGAM_RAMA_OFFSET_B; + reg->shifts.exp_region0_lut_offset = dwbc30->dwbc_shift->DWB_OGAM_RAMA_EXP_REGION0_LUT_OFFSET; reg->masks.exp_region0_lut_offset = dwbc30->dwbc_mask->DWB_OGAM_RAMA_EXP_REGION0_LUT_OFFSET; reg->shifts.exp_region0_num_segments = dwbc30->dwbc_shift->DWB_OGAM_RAMA_EXP_REGION0_NUM_SEGMENTS;
@@ -66,8 +71,6 @@ static void dwb3_get_reg_field_ogam(struct dcn30_dwbc *dwbc30, reg->masks.field_region_end_base = dwbc30->dwbc_mask->DWB_OGAM_RAMA_EXP_REGION_END_BASE_B; reg->shifts.field_region_linear_slope = dwbc30->dwbc_shift->DWB_OGAM_RAMA_EXP_REGION_START_SLOPE_B; reg->masks.field_region_linear_slope = dwbc30->dwbc_mask->DWB_OGAM_RAMA_EXP_REGION_START_SLOPE_B; - reg->masks.field_offset = dwbc30->dwbc_mask->DWB_OGAM_RAMA_OFFSET_B; - reg->shifts.field_offset = dwbc30->dwbc_shift->DWB_OGAM_RAMA_OFFSET_B; reg->shifts.exp_region_start = dwbc30->dwbc_shift->DWB_OGAM_RAMA_EXP_REGION_START_B; reg->masks.exp_region_start = dwbc30->dwbc_mask->DWB_OGAM_RAMA_EXP_REGION_START_B; reg->shifts.exp_resion_start_segment = dwbc30->dwbc_shift->DWB_OGAM_RAMA_EXP_REGION_START_SEGMENT_B;
@@ -147,18 +150,19 @@ static enum dc_lut_mode dwb3_get_ogam_current(uint32_t state_mode;uint32_t ram_select; -REG_GET (DWB_OGAM_CONTROL , -DWB_OGAM_MODE , &state_mode); -REG_GET (DWB_OGAM_CONTROL , -DWB_OGAM_SELECT , &ram_select); +REG_GET_2 (DWB_OGAM_CONTROL , +DWB_OGAM_MODE_CURRENT , &state_mode, +DWB_OGAM_SELECT_CURRENT , &ram_select);if (state_mode ==0 ) { mode =LUT_BYPASS ; }else if (state_mode ==2 ) {if (ram_select ==0 ) mode =LUT_RAM_A ; -else +else if (ram_select ==1 ) mode =LUT_RAM_B ; +else + mode =LUT_BYPASS ; }else {// Reserved value mode =LUT_BYPASS ;
@@ -172,10 +176,10 @@ static void dwb3_configure_ogam_lut(struct dcn30_dwbc *dwbc30, bool is_ram_a) { -REG_UPDATE (DWB_OGAM_LUT_CONTROL , - DWB_OGAM_LUT_READ_COLOR_SEL, 7); -REG_UPDATE (DWB_OGAM_CONTROL , -DWB_OGAM_SELECT , is_ram_a == true ?0 :1 ); +REG_UPDATE_2 (DWB_OGAM_LUT_CONTROL , + DWB_OGAM_LUT_WRITE_COLOR_MASK, 7, + DWB_OGAM_LUT_HOST_SEL, (is_ram_a == true) ? 0 : 1); +REG_SET (DWB_OGAM_LUT_INDEX ,0 ,DWB_OGAM_LUT_INDEX ,0 ); }
@@ -185,17 +189,45 @@ static void dwb3_program_ogam_pwl(struct dcn30_dwbc *dwbc30, {uint32_t i; -// triple base implementation -for (i =0 ; i < num/2 ; i++) { -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+0 ].red_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+0 ].green_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+0 ].blue_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+1 ].red_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+1 ].green_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+1 ].blue_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+2 ].red_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+2 ].green_reg); -REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[2 *i+2 ].blue_reg); +uint32_t last_base_value_red = rgb[num-1 ].red_reg + rgb[num-1 ].delta_red_reg; +uint32_t last_base_value_green = rgb[num-1 ].green_reg + rgb[num-1 ].delta_green_reg; +uint32_t last_base_value_blue = rgb[num-1 ].blue_reg + rgb[num-1 ].delta_blue_reg; + +if (is_rgb_equal (rgb, num)) { +for (i =0 ; i < num; i++) +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[i].red_reg); + +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , last_base_value_red); + + }else { + +REG_UPDATE (DWB_OGAM_LUT_CONTROL , +DWB_OGAM_LUT_WRITE_COLOR_MASK ,4 ); + +for (i =0 ; i < num; i++) +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[i].red_reg); + +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , last_base_value_red); + +REG_SET (DWB_OGAM_LUT_INDEX ,0 ,DWB_OGAM_LUT_INDEX ,0 ); + +REG_UPDATE (DWB_OGAM_LUT_CONTROL , +DWB_OGAM_LUT_WRITE_COLOR_MASK ,2 ); + +for (i =0 ; i < num; i++) +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[i].green_reg); + +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , last_base_value_green); + +REG_SET (DWB_OGAM_LUT_INDEX ,0 ,DWB_OGAM_LUT_INDEX ,0 ); + +REG_UPDATE (DWB_OGAM_LUT_CONTROL , +DWB_OGAM_LUT_WRITE_COLOR_MASK ,1 ); + +for (i =0 ; i < num; i++) +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , rgb[i].blue_reg); + +REG_SET (DWB_OGAM_LUT_DATA ,0 ,DWB_OGAM_LUT_DATA , last_base_value_blue); } }
@@ -211,6 +243,8 @@ static bool dwb3_program_ogam_lut(return false; } +REG_SET (DWB_OGAM_CONTROL ,0 ,DWB_OGAM_MODE ,2 ); + current_mode =dwb3_get_ogam_current (dwbc30);if (current_mode ==LUT_BYPASS || current_mode ==LUT_RAM_A ) next_mode =LUT_RAM_B ;
@@ -227,8 +261,7 @@ static bool dwb3_program_ogam_lut(dwb3_program_ogam_pwl ( dwbc30, params->rgb_resulted, params->hw_points_num); -REG_SET (DWB_OGAM_CONTROL ,0 ,DWB_OGAM_MODE ,2 ); -REG_SET (DWB_OGAM_CONTROL ,0 ,DWB_OGAM_SELECT , next_mode ==LUT_RAM_A ?0 :1 ); +REG_UPDATE (DWB_OGAM_CONTROL ,DWB_OGAM_SELECT , next_mode ==LUT_RAM_A ?0 :1 );return true; }
@@ -271,14 +304,19 @@ static void dwb3_program_gamut_remap(struct color_matrices_reg gam_regs; -REG_UPDATE (DWB_GAMUT_REMAP_COEF_FORMAT ,DWB_GAMUT_REMAP_COEF_FORMAT , coef_format); -if (regval ==NULL || select ==CM_GAMUT_REMAP_MODE_BYPASS ) {REG_SET (DWB_GAMUT_REMAP_MODE ,0 ,DWB_GAMUT_REMAP_MODE ,0 );return ; } +REG_UPDATE (DWB_GAMUT_REMAP_COEF_FORMAT ,DWB_GAMUT_REMAP_COEF_FORMAT , coef_format); + + gam_regs.shifts.csc_c11 = dwbc30->dwbc_shift->DWB_GAMUT_REMAPA_C11; + gam_regs.masks.csc_c11 = dwbc30->dwbc_mask->DWB_GAMUT_REMAPA_C11; + gam_regs.shifts.csc_c12 = dwbc30->dwbc_shift->DWB_GAMUT_REMAPA_C12; + gam_regs.masks.csc_c12 = dwbc30->dwbc_mask->DWB_GAMUT_REMAPA_C12; +switch (select) {case CM_GAMUT_REMAP_MODE_RAMA_COEFF : gam_regs.csc_c11_c12 =REG (DWB_GAMUT_REMAPA_C11_C12 );
Signature · 1 line
2.25.1
PATCH 6/13 drm/amd/display: Correct comment style
In reply to Anson JacobFrom: Roy Chan <[email protected]>
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +1 -1
@@ -1438,7 +1438,7 @@ struct dmub_cmd_psr_set_level_data {* 16-bit value dicated by driver that will enable/disable different functionality. */ uint16_t psr_level; -/** +/** * PSR control version. */ uint8_t cmd_version;
Signature · 1 line
2.25.1
PATCH 7/13 drm/amd/display: Add AUX I2C tracing.
In reply to Anson JacobFrom: Ashley Thomas <[email protected]>
[Why]
Developers can find it useful if the driver can produce AUX traces without special equipment.
[How]
Add AUX tracing.
--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 192 ++++++++++++++++++- 1 file changed, 183 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +183 -9
@@ -42,6 +42,11 @@#define DC_LOGGER \ engine->ctx->logger +#define DC_TRACE_LEVEL_MESSAGE (...)/* do nothing */ +#define IS_DC_I2CAUX_LOGGING_ENABLED () (false) +#define LOG_FLAG_Error_I2cAux LOG_ERROR +#define LOG_FLAG_I2cAux_DceAux LOG_I2C_AUX +#include "reg_helper.h" #undef FN
@@ -623,6 +628,58 @@ int dce_aux_transfer_dmub_raw(struct ddc_service *ddc,#define AUX_MAX_INVALID_REPLY_RETRIES 2#define AUX_MAX_TIMEOUT_RETRIES 3 +static void dce_aux_log_payload (const char *payload_name, +unsigned char *payload,uint32_t length,uint32_t max_length_to_log) +{ +if (!IS_DC_I2CAUX_LOGGING_ENABLED ()) +return ; + +if (payload && length) { +char hex_str[128 ] = {0 }; +char *hex_str_ptr = &hex_str[0 ]; +uint32_t hex_str_remaining =sizeof (hex_str); +unsigned char *payload_ptr = payload; +unsigned char *payload_max_to_log_ptr = payload_ptr +min (max_length_to_log, length); +unsigned int count; +char *padding ="" ; + +while (payload_ptr < payload_max_to_log_ptr) { + count =snprintf_count (hex_str_ptr, hex_str_remaining,"%s%02X" , padding, *payload_ptr); + padding =" " ; + hex_str_remaining -= count; + hex_str_ptr += count; + payload_ptr++; + } + + count =snprintf_count (hex_str_ptr, hex_str_remaining," " ); + hex_str_remaining -= count; + hex_str_ptr += count; + + payload_ptr = payload; +while (payload_ptr < payload_max_to_log_ptr) { + count =snprintf_count (hex_str_ptr, hex_str_remaining,"%c" , + *payload_ptr >=' ' ? *payload_ptr :'.' ); + hex_str_remaining -= count; + hex_str_ptr += count; + payload_ptr++; + } + +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_VERBOSE , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_log_payload: %s: length=%u: data: %s%s" , + payload_name, + length, + hex_str, + (length > max_length_to_log ?" (...)" :" " )); + }else { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_VERBOSE , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_log_payload: %s: length=%u: data: <empty payload>" , + payload_name, + length); + } +} +bool dce_aux_transfer_with_retries (struct ddc_service *ddc,struct aux_payload *payload) {
@@ -648,7 +705,34 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, }for (i =0 ; i <AUX_MAX_RETRIES ; i++) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: link_index=%u: START: retry %d of %d: address=0x%04x length=%u write=%d mot=%d" , + ddc && ddc->link ? ddc->link->link_index :UINT_MAX , + i +1 , + (int )AUX_MAX_RETRIES , + payload->address, + payload->length, + (unsigned int ) payload->write, + (unsigned int ) payload->mot); +if (payload->write) +dce_aux_log_payload (" write" , payload->data, payload->length,16 ); ret =dce_aux_transfer_raw (ddc, payload, &operation_result); +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: link_index=%u: END: retry %d of %d: address=0x%04x length=%u write=%d mot=%d: ret=%d operation_result=%d payload->reply=%u" , + ddc && ddc->link ? ddc->link->link_index :UINT_MAX , + i +1 , + (int )AUX_MAX_RETRIES , + payload->address, + payload->length, + (unsigned int ) payload->write, + (unsigned int ) payload->mot, + ret, + (int )operation_result, + (unsigned int ) *payload->reply); +if (!payload->write) +dce_aux_log_payload (" read" , payload->data, ret >0 ? ret :0 ,16 );switch (operation_result) {case AUX_RET_SUCCESS :
@@ -657,30 +741,64 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,switch (*payload->reply) {case AUX_TRANSACTION_REPLY_AUX_ACK : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_AUX_ACK" );if (!payload->write && payload->length != ret) { -if (++aux_ack_retries >=AUX_MAX_RETRIES ) +if (++aux_ack_retries >=AUX_MAX_RETRIES ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE: aux_ack_retries=%d >= AUX_MAX_RETRIES=%d" , + aux_defer_retries, +AUX_MAX_RETRIES ); goto fail; -else + }else {udelay (300 ); + } }else return true;break ;case AUX_TRANSACTION_REPLY_AUX_DEFER : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_AUX_DEFER" ); +/* polling_timeout_period is in us */ defer_time_in_ms += aux110->polling_timeout_period /1000 ; ++aux_defer_retries; fallthrough;case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER : +if (*payload->reply ==AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER ) +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER" ); + retry_on_defer = true; fallthrough;case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK : +if (*payload->reply ==AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK ) +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK" ); +if (aux_defer_retries >=AUX_MIN_DEFER_RETRIES && defer_time_in_ms >=AUX_MAX_DEFER_TIMEOUT_MS ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE: aux_defer_retries=%d >= AUX_MIN_DEFER_RETRIES=%d && defer_time_in_ms=%d >= AUX_MAX_DEFER_TIMEOUT_MS=%d" , + aux_defer_retries, +AUX_MIN_DEFER_RETRIES , + defer_time_in_ms, +AUX_MAX_DEFER_TIMEOUT_MS ); goto fail; }else {if ((*payload->reply ==AUX_TRANSACTION_REPLY_AUX_DEFER ) || (*payload->reply ==AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER )) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: payload->defer_delay=%u" , + payload->defer_delay);if (payload->defer_delay >1 ) {msleep (payload->defer_delay); defer_time_in_ms += payload->defer_delay;
@@ -693,37 +811,86 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,break ;case AUX_TRANSACTION_REPLY_I2C_DEFER : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_I2C_DEFER" ); + aux_defer_retries =0 ; -if (++aux_i2c_defer_retries >=AUX_MAX_I2C_DEFER_RETRIES ) +if (++aux_i2c_defer_retries >=AUX_MAX_I2C_DEFER_RETRIES ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE: aux_i2c_defer_retries=%d >= AUX_MAX_I2C_DEFER_RETRIES=%d" , + aux_i2c_defer_retries, +AUX_MAX_I2C_DEFER_RETRIES ); goto fail; + }break ;case AUX_TRANSACTION_REPLY_AUX_NACK : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_AUX_NACK" ); + goto fail; +case AUX_TRANSACTION_REPLY_HPD_DISCON : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: AUX_TRANSACTION_REPLY_HPD_DISCON" ); + goto fail; +default : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: AUX_RET_SUCCESS: FAILURE: AUX_TRANSACTION_REPLY_* unknown, default case." ); goto fail; }break ;case AUX_RET_ERROR_INVALID_REPLY : -if (++aux_invalid_reply_retries >=AUX_MAX_INVALID_REPLY_RETRIES ) +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_ERROR_INVALID_REPLY" ); +if (++aux_invalid_reply_retries >=AUX_MAX_INVALID_REPLY_RETRIES ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE: aux_invalid_reply_retries=%d >= AUX_MAX_INVALID_REPLY_RETRIES=%d" , + aux_invalid_reply_retries, +AUX_MAX_INVALID_REPLY_RETRIES ); goto fail; -else + }else udelay (400 );break ;case AUX_RET_ERROR_TIMEOUT : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: AUX_RET_ERROR_TIMEOUT" );// Check whether a DEFER had occurred before the timeout. // If so, treat timeout as a DEFER. if (retry_on_defer) { -if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES ) +if (++aux_defer_retries >=AUX_MIN_DEFER_RETRIES ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE: aux_defer_retries=%d >= AUX_MIN_DEFER_RETRIES=%d" , + aux_defer_retries, +AUX_MIN_DEFER_RETRIES ); goto fail; -else if (payload->defer_delay >0 ) + }else if (payload->defer_delay >0 ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: payload->defer_delay=%u" , + payload->defer_delay);msleep (payload->defer_delay); + } }else { -if (++aux_timeout_retries >=AUX_MAX_TIMEOUT_RETRIES ) +if (++aux_timeout_retries >=AUX_MAX_TIMEOUT_RETRIES ) { +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE: aux_timeout_retries=%d >= AUX_MAX_TIMEOUT_RETRIES=%d" , + aux_timeout_retries, +AUX_MAX_TIMEOUT_RETRIES ); goto fail; -else { + }else {/* * DP 1.4, 2.8.2: AUX Transaction Response/Reply Timeouts * According to the DP spec there should be 3 retries total
@@ -738,11 +905,18 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,case AUX_RET_ERROR_ENGINE_ACQUIRE :case AUX_RET_ERROR_UNKNOWN :default : +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_INFORMATION , + LOG_FLAG_I2cAux_DceAux, +"dce_aux_transfer_with_retries: Failure: operation_result=%d" , + (int )operation_result); goto fail; } } fail: +DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , + LOG_FLAG_Error_I2cAux, +"dce_aux_transfer_with_retries: FAILURE" );if (!payload_reply) payload->reply =NULL ;
Signature · 1 line
2.25.1
PATCH 8/13 drm/amd/display: add authentication_complete in hdcp output
In reply to Anson JacobFrom: Wenjing Liu <[email protected]>
[why]
DM needs to be notified when hdcp module has completed authentication attempt.
--- .../gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 ++ .../display/modules/hdcp/hdcp1_transition.c | 8 +- .../display/modules/hdcp/hdcp2_transition.c | 4 +- .../drm/amd/display/modules/hdcp/hdcp_log.c | 74 +++++++++++++++++++ .../drm/amd/display/modules/hdcp/hdcp_log.h | 72 ------------------ .../drm/amd/display/modules/inc/mod_hdcp.h | 1 + 7 files changed, 93 insertions(+), 79 deletions(-)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c +4 -1
@@ -145,6 +145,7 @@ static enum mod_hdcp_status transition(struct mod_hdcp *hdcp, }else {callback_in_ms (0 , output);set_state_id (hdcp, output,HDCP_CP_NOT_DESIRED ); +set_auth_complete (hdcp, output); } else if (is_hdmi_dvi_sl_hdcp(hdcp)) if (is_cp_desired_hdcp2(hdcp)) {
@@ -156,10 +157,12 @@ static enum mod_hdcp_status transition(struct mod_hdcp *hdcp, }else {callback_in_ms (0 , output);set_state_id (hdcp, output,HDCP_CP_NOT_DESIRED ); +set_auth_complete (hdcp, output); } else {callback_in_ms (0 , output);set_state_id (hdcp, output,HDCP_CP_NOT_DESIRED ); +set_auth_complete (hdcp, output); } }else if (is_in_cp_not_desired_state (hdcp)) {increment_stay_counter (hdcp);
@@ -520,7 +523,7 @@ enum mod_hdcp_status mod_hdcp_process_event(struct mod_hdcp *hdcp,/* reset authentication if needed */ if (trans_status ==MOD_HDCP_STATUS_RESET_NEEDED ) { -HDCP_FULL_DDC_TRACE (hdcp); +mod_hdcp_log_ddc_trace (hdcp); reset_status =reset_authentication (hdcp, output);if (reset_status !=MOD_HDCP_STATUS_SUCCESS )push_error_status (hdcp, reset_status);
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h +8 -0
@@ -324,6 +324,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_dp_transition(struct mod_hdcp *hdcp,/* log functions */ void mod_hdcp_dump_binary_message (uint8_t *msg,uint32_t msg_size,uint8_t *buf,uint32_t buf_size); +void mod_hdcp_log_ddc_trace (struct mod_hdcp *hdcp);/* TODO: add adjustment log */ /* psp functions */
@@ -494,6 +495,13 @@ static inline void set_watchdog_in_ms(struct mod_hdcp *hdcp, uint16_t time, output->watchdog_timer_delay = time; } +static inline void set_auth_complete (struct mod_hdcp *hdcp, +struct mod_hdcp_output *output) +{ + output->auth_complete =1 ; +mod_hdcp_log_ddc_trace (hdcp); +} +/* connection topology helpers */ static inline uint8_t is_display_active (struct mod_hdcp_display *display) {
drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_transition.c +4 -4
@@ -89,7 +89,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_transition(struct mod_hdcp *hdcp, }else {callback_in_ms (0 , output);set_state_id (hdcp, output,H1_A45_AUTHENTICATED ); -HDCP_FULL_DDC_TRACE (hdcp); +set_auth_complete (hdcp, output); }break ;case H1_A45_AUTHENTICATED :
@@ -137,7 +137,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_transition(struct mod_hdcp *hdcp, }callback_in_ms (0 , output);set_state_id (hdcp, output,H1_A45_AUTHENTICATED ); -HDCP_FULL_DDC_TRACE (hdcp); +set_auth_complete (hdcp, output);break ;default : status =MOD_HDCP_STATUS_INVALID_STATE ;
@@ -239,7 +239,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_dp_transition(struct mod_hdcp *hdcp,set_state_id (hdcp, output,D1_A6_WAIT_FOR_READY ); }else {set_state_id (hdcp, output,D1_A4_AUTHENTICATED ); -HDCP_FULL_DDC_TRACE (hdcp); +set_auth_complete (hdcp, output); }break ;case D1_A4_AUTHENTICATED :
@@ -311,7 +311,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_dp_transition(struct mod_hdcp *hdcp,break ; }set_state_id (hdcp, output,D1_A4_AUTHENTICATED ); -HDCP_FULL_DDC_TRACE (hdcp); +set_auth_complete (hdcp, output);break ;default :fail_and_restart_in_ms (0 , &status, output);
drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c +2 -2
@@ -242,7 +242,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_transition(struct mod_hdcp *hdcp, }callback_in_ms (0 , output);set_state_id (hdcp, output,H2_A5_AUTHENTICATED ); -HDCP_FULL_DDC_TRACE (hdcp); +set_auth_complete (hdcp, output);break ;case H2_A5_AUTHENTICATED : if (input->rxstatus_read == FAIL ||
@@ -559,7 +559,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_dp_transition(struct mod_hdcp *hdcp,break ; }set_state_id (hdcp, output,D2_A5_AUTHENTICATED ); -HDCP_FULL_DDC_TRACE (hdcp); +set_auth_complete (hdcp, output);break ;case D2_A5_AUTHENTICATED : if (input->rxstatus_read == FAIL ||
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c +74 -0
80 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.h +0 -72
78 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h +1 -0
@@ -225,6 +225,7 @@ struct mod_hdcp_output {uint8_t watchdog_timer_stop;uint16_t callback_delay;uint16_t watchdog_timer_delay; +uint8_t auth_complete; };/* used to represent per display info */
Signature · 1 line
2.25.1
PATCH 9/13 drm/amd/display: [FW Promotion] Release 0.0.78
In reply to Anson JacobFrom: Anthony Koo <[email protected]>
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +2 -2
@@ -47,10 +47,10 @@/* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0x6d13d5e2c +#define DMUB_FW_VERSION_GIT_HASH 0x9b7fa7783#define DMUB_FW_VERSION_MAJOR 0#define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 77 +#define DMUB_FW_VERSION_REVISION 78#define DMUB_FW_VERSION_TEST 0#define DMUB_FW_VERSION_VBIOS 0#define DMUB_FW_VERSION_HOTFIX 0
Signature · 1 line
2.25.1
PATCH 10/13 drm/amd/display: 3.2.148
In reply to Anson JacobFrom: Anthony Koo <[email protected]>
This version brings along following fixes:
- Fix memory allocation in dm IRQ context to use GFP_ATOMIC
- Increase timeout threshold for DMCUB reset
- Clear GPINT after DMCUB has reset
- Add AUX I2C tracing
- Fix code commenting style
- Some refactoring
- Remove invalid assert for ODM + MPC case
--- 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
@@ -45,7 +45,7 @@/* forward declaration */ struct aux_payload ; -#define DC_VER "3.2.147" +#define DC_VER "3.2.148"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.25.1
PATCH 11/13 drm/amd/display: Clear GPINT after DMCUB has reset
In reply to Anson JacobFrom: Nicholas Kazlauskas <[email protected]>
[Why]
Otherwise we can end up processing whatever was left in the register if the DMCUB was previously reset.
If DMCUB gets force reset too early from another client then we might not have even acked the disable yet - causing DMCUB instantly shutdown if the command was 10020000.
[How]
Move the GPINT clear outside of the reset loop and do it unconditionally after the DMCUB has been properly reset.
--- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c +4 -4
@@ -115,10 +115,6 @@ void dmub_dcn31_reset(struct dmub_srv *dmub)break ; } -/* Clear the GPINT command manually so we don't reset again. */ - cmd.all =0 ; - dmub->hw_funcs.set_gpint (dmub, cmd); -/* Force reset in case we timed out, DMCUB is likely hung. */ }
@@ -130,6 +126,10 @@ void dmub_dcn31_reset(struct dmub_srv *dmub)REG_WRITE (DMCUB_OUTBOX1_RPTR ,0 );REG_WRITE (DMCUB_OUTBOX1_WPTR ,0 );REG_WRITE (DMCUB_SCRATCH0 ,0 ); + +/* Clear the GPINT command manually so we don't send anything during boot. */ + cmd.all =0 ; + dmub->hw_funcs.set_gpint (dmub, cmd); }void dmub_dcn31_reset_release (struct dmub_srv *dmub)
Signature · 1 line
2.25.1
PATCH 12/13 drm/amd/display: Increase timeout threshold for DMCUB reset
In reply to Anson JacobFrom: Nicholas Kazlauskas <[email protected]>
[Why]
If we're backdoor loading the DMCUB performs more work than just the PHY reset so we can end up resetting before the cleanup has fully finished.
[How]
Increase timeout, add udelay between spins to guarantee a minimum.
--- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c +5 -5
@@ -83,7 +83,7 @@ static inline void dmub_dcn31_translate_addr(const union dmub_addr *addr_in,void dmub_dcn31_reset (struct dmub_srv *dmub) {union dmub_gpint_data_register cmd; -const uint32_t timeout =30 ; +const uint32_t timeout =100 ;uint32_t in_reset, scratch, i;REG_GET (DMCUB_CNTL2 ,DMCUB_SOFT_RESET , &in_reset);
@@ -98,21 +98,21 @@ void dmub_dcn31_reset(struct dmub_srv *dmub)/** * Timeout covers both the ACK and the wait * for remaining work to finish. -* -* This is mostly bound by the PHY disable sequence. -* Each register check will be greater than 1us, so -* don't bother using udelay. */ for (i =0 ; i < timeout; ++i) {if (dmub->hw_funcs.is_gpint_acked (dmub, cmd))break ; + +udelay (1 ); }for (i =0 ; i < timeout; ++i) { scratch = dmub->hw_funcs.get_gpint_response (dmub);if (scratch ==DMUB_GPINT__STOP_FW_RESPONSE )break ; + +udelay (1 ); }/* Force reset in case we timed out, DMCUB is likely hung. */
Signature · 1 line
2.25.1
PATCH 13/13 drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work
In reply to Anson JacobReplace GFP_KERNEL with GFP_ATOMIC as amdgpu_dm_irq_schedule_work can't sleep.
BUG: sleeping function called from invalid context at include/linux/sched/mm.h:196 in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 253, name: kworker/6:1H CPU: 6 PID: 253 Comm: kworker/6:1H Tainted: G W OE 5.11.0-promotion_2021_06_07-18_36_28_prelim_revert_retrain #8 Hardware name: System manufacturer System Product Name/PRIME X570-PRO, BIOS 3405 02/01/2021 Workqueue: events_highpri dm_irq_work_func [amdgpu] Call Trace: <IRQ> dump_stack+0x5e/0x74 ___might_sleep.cold+0x87/0x98 __might_sleep+0x4b/0x80 kmem_cache_alloc_trace+0x390/0x4f0 amdgpu_dm_irq_handler+0x171/0x230 [amdgpu] amdgpu_irq_dispatch+0xc0/0x1e0 [amdgpu] amdgpu_ih_process+0x81/0x100 [amdgpu] amdgpu_irq_handler+0x26/0xa0 [amdgpu] __handle_irq_event_percpu+0x49/0x190 ? __hrtimer_get_next_event+0x4d/0x80 handle_irq_event_percpu+0x33/0x80 handle_irq_event+0x33/0x60 handle_edge_irq+0x82/0x190 asm_call_irq_on_stack+0x12/0x20 </IRQ> common_interrupt+0xbb/0x140 asm_common_interrupt+0x1e/0x40 RIP: 0010:amdgpu_device_rreg.part.0+0x44/0xf0 [amdgpu] Code: 53 48 89 fb 4c 3b af c8 08 00 00 73 6d 83 e2 02 75 0d f6 87 40 62 01 00 10 0f 85 83 00 00 00 4c 03 ab d0 08 00 00 45 8b 6d 00 <8b> 05 3e b6 52 00 85 c0 7e 62 48 8b 43 08 0f b7 70 3e 65 8b 05 e3 RSP: 0018:ffffae7740fff9e8 EFLAGS: 00000286 RAX: ffffffffc05ee610 RBX: ffff8aaf8f620000 RCX: 0000000000000006 RDX: 0000000000000000 RSI: 0000000000005430 RDI: ffff8aaf8f620000 RBP: ffffae7740fffa08 R08: 0000000000000001 R09: 000000000000000a R10: 0000000000000001 R11: 0000000000000001 R12: 0000000000005430 R13: 0000000071000000 R14: 0000000000000001 R15: 0000000000005430 ? amdgpu_cgs_write_register+0x20/0x20 [amdgpu] amdgpu_device_rreg+0x17/0x20 [amdgpu] amdgpu_cgs_read_register+0x14/0x20 [amdgpu] dm_read_reg_func+0x38/0xb0 [amdgpu] generic_reg_wait+0x80/0x160 [amdgpu] dce_aux_transfer_raw+0x324/0x7c0 [amdgpu] dc_link_aux_transfer_raw+0x43/0x50 [amdgpu] dm_dp_aux_transfer+0x87/0x110 [amdgpu] drm_dp_dpcd_access+0x72/0x110 [drm_kms_helper] drm_dp_dpcd_read+0xb7/0xf0 [drm_kms_helper] drm_dp_get_one_sb_msg+0x349/0x480 [drm_kms_helper] drm_dp_mst_hpd_irq+0xc5/0xe40 [drm_kms_helper] ? drm_dp_mst_hpd_irq+0xc5/0xe40 [drm_kms_helper] dm_handle_hpd_rx_irq+0x184/0x1a0 [amdgpu] ? dm_handle_hpd_rx_irq+0x184/0x1a0 [amdgpu] handle_hpd_rx_irq+0x195/0x240 [amdgpu] ? __switch_to_asm+0x42/0x70 ? __switch_to+0x131/0x450 dm_irq_work_func+0x19/0x20 [amdgpu] process_one_work+0x209/0x400 worker_thread+0x4d/0x3e0 ? cancel_delayed_work+0xa0/0xa0 kthread+0x124/0x160 ? kthread_park+0x90/0x90 ret_from_fork+0x22/0x30
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1 -1
@@ -584,7 +584,7 @@ static void amdgpu_dm_irq_schedule_work(struct amdgpu_device *adev, handler_data = container_of(handler_list->next, struct amdgpu_dm_irq_handler_data, list);/*allocate a new amdgpu_dm_irq_handler_data*/ - handler_data_add =kzalloc (sizeof (*handler_data),GFP_KERNEL ); + handler_data_add =kzalloc (sizeof (*handler_data),GFP_ATOMIC );if (!handler_data_add) {DRM_ERROR ("DM_IRQ: failed to allocate irq handler!\n" );return ;
Signature · 1 line
2.25.1
[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)
AMD Ryzen 9 5900H, 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 3x 1080p 60hz on all systems.
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 Anson Jacob
Sent: August 6, 2021 12:35 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 <[email protected]>; [email protected]; R, Bindu <[email protected]>; Jacob, Anson <[email protected]>
Subject: [PATCH 00/13] DC Patches Aug 6, 2021
This DC patchset brings improvements in multiple areas. In summary, we highlight:
- Fix memory allocation in dm IRQ context to use GFP_ATOMIC
- Increase timeout threshold for DMCUB reset
- Clear GPINT after DMCUB has reset
- Add AUX I2C tracing
- Fix code commenting style
- Some refactoring
- Remove invalid assert for ODM + MPC case
Anson Jacob (1):
drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work
Anthony Koo (2):
drm/amd/display: [FW Promotion] Release 0.0.78
drm/amd/display: 3.2.148
Ashley Thomas (1):
drm/amd/display: Add AUX I2C tracing.
Eric Bernstein (1):
drm/amd/display: Remove invalid assert for ODM + MPC case
Nicholas Kazlauskas (2):
drm/amd/display: Clear GPINT after DMCUB has reset drm/amd/display: Increase timeout threshold for DMCUB reset
Roy Chan (5):
drm/amd/display: fix missing writeback disablement if plane is removed drm/amd/display: refactor the codes to centralize the stream/pipe
checking logic
drm/amd/display: refactor the cursor programing codes drm/amd/display: fix incorrect CM/TF programming sequence in dwb drm/amd/display: Correct comment style
Wenjing Liu (1):
drm/amd/display: add authentication_complete in hdcp output
.../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 62 ++++-- .../gpu/drm/amd/display/dc/core/dc_stream.c | 106 ++++++---- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 192 +++++++++++++++++- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 +- .../drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 90 +++++--- .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 1 - .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 6 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 18 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- .../gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 + .../display/modules/hdcp/hdcp1_transition.c | 8 +- .../display/modules/hdcp/hdcp2_transition.c | 4 +- .../drm/amd/display/modules/hdcp/hdcp_log.c | 74 +++++++ .../drm/amd/display/modules/hdcp/hdcp_log.h | 72 ------- .../drm/amd/display/modules/inc/mod_hdcp.h | 1 + 18 files changed, 479 insertions(+), 198 deletions(-)
Signature · 1 line
2.25.1