DC Patches Feb 28, 2019
cover DC Patches Feb 28, 2019
From: Leo Li <[email protected]>
Summary of change:
* Fix cursor-pageflip interactions on DCN1
* Expose plane alpha-blending support
Aric Cyr (1):
drm/amd/display: 3.2.21
Charlene Liu (1):
drm/amd/display: add HW i2c arbitration with dmcu
David Francis (1):
drm/amd/display: On DCN1, Wait for vupdate on cursor updates
Dmytro Laktyushkin (1):
drm/amd/display: clean up dml_init_instance
Eric Bernstein (2):
drm/amd/display: Free DCN version of stream encoder drm/amd/display: Rename is_hdmi to is_hdmi_tmds type
Josip Pavic (1):
drm/amd/display: reduce abm min reduction, deviation gain and contrast
factor
Jun Lei (2):
drm/amd/display: implement bounding box update based on uclk breakdown drm/amd/display: fix up reference clock abstractions
Ken Chalmers (1):
drm/amd/display: Increase DP blank timeout from 30 ms to 50 ms
Nicholas Kazlauskas (1):
drm/amd/display: Expose support for alpha blending on overlays
SivapiriyanKumarasamy (1):
drm/amd/display: Add PSR SMU Interrupt support
Wenjing Liu (2):
drm/amd/display: add pipe lock during stream update drm/amd/display: add i2c over aux failure handling
Yongqiang Sun (2):
drm/amd/display: Refactor reg_set and reg_update. drm/amd/display: Combine field toggle macro and sequence write macro.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 52 +++++++++++++++++++ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 26 +++++++++- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 31 ++++++++++++ drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 2 + drivers/gpu/drm/amd/display/dc/dc_helper.c | 52 +++++++++++++++---- drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 24 +++++---- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 7 ++- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 22 ++++---- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 ++++- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 ++- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 17 ++++--- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 5 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 +-- .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 +- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 - .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +--- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 4 +- drivers/gpu/drm/amd/display/dc/dm_services.h | 9 ++-- .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 58 ++-------------------- .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 5 +- .../amd/display/dc/dml/display_rq_dlg_helpers.c | 3 ++ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 ++- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 ++ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 ++ drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 12 ++--- drivers/gpu/drm/amd/display/include/signal_types.h | 5 ++ .../drm/amd/display/modules/power/power_helpers.c | 15 +++--- 33 files changed, 274 insertions(+), 148 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1551381588-14326-1-git-send-email-sunpeng.li-5C7GfCeVMHo@public.gmane.org
PATCH 1/16 drm/amd/display: clean up dml_init_instance
From: Dmytro Laktyushkin <[email protected]>
Get rid of DV style dml init in favour of the cleaner DC style.
--- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 58 ++-------------------- .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 3 ++ 5 files changed, 10 insertions(+), 58 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -1
@@ -1360,7 +1360,7 @@ static bool construct( goto fail; } -dml_init_instance (&dc->dml,DML_PROJECT_RAVEN1 ); +dml_init_instance (&dc->dml, &dcn1_0_soc, &dcn1_0_ip,DML_PROJECT_RAVEN1 );memcpy (dc->dcn_ip, &dcn10_ip_defaults,sizeof (dcn10_ip_defaults));memcpy (dc->dcn_soc, &dcn10_soc_defaults,sizeof (dcn10_soc_defaults));
drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c +4 -54
68 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h +1 -3
@@ -41,9 +41,7 @@ struct display_mode_lib {struct dal_logger *logger; }; -void dml_init_instance (struct display_mode_lib *lib,enum dml_project project); - -void dml_init_instance_v2 (struct display_mode_lib *lib, +void dml_init_instance (struct display_mode_lib *lib,const struct _vcs_dpi_soc_bounding_box_st *soc_bb,const struct _vcs_dpi_ip_params_st *ip_params,enum dml_project project);
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h +1 -0
@@ -416,6 +416,7 @@ struct _vcs_dpi_display_dlg_regs_st {unsigned int refcyc_per_vm_group_flip;unsigned int refcyc_per_vm_req_vblank;unsigned int refcyc_per_vm_req_flip; +unsigned int refcyc_per_vm_dmdata; };struct _vcs_dpi_display_ttu_regs_st {
drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c +3 -0
@@ -321,6 +321,9 @@ void print__dlg_regs_st(struct display_mode_lib *mode_lib, display_dlg_regs_st ddml_print ("DML_RQ_DLG_CALC: xfc_reg_remote_surface_flip_latency = 0x%0x\n" , dlg_regs.xfc_reg_remote_surface_flip_latency); +dml_print ( +"DML_RQ_DLG_CALC: refcyc_per_vm_dmdata = 0x%0x\n" , + dlg_regs.refcyc_per_vm_dmdata);dml_print ("DML_RQ_DLG_CALC: =====================================\n" ); }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/16 drm/amd/display: Free DCN version of stream encoder
In reply to a message not in the archiveFrom: Eric Bernstein <[email protected]>
Cross a TODO item off the list. Cleanup SIGNAL_TYPE_HDMI_FRL, it's not currently supported.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 8 +------- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + 3 files changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +1 -0
@@ -260,6 +260,7 @@ bool resource_construct( pool->stream_enc_count++; } } + dc->caps.dynamic_audio = false;if (pool->audio_count < pool->stream_enc_count) { dc->caps.dynamic_audio = true;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -7
@@ -874,10 +874,7 @@ static void destruct(struct dcn10_resource_pool *pool)for (i =0 ; i < pool->base.stream_enc_count; i++) {if (pool->base.stream_enc[i] !=NULL ) { -/* TODO: free dcn version of stream encoder once implemented -* rather than using virtual stream encoder -*/ -kfree (pool->base.stream_enc[i]); +kfree (DCN10STRENC_FROM_STRENC (pool->base.stream_enc[i])); pool->base.stream_enc[i] =NULL ; } }
@@ -930,9 +927,6 @@ static void destruct(struct dcn10_resource_pool *pool) } } -for (i =0 ; i < pool->base.stream_enc_count; i++) -kfree (pool->base.stream_enc[i]); -for (i =0 ; i < pool->base.audio_count; i++) {if (pool->base.audios[i])dce_aud_destroy (&pool->base.audios[i]);
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -0
@@ -154,6 +154,7 @@ struct resource_pool {unsigned int pipe_count;unsigned int underlay_pipe_index;unsigned int stream_enc_count; +unsigned int ref_clock_inKhz;unsigned int timing_generator_count;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/16 drm/amd/display: Refactor reg_set and reg_update.
In reply to a message not in the archiveFrom: Yongqiang Sun <[email protected]>
[Why]
Current reg update and reg set use same functions and only delta is update reads reg value and call update function.
[How]
Refactor reg update and reg set functions. 1.Implement different functions for reg update and reg set. 2.Wrap same process to a help function, both reg update and reg set will call it.
--- drivers/gpu/drm/amd/display/dc/dc_helper.c | 52 ++++++++++++++++++---- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 - drivers/gpu/drm/amd/display/dc/dm_services.h | 9 ++-- drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 3 +- 4 files changed, 50 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_helper.c +43 -9
@@ -51,20 +51,16 @@ static inline void set_reg_field_value_masks( field_value_mask->mask = field_value_mask->mask | mask; } -uint32_t generic_reg_update_ex (const struct dc_context *ctx, -uint32_t addr,uint32_t reg_val,int n, +static void set_reg_field_values (struct dc_reg_value_masks *field_value_mask, +uint32_t addr,int n,uint8_t shift1,uint32_t mask1,uint32_t field_value1, - ...) +va_list ap) { -struct dc_reg_value_masks field_value_mask = {0 };uint32_t shift, mask, field_value;int i =1 ; -va_list ap; -va_start (ap, field_value1); -/* gather all bits value/mask getting updated in this register */ -set_reg_field_value_masks (&field_value_mask, +set_reg_field_value_masks (field_value_mask, field_value1, mask1, shift1);while (i < n) {
@@ -72,10 +68,48 @@ uint32_t generic_reg_update_ex(const struct dc_context *ctx, mask =va_arg (ap, uint32_t); field_value =va_arg (ap, uint32_t); -set_reg_field_value_masks (&field_value_mask, +set_reg_field_value_masks (field_value_mask, field_value, mask, shift); i++; } +} + +uint32_t generic_reg_update_ex (const struct dc_context *ctx, +uint32_t addr,int n, +uint8_t shift1,uint32_t mask1,uint32_t field_value1, + ...) +{ +struct dc_reg_value_masks field_value_mask = {0 }; +uint32_t reg_val; +va_list ap; + +va_start (ap, field_value1); + +set_reg_field_values (&field_value_mask, addr, n, shift1, mask1, + field_value1, ap); + +va_end (ap); + +/* mmio write directly */ + reg_val =dm_read_reg (ctx, addr); + reg_val = (reg_val & ~field_value_mask.mask) | field_value_mask.value; +dm_write_reg (ctx, addr, reg_val); +return reg_val; +} + +uint32_t generic_reg_set_ex (const struct dc_context *ctx, +uint32_t addr,uint32_t reg_val,int n, +uint8_t shift1,uint32_t mask1,uint32_t field_value1, + ...) +{ +struct dc_reg_value_masks field_value_mask = {0 }; +va_list ap; + +va_start (ap, field_value1); + +set_reg_field_values (&field_value_mask, addr, n, shift1, mask1, + field_value1, ap); +va_end (ap);
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +0 -2
@@ -1304,7 +1304,6 @@ void dcn10_link_encoder_connect_dig_be_to_fe(#define HPD_REG_UPDATE_N (reg_name, n, ...) \ generic_reg_update_ex(CTX, \ HPD_REG(reg_name), \ - HPD_REG_READ(reg_name), \ n, __VA_ARGS__)#define HPD_REG_UPDATE (reg_name, field, val) \
@@ -1337,7 +1336,6 @@ void dcn10_link_encoder_disable_hpd(struct link_encoder *enc)#define AUX_REG_UPDATE_N (reg_name, n, ...) \ generic_reg_update_ex(CTX, \ AUX_REG(reg_name), \ - AUX_REG_READ(reg_name), \ n, __VA_ARGS__)#define AUX_REG_UPDATE (reg_name, field, val) \
drivers/gpu/drm/amd/display/dc/dm_services.h +6 -3
@@ -144,10 +144,14 @@ static inline uint32_t set_reg_field_value_ex( reg_name ## __ ## reg_field ## _MASK,\ reg_name ## __ ## reg_field ## __SHIFT) -uint32_t generic_reg_update_ex (const struct dc_context *ctx, +uint32_t generic_reg_set_ex (const struct dc_context *ctx,uint32_t addr,uint32_t reg_val,int n,uint8_t shift1,uint32_t mask1,uint32_t field_value1, ...); +uint32_t generic_reg_update_ex (const struct dc_context *ctx, +uint32_t addr,int n, +uint8_t shift1,uint32_t mask1,uint32_t field_value1, ...); +#define FD (reg_field) reg_field ## __SHIFT, \ reg_field ## _MASK
@@ -172,11 +176,10 @@ unsigned int generic_reg_wait(const struct dc_context *ctx,#define generic_reg_update_soc15 (ctx, inst_offset, reg_name, n, ...)\ generic_reg_update_ex(ctx, DCE_BASE.instance[0].segment[mm##reg_name##_BASE_IDX] + mm##reg_name + inst_offset, \ - dm_read_reg_func(ctx, mm##reg_name + DCE_BASE.instance[0].segment[mm##reg_name##_BASE_IDX] + inst_offset, __func__), \ n, __VA_ARGS__)#define generic_reg_set_soc15 (ctx, inst_offset, reg_name, n, ...)\ - generic_reg_update_ex(ctx, DCE_BASE.instance[0].segment[mm##reg_name##_BASE_IDX] + mm##reg_name + inst_offset, 0, \ + generic_reg_set_ex(ctx, DCE_BASE.instance[0].segment[mm##reg_name##_BASE_IDX] + mm##reg_name + inst_offset, 0, \ n, __VA_ARGS__)#define get_reg_field_value_soc15 (reg_value, block, reg_num, reg_name, reg_field)\
drivers/gpu/drm/amd/display/dc/inc/reg_helper.h +1 -2
@@ -52,7 +52,7 @@/* macro to set register fields. */ #define REG_SET_N (reg_name, n, initial_val, ...) \ - generic_reg_update_ex(CTX, \ + generic_reg_set_ex(CTX, \ REG(reg_name), \ initial_val, \ n, __VA_ARGS__)
@@ -225,7 +225,6 @@#define REG_UPDATE_N (reg_name, n, ...) \ generic_reg_update_ex(CTX, \ REG(reg_name), \ - REG_READ(reg_name), \ n, __VA_ARGS__)#define REG_UPDATE (reg_name, field, val) \
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/16 drm/amd/display: Add PSR SMU Interrupt support
In reply to a message not in the archiveFrom: SivapiriyanKumarasamy <[email protected]>
[WHY]
We have new bios capabilities enabling s0i2 entry on SMU interrupt. We want this interrupt to be fired on PSR transitions such that we enter s0i2 when entering PSR active.
[HOW]
Add code to send the SMU interrupt with the appropriate staticscreen flag when entering and exting PSR. Protect this code with a config flag since it currently impacts BL PWM.
--- drivers/gpu/drm/amd/display/dc/dc_types.h | 3 ++- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 7 +++---- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_types.h +2 -1
@@ -550,9 +550,9 @@ struct psr_config {unsigned char psr_version;unsigned int psr_rfb_setup_time;bool psr_exit_link_training_required; -bool psr_frame_capture_indication_req;unsigned int psr_sdp_transmit_line_num_deadline; +bool allow_smu_optimizations; };union dmcu_psr_level {
@@ -654,6 +654,7 @@ struct psr_context {* continuing powerd own */ unsigned int frame_delay; +bool allow_smu_optimizations; };struct colorspace_transform {
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +3 -4
@@ -213,9 +213,6 @@ static bool dce_dmcu_setup_psr(struct dmcu *dmcu, link->link_enc->funcs->psr_program_secondary_packet (link->link_enc, psr_context->sdpTransmitLineNumDeadline); -if (psr_context->psr_level.bits.SKIP_SMU_NOTIFICATION) -REG_UPDATE (SMU_INTERRUPT_CONTROL ,DC_SMU_INT_ENABLE ,1 ); -/* waitDMCUReadyForCmd */ REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 0, dmcu_wait_reg_ready_interval,
@@ -594,7 +591,7 @@ static bool dcn10_dmcu_setup_psr(struct dmcu *dmcu, link->link_enc->funcs->psr_program_secondary_packet (link->link_enc, psr_context->sdpTransmitLineNumDeadline); -if (psr_context->psr_level.bits.SKIP_SMU_NOTIFICATION) +if (psr_context->allow_smu_optimizations)REG_UPDATE (SMU_INTERRUPT_CONTROL ,DC_SMU_INT_ENABLE ,1 );/* waitDMCUReadyForCmd */
@@ -615,6 +612,7 @@ static bool dcn10_dmcu_setup_psr(struct dmcu *dmcu, psr_context->psrFrameCaptureIndicationReq; masterCmdData1.bits.aux_chan = psr_context->channel; masterCmdData1.bits.aux_repeat = psr_context->aux_repeats; + masterCmdData1.bits.allow_smu_optimizations = psr_context->allow_smu_optimizations;dm_write_reg (dmcu->ctx,REG (MASTER_COMM_DATA_REG1 ), masterCmdData1.u32All);
@@ -635,6 +633,7 @@ static bool dcn10_dmcu_setup_psr(struct dmcu *dmcu,dm_write_reg (dmcu->ctx,REG (MASTER_COMM_DATA_REG3 ), masterCmdData3.u32All); +/* setDMCUParam_Cmd */ REG_UPDATE (MASTER_COMM_CMD_REG ,MASTER_COMM_CMD_REG_BYTE0 ,PSR_SET );
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h +11 -11
@@ -199,16 +199,16 @@ struct dce_dmcu {******************************************************************/ union dce_dmcu_psr_config_data_reg1 {struct { -unsigned int timehyst_frames:8 ;/*[7:0]*/ -unsigned int hyst_lines:7 ;/*[14:8]*/ -unsigned int rfb_update_auto_en:1 ;/*[15:15]*/ -unsigned int dp_port_num:3 ;/*[18:16]*/ -unsigned int dcp_sel:3 ;/*[21:19]*/ -unsigned int phy_type:1 ;/*[22:22]*/ -unsigned int frame_cap_ind:1 ;/*[23:23]*/ -unsigned int aux_chan:3 ;/*[26:24]*/ -unsigned int aux_repeat:4 ;/*[30:27]*/ -unsigned int reserved:1 ;/*[31:31]*/ +unsigned int timehyst_frames:8 ;/*[7:0]*/ +unsigned int hyst_lines:7 ;/*[14:8]*/ +unsigned int rfb_update_auto_en:1 ;/*[15:15]*/ +unsigned int dp_port_num:3 ;/*[18:16]*/ +unsigned int dcp_sel:3 ;/*[21:19]*/ +unsigned int phy_type:1 ;/*[22:22]*/ +unsigned int frame_cap_ind:1 ;/*[23:23]*/ +unsigned int aux_chan:3 ;/*[26:24]*/ +unsigned int aux_repeat:4 ;/*[30:27]*/ +unsigned int allow_smu_optimizations:1 ;/*[31:31]*/ } bits;unsigned int u32All; };
@@ -236,7 +236,7 @@ union dce_dmcu_psr_config_data_reg3 {struct {unsigned int psr_level:16 ;/*[15:0]*/ unsigned int link_rate:4 ;/*[19:16]*/ -unsigned int reserved:12 ;/*[31:20]*/ +unsigned int reserved:12 ;/*[31:20]*/ } bits;unsigned int u32All; };
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/16 drm/amd/display: Combine field toggle macro and sequence write macro.
In reply to a message not in the archiveFrom: Yongqiang Sun <[email protected]>
[Why]
field toggle write is actual field sequence write with the same field name.
[How]
Use REG_UPDATE_SEQ_2 for both sequence write and toggle. Rename REG_UPDATE_1by1_3 to REG_UPDATE_SEQ_3.
--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 22 +++++++++++----------- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 5 +++-- drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 9 ++------- 3 files changed, 16 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +11 -11
@@ -171,24 +171,24 @@ static void submit_channel_request( (request->action == I2CAUX_TRANSACTION_ACTION_I2C_WRITE_MOT)));if (REG (AUXN_IMPCAL )) {/* clear_aux_error */ -REG_UPDATE_SEQ (AUXN_IMPCAL ,AUXN_CALOUT_ERROR_AK , -1 , -0 ); +REG_UPDATE_SEQ_2 (AUXN_IMPCAL , +AUXN_CALOUT_ERROR_AK ,1 , +AUXN_CALOUT_ERROR_AK ,0 ); -REG_UPDATE_SEQ (AUXP_IMPCAL ,AUXP_CALOUT_ERROR_AK , -1 , -0 ); +REG_UPDATE_SEQ_2 (AUXP_IMPCAL , +AUXP_CALOUT_ERROR_AK ,1 , +AUXP_CALOUT_ERROR_AK ,0 );/* force_default_calibrate */ -REG_UPDATE_1BY1_2 (AUXN_IMPCAL , +REG_UPDATE_SEQ_2 (AUXN_IMPCAL ,AUXN_IMPCAL_ENABLE ,1 ,AUXN_IMPCAL_OVERRIDE_ENABLE ,0 );/* bug? why AUXN update EN and OVERRIDE_EN 1 by 1 while AUX P toggles OVERRIDE? */ -REG_UPDATE_SEQ (AUXP_IMPCAL ,AUXP_IMPCAL_OVERRIDE_ENABLE , -1 , -0 ); +REG_UPDATE_SEQ_2 (AUXP_IMPCAL , +AUXP_IMPCAL_OVERRIDE_ENABLE ,1 , +AUXP_IMPCAL_OVERRIDE_ENABLE ,0 ); }/* set the delay and the number of bytes to write */
@@ -267,7 +267,7 @@ static int read_channel_reply(struct dce_aux *engine, uint32_t size,if (!bytes_replied)return -1 ; -REG_UPDATE_1BY1_3 (AUX_SW_DATA , +REG_UPDATE_SEQ_3 (AUX_SW_DATA ,AUX_SW_INDEX ,0 ,AUX_SW_AUTOINCREMENT_DISABLE ,1 ,AUX_SW_DATA_RW ,1 );
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +3 -2
@@ -258,8 +258,9 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub) {struct dcn10_hubbub *hubbub1 =TO_DCN10_HUBBUB (hubbub); -REG_UPDATE_SEQ (DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL , -DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST ,0 ,1 ); +REG_UPDATE_SEQ_2 (DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL , +DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST ,0 , +DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST ,1 ); } void hubbub1_program_watermarks(
drivers/gpu/drm/amd/display/dc/inc/reg_helper.h +2 -7
@@ -379,16 +379,11 @@/* macro to update a register field to specified values in given sequences. * useful when toggling bits */ -#define REG_UPDATE_SEQ (reg, field, value1, value2) \ -{ uint32_t val = REG_UPDATE(reg, field, value1); \ - REG_SET(reg, val, field, value2); } - -/* macro to update fields in register 1 field at a time in given order */ -#define REG_UPDATE_1BY1_2 (reg, f1, v1, f2, v2) \ +#define REG_UPDATE_SEQ_2 (reg, f1, v1, f2, v2) \ { uint32_t val = REG_UPDATE(reg, f1, v1); \ REG_SET(reg, val, f2, v2); } -#define REG_UPDATE_1BY1_3 (reg, f1, v1, f2, v2, f3, v3) \ +#define REG_UPDATE_SEQ_3 (reg, f1, v1, f2, v2, f3, v3) \ { uint32_t val = REG_UPDATE(reg, f1, v1); \ val = REG_SET(reg, val, f2, v2); \ REG_SET(reg, val, f3, v3); }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/16 drm/amd/display: Increase DP blank timeout from 30 ms to 50 ms
In reply to a message not in the archiveFrom: Ken Chalmers <[email protected]>
[Why]
At 24 Hz, a frame is 41.7 ms, so a 30 ms wait can (and does often) timeout.
[How]
Bump timeout from 30 ms to 50 ms.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +2 -2
@@ -797,10 +797,10 @@ void enc1_stream_encoder_dp_blank(*/ REG_UPDATE (DP_VID_STREAM_CNTL ,DP_VID_STREAM_DIS_DEFER ,2 );/* Larger delay to wait until VBLANK - use max retry of -* 10us*3000=30ms. This covers 16.6ms of typical 60 Hz mode + +* 10us*5000=50ms. This covers 41.7ms of minimum 24 Hz mode + * a little more because we may not trust delay accuracy. */ - max_retries =DP_BLANK_MAX_RETRY *150 ; + max_retries =DP_BLANK_MAX_RETRY *250 ;/* disable DP stream */ REG_UPDATE (DP_VID_STREAM_CNTL ,DP_VID_STREAM_ENABLE ,0 );
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/16 drm/amd/display: add pipe lock during stream update
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[why]
Stream update will adjust both info packets and stream params, need to make sure all things are applied togather.
[how]
add pipe lock during stream update
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +2 -0
@@ -1672,6 +1672,7 @@ static void commit_planes_do_stream_update(struct dc *dc,continue ;if (stream_update->dpms_off) { + dc->hwss.pipe_control_lock (dc, pipe_ctx, true);if (*stream_update->dpms_off) {core_link_disable_stream (pipe_ctx,KEEP_ACQUIRED_RESOURCE ); dc->hwss.optimize_bandwidth (dc, dc->current_state);
@@ -1679,6 +1680,7 @@ static void commit_planes_do_stream_update(struct dc *dc, dc->hwss.prepare_bandwidth (dc, dc->current_state);core_link_enable_stream (dc->current_state, pipe_ctx); } + dc->hwss.pipe_control_lock (dc, pipe_ctx, false); }if (stream_update->abm_level && pipe_ctx->stream_res.abm) {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/16 drm/amd/display: Rename is_hdmi to is_hdmi_tmds type
In reply to a message not in the archiveFrom: Eric Bernstein <[email protected]>
HDMI has TMDS and FRL signal types. Be specific about what is used.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- .../gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 15 ++++++++------- drivers/gpu/drm/amd/display/include/signal_types.h | 5 +++++ 3 files changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -2579,7 +2579,7 @@ void core_link_enable_stream( &stream->timing, stream->output_color_space); -if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) +if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal)) pipe_ctx->stream_res.stream_enc->funcs->hdmi_set_stream_attribute( pipe_ctx->stream_res.stream_enc, &stream->timing,
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +8 -7
@@ -616,7 +616,7 @@ dce110_set_output_transfer_func(struct pipe_ctx *pipe_ctx,void dce110_update_info_frame (struct pipe_ctx *pipe_ctx) { -bool is_hdmi; +bool is_hdmi_tmds;bool is_dp;ASSERT (pipe_ctx->stream);
@@ -624,13 +624,13 @@ void dce110_update_info_frame(struct pipe_ctx *pipe_ctx)if (pipe_ctx->stream_res.stream_enc ==NULL )return ;/* this is not root pipe */ - is_hdmi =dc_is_hdmi_signal (pipe_ctx->stream->signal); + is_hdmi_tmds =dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal); is_dp =dc_is_dp_signal (pipe_ctx->stream->signal); -if (!is_hdmi && !is_dp) +if (!is_hdmi_tmds && !is_dp)return ; -if (is_hdmi) +if (is_hdmi_tmds) pipe_ctx->stream_res.stream_enc->funcs->update_hdmi_info_packets ( pipe_ctx->stream_res.stream_enc, &pipe_ctx->stream_res.encoder_info_frame);
@@ -974,8 +974,9 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx)set_pme_wa_enable_by_version (core_dc);/* un-mute audio */ /* TODO: audio should be per stream rather than per link */ - pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control ( - pipe_ctx->stream_res.stream_enc, false); +if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal)) + pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control ( + pipe_ctx->stream_res.stream_enc, false); } }
@@ -1026,7 +1027,7 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option)struct dc_link *link = stream->link;struct dc *dc = pipe_ctx->stream->ctx->dc; -if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) +if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal)) pipe_ctx->stream_res.stream_enc->funcs->stop_hdmi_info_packets ( pipe_ctx->stream_res.stream_enc);
drivers/gpu/drm/amd/display/include/signal_types.h +5 -0
@@ -45,6 +45,11 @@ enum signal_type { };/* help functions for signal types manipulation */ +static inline bool dc_is_hdmi_tmds_signal (enum signal_type signal) +{ +return (signal ==SIGNAL_TYPE_HDMI_TYPE_A ); +} +static inline bool dc_is_hdmi_signal (enum signal_type signal) {return (signal ==SIGNAL_TYPE_HDMI_TYPE_A );
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/16 drm/amd/display: reduce abm min reduction, deviation gain and contrast factor
In reply to a message not in the archiveFrom: Josip Pavic <[email protected]>
[Why]
Increased power savings are desired for ABM 2.2.
[How]
Reduce the minimum reduction level, the deviation gain and the contrast factor to allow for more aggressive operation of the algorithm.
--- drivers/gpu/drm/amd/display/modules/power/power_helpers.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +9 -6
@@ -41,9 +41,12 @@ static const unsigned char min_reduction_table[13] = {static const unsigned char max_reduction_table[13 ] = {0xf5 ,0xe5 ,0xd9 ,0xcd ,0xb1 ,0xa5 ,0xa5 ,0x80 ,0x65 ,0x4d ,0x4d ,0x4d ,0x32 }; -/* ABM 2.2 Min Reduction effectively disabled (100% for all configs)*/ +/* Possible ABM 2.2 Min Reduction configs from least aggressive to most aggressive +* 0 1 2 3 4 5 6 7 8 9 10 11 12 +* 100 100 100 100 100 100 100 90.2 85.1 80.0 80.0 75.3 75.3 % +*/ static const unsigned char min_reduction_table_v_2_2[13 ] = { -0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; +0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xe6 ,0xd9 ,0xcc ,0xcc ,0xc0 ,0xc0 };/* Possible ABM 2.2 Max Reduction configs from least aggressive to most aggressive * 0 1 2 3 4 5 6 7 8 9 10 11 12
@@ -408,9 +411,9 @@ void fill_iram_v_2_2(struct iram_table_v_2_2 *ram_table, struct dmcu_iram_parame ram_table->flags =0x0 ; ram_table->deviation_gain[0 ] =0xb3 ; - ram_table->deviation_gain[1 ] =0xb3 ; - ram_table->deviation_gain[2 ] =0xb3 ; - ram_table->deviation_gain[3 ] =0xb3 ; + ram_table->deviation_gain[1 ] =0xa8 ; + ram_table->deviation_gain[2 ] =0x98 ; + ram_table->deviation_gain[3 ] =0x68 ; ram_table->min_reduction[0 ][0 ] = min_reduction_table_v_2_2[abm_config[set][0 ]]; ram_table->min_reduction[1 ][0 ] = min_reduction_table_v_2_2[abm_config[set][0 ]];
@@ -505,7 +508,7 @@ void fill_iram_v_2_2(struct iram_table_v_2_2 *ram_table, struct dmcu_iram_parame ram_table->contrastFactor[0 ] =0x99 ; ram_table->contrastFactor[1 ] =0x99 ; - ram_table->contrastFactor[2 ] =0x99 ; + ram_table->contrastFactor[2 ] =0x90 ; ram_table->contrastFactor[3 ] =0x80 ; ram_table->iir_curve[0 ] =0x65 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/16 drm/amd/display: 3.2.21
In reply to a message not in the archiveFrom: Aric Cyr <[email protected]>
--- 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
@@ -39,7 +39,7 @@#include "inc/hw/dmcu.h" #include "dml/display_mode_lib.h" -#define DC_VER "3.2.20" +#define DC_VER "3.2.21"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/16 drm/amd/display: implement bounding box update based on uclk breakdown
In reply to a message not in the archiveFrom: Jun Lei <[email protected]>
[why]
Actual breakdown of DPM level varies by SKU (for the same family) DC needs some ability to ammend pre-silicon numbers
--- drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h +3 -1
@@ -25,6 +25,8 @@#ifndef __DISPLAY_MODE_STRUCTS_H__#define __DISPLAY_MODE_STRUCTS_H__ +#define MAX_CLOCK_LIMIT_STATES 8 +typedef struct _vcs_dpi_voltage_scaling_st voltage_scaling_st ;typedef struct _vcs_dpi_soc_bounding_box_st soc_bounding_box_st ;typedef struct _vcs_dpi_ip_params_st ip_params_st ;
@@ -103,7 +105,7 @@ struct _vcs_dpi_soc_bounding_box_st {double xfc_xbuf_latency_tolerance_us;int use_urgent_burst_bw;unsigned int num_states; -struct _vcs_dpi_voltage_scaling_st clock_limits[8 ]; +struct _vcs_dpi_voltage_scaling_st clock_limits[MAX_CLOCK_LIMIT_STATES ]; };struct _vcs_dpi_ip_params_st {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/16 drm/amd/display: add HW i2c arbitration with dmcu
In reply to a message not in the archiveFrom: Charlene Liu <[email protected]>
--- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 +++++++++++- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 ++++++-- 2 files changed, 17 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c +11 -1
@@ -346,6 +346,16 @@ static void release_engine( } +static bool is_engine_available (struct dce_i2c_hw *dce_i2c_hw) +{ +unsigned int arbitrate; + +REG_GET (DC_I2C_ARBITRATION ,DC_I2C_REG_RW_CNTL_STATUS , &arbitrate); +if (arbitrate ==DC_I2C_REG_RW_CNTL_STATUS_DMCU_ONLY ) +return false; +return true; +} +struct dce_i2c_hw *acquire_i2c_hw_engine (struct resource_pool *pool,struct ddc *ddc)
@@ -368,7 +378,7 @@ struct dce_i2c_hw *acquire_i2c_hw_engine(if (!dce_i2c_hw)return NULL ; -if (pool->i2c_hw_buffer_in_use) +if (pool->i2c_hw_buffer_in_use || !is_engine_available (dce_i2c_hw))return NULL ; do {
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h +6 -2
@@ -29,7 +29,8 @@enum dc_i2c_status {DC_I2C_STATUS__DC_I2C_STATUS_IDLE ,DC_I2C_STATUS__DC_I2C_STATUS_USED_BY_SW , -DC_I2C_STATUS__DC_I2C_STATUS_USED_BY_HW +DC_I2C_STATUS__DC_I2C_STATUS_USED_BY_HW , +DC_I2C_REG_RW_CNTL_STATUS_DMCU_ONLY =2 , };enum dc_i2c_arbitration {
@@ -129,7 +130,8 @@ enum {I2C_SF (DC_I2C_DATA ,DC_I2C_DATA , mask_sh),\I2C_SF (DC_I2C_DATA ,DC_I2C_INDEX , mask_sh),\I2C_SF (DC_I2C_DATA ,DC_I2C_INDEX_WRITE , mask_sh),\ - I2C_SF(MICROSECOND_TIME_BASE_DIV, XTAL_REF_DIV, mask_sh) +I2C_SF (MICROSECOND_TIME_BASE_DIV ,XTAL_REF_DIV , mask_sh),\ + I2C_SF(DC_I2C_ARBITRATION, DC_I2C_REG_RW_CNTL_STATUS, mask_sh)#define I2C_COMMON_MASK_SH_LIST_DCE110 (mask_sh)\ I2C_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh),\
@@ -170,6 +172,7 @@ struct dce_i2c_shift {uint8_t DC_I2C_INDEX ;uint8_t DC_I2C_INDEX_WRITE ;uint8_t XTAL_REF_DIV ; +uint8_t DC_I2C_REG_RW_CNTL_STATUS ; };struct dce_i2c_mask {
@@ -207,6 +210,7 @@ struct dce_i2c_mask {uint32_t DC_I2C_INDEX ;uint32_t DC_I2C_INDEX_WRITE ;uint32_t XTAL_REF_DIV ; +uint32_t DC_I2C_REG_RW_CNTL_STATUS ; };struct dce_i2c_registers {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/16 drm/amd/display: Expose support for alpha blending on overlays
In reply to a message not in the archiveFrom: Nicholas Kazlauskas <[email protected]>
[Why]
The DRM overlay planes DM exposes support RGBA formats but are currently forced as fully opaque over whatever they overlay.
[How]
Expose DRM blending mode and alpha properties to userspace.
The overlays exposed support per-pixel pre-multiplied alpha along with global plane opacity.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 52 +++++++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +52 -0
@@ -2627,6 +2627,42 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev, } +static void +fill_blending_from_plane_state (struct drm_plane_state *plane_state, +const struct dc_plane_state *dc_plane_state, +bool *per_pixel_alpha,bool *global_alpha, +int *global_alpha_value) +{ + *per_pixel_alpha = false; + *global_alpha = false; + *global_alpha_value =0xff ; + +if (plane_state->plane->type !=DRM_PLANE_TYPE_OVERLAY ) +return ; + +if (plane_state->pixel_blend_mode ==DRM_MODE_BLEND_PREMULTI ) { +static const uint32_t alpha_formats[] = { +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_ABGR8888 , + }; +uint32_t format = plane_state->fb->format->format; +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (alpha_formats); ++i) { +if (format == alpha_formats[i]) { + *per_pixel_alpha = true; +break ; + } + } + } + +if (plane_state->alpha <0xffff ) { + *global_alpha = true; + *global_alpha_value = plane_state->alpha >>8 ; + } +} + static int fill_plane_attributes(struct amdgpu_device *adev, struct dc_plane_state *dc_plane_state, struct drm_plane_state *plane_state,
@@ -2658,6 +2694,11 @@ static int fill_plane_attributes(struct amdgpu_device *adev, dc_plane_state->in_transfer_func =NULL ; } +fill_blending_from_plane_state (plane_state, dc_plane_state, + &dc_plane_state->per_pixel_alpha, + &dc_plane_state->global_alpha, + &dc_plane_state->global_alpha_value); +return ret; }
@@ -3987,6 +4028,15 @@ static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,break ; } +/* TODO: Check DC plane caps explicitly here for adding propertes */ +if (plane->type ==DRM_PLANE_TYPE_OVERLAY ) { +unsigned int blend_caps =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ); + +drm_plane_create_alpha_property (plane); +drm_plane_create_blend_mode_property (plane, blend_caps); + } +drm_plane_helper_add (plane, &dm_plane_helper_funcs);/* Create (reset) the plane state */
@@ -4851,6 +4901,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, bundle->plane_infos[planes_count].stereo_format = dc_plane->stereo_format; bundle->plane_infos[planes_count].tiling_info = dc_plane->tiling_info; bundle->plane_infos[planes_count].visible = dc_plane->visible; + bundle->plane_infos[planes_count].global_alpha = dc_plane->global_alpha; + bundle->plane_infos[planes_count].global_alpha_value = dc_plane->global_alpha_value; bundle->plane_infos[planes_count].per_pixel_alpha = dc_plane->per_pixel_alpha; bundle->plane_infos[planes_count].dcc = dc_plane->dcc; bundle->surface_updates[planes_count].plane_info = &bundle->plane_infos[planes_count];
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/16 drm/amd/display: fix up reference clock abstractions
In reply to a message not in the archiveFrom: Jun Lei <[email protected]>
[why]
"reference clock" is a very overloaded variable in DC and causes confusion as there are multiple sources of reference clock, which may be different values incorrect input values to DML will cause DCHUB to be programmed improperly and lead to hard to debug underflow issues
[how]
instead of using ref clock everywhere, specify WHICH ref clock:
- xtalin
- dccg refclk
- dchub refclk
these are all distinct values which may not be equal
--- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 25 +++++++++++++++++++++- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 +++---- .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 ++-- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +++++- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +++ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 ++++ 8 files changed, 44 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +1 -1
@@ -466,7 +466,7 @@ static void dcn_bw_calc_rq_dlg_ttu( input.clks_cfg.dcfclk_mhz = v->dcfclk; input.clks_cfg.dispclk_mhz = v->dispclk; input.clks_cfg.dppclk_mhz = v->dppclk; - input.clks_cfg.refclk_mhz = dc->res_pool->ref_clock_inKhz /1000.0 ; + input.clks_cfg.refclk_mhz = dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000.0 ; input.clks_cfg.socclk_mhz = v->socclk; input.clks_cfg.voltage = v->voltage_level;// dc->dml.logger = pool->base.logger;
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +24 -1
@@ -31,6 +31,8 @@#include "opp.h" #include "timing_generator.h" #include "transform.h" +#include "dccg.h" +#include "dchubbub.h" #include "dpp.h" #include "core_types.h" #include "set_mode_types.h"
@@ -163,7 +165,28 @@ struct resource_pool *dc_create_resource_pool(if (dc->ctx->dc_bios->funcs->get_firmware_info ( dc->ctx->dc_bios, &fw_info) ==BP_RESULT_OK ) { - res_pool->ref_clock_inKhz = fw_info.pll_info.crystal_frequency; + res_pool->ref_clocks.xtalin_clock_inKhz = fw_info.pll_info.crystal_frequency; + +if (IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment)) { +// On FPGA these dividers are currently not configured by GDB + res_pool->ref_clocks.dccg_ref_clock_inKhz = res_pool->ref_clocks.xtalin_clock_inKhz; + res_pool->ref_clocks.dchub_ref_clock_inKhz = res_pool->ref_clocks.xtalin_clock_inKhz; + }else if (res_pool->dccg && res_pool->hubbub) { +// If DCCG reference frequency cannot be determined (usually means not set to xtalin) then this is a critical error +// as this value must be known for DCHUB programming + (res_pool->dccg->funcs->get_dccg_ref_freq)(res_pool->dccg, + fw_info.pll_info.crystal_frequency, + &res_pool->ref_clocks.dccg_ref_clock_inKhz); + +// Similarly, if DCHUB reference frequency cannot be determined, then it is also a critical error + (res_pool->hubbub->funcs->get_dchub_ref_freq)(res_pool->hubbub, + res_pool->ref_clocks.dccg_ref_clock_inKhz, + &res_pool->ref_clocks.dchub_ref_clock_inKhz); + }else { +// Not all ASICs have DCCG sw component + res_pool->ref_clocks.dccg_ref_clock_inKhz = res_pool->ref_clocks.xtalin_clock_inKhz; + res_pool->ref_clocks.dchub_ref_clock_inKhz = res_pool->ref_clocks.xtalin_clock_inKhz; + } }else ASSERT_CRITICAL (false); }
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +1 -1
@@ -2635,7 +2635,7 @@ void dce110_set_cursor_position(struct pipe_ctx *pipe_ctx)struct mem_input *mi = pipe_ctx->plane_res.mi;struct dc_cursor_mi_param param = { .pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_100hz /10 , - .ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clock_inKhz, + .ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clocks.xtalin_clock_inKhz, .viewport = pipe_ctx->plane_res.scl_data.viewport, .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz, .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +4 -4
@@ -65,7 +65,7 @@ void print_microsec(struct dc_context *dc_ctx, struct dc_log_buffer_ctx *log_ctx, uint32_t ref_cycle) { -const uint32_t ref_clk_mhz = dc_ctx->dc->res_pool->ref_clock_inKhz /1000 ; +const uint32_t ref_clk_mhz = dc_ctx->dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 ;static const unsigned int frac =1000 ;uint32_t us_x10 = (ref_cycle * frac) / ref_clk_mhz;
@@ -2453,7 +2453,7 @@ static void dcn10_prepare_bandwidth(hubbub1_program_watermarks (dc->res_pool->hubbub, &context->bw.dcn.watermarks, - dc->res_pool->ref_clock_inKhz /1000 , + dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 , true);dcn10_stereo_hw_frame_pack_wa (dc, context);
@@ -2483,7 +2483,7 @@ static void dcn10_optimize_bandwidth(hubbub1_program_watermarks (dc->res_pool->hubbub, &context->bw.dcn.watermarks, - dc->res_pool->ref_clock_inKhz /1000 , + dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 , true);dcn10_stereo_hw_frame_pack_wa (dc, context);
@@ -2703,7 +2703,7 @@ static void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)struct dpp *dpp = pipe_ctx->plane_res.dpp;struct dc_cursor_mi_param param = { .pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_100hz /10 , - .ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clock_inKhz, + .ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clocks.dchub_ref_clock_inKhz, .viewport = pipe_ctx->plane_res.scl_data.viewport, .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz, .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c +2 -2
@@ -77,7 +77,7 @@ static unsigned int dcn10_get_hubbub_state(struct dc *dc, char *pBuf, unsigned iunsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize; -const uint32_t ref_clk_mhz = dc_ctx->dc->res_pool->ref_clock_inKhz /1000 ; +const uint32_t ref_clk_mhz = dc_ctx->dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 ;static const unsigned int frac =1000 ;memset (&wm,0 ,sizeof (struct dcn_hubbub_wm ));
@@ -115,7 +115,7 @@ static unsigned int dcn10_get_hubp_states(struct dc *dc, char *pBuf, unsigned inunsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize; -const uint32_t ref_clk_mhz = dc_ctx->dc->res_pool->ref_clock_inKhz /1000 ; +const uint32_t ref_clk_mhz = dc_ctx->dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 ;static const unsigned int frac =1000 ;if (invarOnly)
drivers/gpu/drm/amd/display/dc/inc/core_types.h +5 -1
@@ -155,7 +155,11 @@ struct resource_pool {unsigned int underlay_pipe_index;unsigned int stream_enc_count; -unsigned int ref_clock_inKhz; +struct { +unsigned int xtalin_clock_inKhz; +unsigned int dccg_ref_clock_inKhz; +unsigned int dchub_ref_clock_inKhz; + } ref_clocks;unsigned int timing_generator_count;/*
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +3 -0
@@ -39,6 +39,9 @@ struct dccg_funcs {void (*update_dpp_dto)(struct dccg *dccg,int dpp_inst,int req_dppclk); +void (*get_dccg_ref_freq)(struct dccg *dccg, +unsigned int xtalin_freq_inKhz, + unsigned int *dccg_ref_freq_inKhz); };#endif //__DAL_DCCG_H__
drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h +4 -0
@@ -73,6 +73,10 @@ struct hubbub_funcs {void (*wm_read_state)(struct hubbub *hubbub,struct dcn_hubbub_wm *wm); + +void (*get_dchub_ref_freq)(struct hubbub *hubbub, +unsigned int dccg_ref_freq_inKhz, +unsigned int *dchub_ref_freq_inKhz); };struct hubbub {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/16 drm/amd/display: add i2c over aux failure handling
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[why]
We will not retry when EDID read failure using i2c over aux
[how]
treat i2c over aux failure the same as defer
--- drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 2 ++ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/dc_ddc_types.h +2 -0
@@ -68,6 +68,8 @@ enum aux_transaction_reply {AUX_TRANSACTION_REPLY_AUX_ACK =0x00 ,AUX_TRANSACTION_REPLY_AUX_NACK =0x01 ,AUX_TRANSACTION_REPLY_AUX_DEFER =0x02 , +AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK =0x04 , +AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER =0x08 ,AUX_TRANSACTION_REPLY_I2C_ACK =0x00 , AUX_TRANSACTION_REPLY_I2C_NACK = 0x10,
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +2 -0
@@ -528,6 +528,8 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,break ;case AUX_TRANSACTION_REPLY_AUX_DEFER : +case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK : +case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER :if (++aux_defer_retries >=AUX_MAX_DEFER_RETRIES ) goto fail;break ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/16 drm/amd/display: On DCN1, Wait for vupdate on cursor updates
In reply to a message not in the archiveFrom: David Francis <[email protected]>
[Why]
Cursor updates must acquire the pipe control lock to prevent vupdate from triggering in the middle of cursor programming. On DCN1 the pipe control lock prevents pageflips from occurring. This means that a cursor update right before vupdate can delay a pending pageflip
[How]
If the time until the next vupdate is less than a conservative estimate of the cursor programming time, wait until the vupdate has passed before locking.
--- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +31 -0
@@ -29,6 +29,7 @@#include "resource.h" #include "ipp.h" #include "timing_generator.h" +#include "dcn10/dcn10_hw_sequencer.h" #define DC_LOGGER dc->ctx->logger
@@ -196,6 +197,32 @@ struct dc_stream_status *dc_stream_get_status(return dc_stream_get_status_from_state (dc->current_state, stream); } +static void delay_cursor_until_vupdate (struct pipe_ctx *pipe_ctx,struct dc *dc) +{ +unsigned int vupdate_line; +unsigned int lines_to_vupdate, us_to_vupdate, vpos, nvpos; +struct dc_stream_state *stream = pipe_ctx->stream; +unsigned int us_per_line; + +if (stream->ctx->asic_id.chip_family ==FAMILY_RV && +ASIC_REV_IS_RAVEN (stream->ctx->asic_id.hw_internal_rev)) { + + vupdate_line =get_vupdate_offset_from_vsync (pipe_ctx); +dc_stream_get_crtc_position (dc, &stream,1 , &vpos, &nvpos); + +if (vpos >= vupdate_line) +return ; + + us_per_line = stream->timing.h_total *10000 / stream->timing.pix_clk_100hz; + lines_to_vupdate = vupdate_line - vpos; + us_to_vupdate = lines_to_vupdate * us_per_line; + +/* 70 us is a conservative estimate of cursor update time*/ +if (us_to_vupdate <70 ) +udelay (us_to_vupdate); + } +} +/** * dc_stream_set_cursor_attributes() - Update cursor attributes and set cursor surface address */
@@ -234,6 +261,8 @@ bool dc_stream_set_cursor_attributes(if (!pipe_to_program) { pipe_to_program = pipe_ctx; + +delay_cursor_until_vupdate (pipe_ctx, core_dc); core_dc->hwss.pipe_control_lock (core_dc, pipe_to_program, true); }
@@ -283,6 +312,8 @@ bool dc_stream_set_cursor_position(if (!pipe_to_program) { pipe_to_program = pipe_ctx; + +delay_cursor_until_vupdate (pipe_ctx, core_dc); core_dc->hwss.pipe_control_lock (core_dc, pipe_to_program, true); }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx