drm/amd/display: Enable odm 4:1 when debug key is set
PATCH 6/10 drm/amd/display: Enable odm 4:1 when debug key is set
From: Muhammad Ahmed <[email protected]>
[WHAT]
odm 4to1 is enabled when debug key is set.
--- drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +3 -0
@@ -409,6 +409,9 @@ int dcn314_populate_dml_pipes_from_context_fpu(struct dc *dc, struct dc_state *c context->bw_ctx.dml.ip.det_buffer_size_kbytes =192 ; } +if (dc->debug.force_odm_combine_4to1) + context->bw_ctx.dml.ip.odm_combine_4to1_supported = true; +for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
Signature · 1 line
2.43.0
PATCH 7/10 drm/amd/display: Allow reuse of of DCN4x code
From: Dmytro <[email protected]>
Remove the static qualifier to make it available for code sharing with other components.
--- .../amd/display/dc/dccg/dcn401/dcn401_dccg.c | 24 +++++------ .../amd/display/dc/dccg/dcn401/dcn401_dccg.h | 40 ++++++++++++++++++- .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 2 +- .../dc/dio/dcn30/dcn30_dio_stream_encoder.h | 6 ++- .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 12 +++--- .../dc/dio/dcn401/dcn401_dio_stream_encoder.h | 18 +++++++++ .../drm/amd/display/dc/dml2/dml2_wrapper.c | 5 ++- .../amd/display/dc/dsc/dcn401/dcn401_dsc.c | 19 +++------ .../amd/display/dc/dsc/dcn401/dcn401_dsc.h | 7 ++++ .../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.c | 2 +- .../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.h | 1 + .../display/dc/hubbub/dcn35/dcn35_hubbub.c | 14 +++---- .../display/dc/hubbub/dcn35/dcn35_hubbub.h | 16 ++++++++ .../amd/display/dc/hubp/dcn20/dcn20_hubp.h | 5 +-- .../amd/display/dc/hubp/dcn35/dcn35_hubp.c | 2 +- .../amd/display/dc/hubp/dcn35/dcn35_hubp.h | 1 + .../drm/amd/display/dc/hwss/dce/dce_hwseq.h | 8 ++++ .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 3 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 3 +- .../gpu/drm/amd/display/dc/mmhubbub/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/mpc/Makefile | 2 +- .../amd/display/dc/mpc/dcn401/dcn401_mpc.c | 4 +- .../amd/display/dc/mpc/dcn401/dcn401_mpc.h | 5 ++- .../amd/display/dc/optc/dcn10/dcn10_optc.h | 14 +++++-- .../amd/display/dc/optc/dcn401/dcn401_optc.c | 22 +++++----- .../amd/display/dc/optc/dcn401/dcn401_optc.h | 19 +++++++++ 26 files changed, 188 insertions(+), 68 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c +12 -12
@@ -116,7 +116,7 @@ static void dccg401_wait_for_dentist_change_done(REG_WAIT (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_CHG_DONE ,1 ,50 ,2000 ); } -static void dccg401_get_pixel_rate_div( +void dccg401_get_pixel_rate_div( struct dccg *dccg, uint32_t otg_inst, uint32_t *tmds_div,
@@ -154,7 +154,7 @@ static void dccg401_get_pixel_rate_div( *tmds_div = val_tmds_div ==0 ?PIXEL_RATE_DIV_BY_2 :PIXEL_RATE_DIV_BY_4 ; } -static void dccg401_set_pixel_rate_div( +void dccg401_set_pixel_rate_div( struct dccg *dccg, uint32_t otg_inst, enum pixel_rate_div tmds_div,
@@ -209,7 +209,7 @@ static void dccg401_set_pixel_rate_div( } -static void dccg401_set_dtbclk_p_src ( +void dccg401_set_dtbclk_p_src (struct dccg *dccg,enum streamclk_source src,uint32_t otg_inst)
@@ -348,7 +348,7 @@ void dccg401_set_physymclk( } } -static void dccg401_get_dccg_ref_freq (struct dccg *dccg, +void dccg401_get_dccg_ref_freq (struct dccg *dccg,unsigned int xtalin_freq_inKhz,unsigned int *dccg_ref_freq_inKhz) {
@@ -378,7 +378,7 @@ static void dccg401_otg_drop_pixel(struct dccg *dccg, OTG_DROP_PIXEL[otg_inst], 1); } -static void dccg401_enable_symclk32_le ( +void dccg401_enable_symclk32_le (struct dccg *dccg,int hpo_le_inst,enum phyd32clk_clock_source phyd32clk)
@@ -429,7 +429,7 @@ static void dccg401_enable_symclk32_le( } } -static void dccg401_disable_symclk32_le ( +void dccg401_disable_symclk32_le (struct dccg *dccg,int hpo_le_inst) {
@@ -574,7 +574,7 @@ static void dccg401_disable_dpstreamclk(struct dccg *dccg, int dp_hpo_inst) } } -static void dccg401_set_dpstreamclk( +void dccg401_set_dpstreamclk( struct dccg *dccg, enum streamclk_source src, int otg_inst,
@@ -587,7 +587,7 @@ static void dccg401_set_dpstreamclk(dccg401_enable_dpstreamclk (dccg, otg_inst, dp_hpo_inst); } -static void dccg401_set_dp_dto ( +void dccg401_set_dp_dto (struct dccg *dccg,const struct dp_dto_params *params) {
@@ -727,7 +727,7 @@ void dccg401_init(struct dccg *dccg) } } -static void dccg401_set_dto_dscclk (struct dccg *dccg,uint32_t inst) +void dccg401_set_dto_dscclk (struct dccg *dccg,uint32_t inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);
@@ -763,7 +763,7 @@ static void dccg401_set_dto_dscclk(struct dccg *dccg, uint32_t inst) } } -static void dccg401_set_ref_dscclk (struct dccg *dccg, +void dccg401_set_ref_dscclk (struct dccg *dccg,uint32_t dsc_inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);
@@ -798,7 +798,7 @@ static void dccg401_set_ref_dscclk(struct dccg *dccg, } } -static void dccg401_enable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst) +void dccg401_enable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);
@@ -834,7 +834,7 @@ static void dccg401_enable_symclk_se(struct dccg *dccg, uint32_t stream_enc_inst } } -static void dccg401_disable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst) +void dccg401_disable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);
drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h +39 -1
@@ -193,10 +193,48 @@void dccg401_init (struct dccg *dccg);void dccg401_update_dpp_dto (struct dccg *dccg,int dpp_inst,int req_dppclk); - +void dccg401_get_dccg_ref_freq (struct dccg *dccg, +unsigned int xtalin_freq_inKhz, +unsigned int *dccg_ref_freq_inKhz); +void dccg401_set_dpstreamclk ( +struct dccg *dccg, +enum streamclk_source src, +int otg_inst, +int dp_hpo_inst); +void dccg401_enable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk); +void dccg401_disable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst); +void dccg401_set_ref_dscclk (struct dccg *dccg, +uint32_t dsc_inst);void dccg401_set_src_sel (struct dccg *dccg,const struct dtbclk_dto_params *params); +void dccg401_set_pixel_rate_div ( +struct dccg *dccg, +uint32_t otg_inst, +enum pixel_rate_div tmds_div, +enum pixel_rate_div unused); +void dccg401_get_pixel_rate_div ( +struct dccg *dccg, +uint32_t otg_inst, +uint32_t *tmds_div, +uint32_t *dp_dto_int); +void dccg401_set_dp_dto ( +struct dccg *dccg, +const struct dp_dto_params *params); +void dccg401_enable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst); +void dccg401_disable_symclk_se (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst); + +void dccg401_set_dto_dscclk (struct dccg *dccg,uint32_t inst); +void dccg401_set_dtbclk_p_src ( +struct dccg *dccg, +enum streamclk_source src, +uint32_t otg_inst); + struct dccg *dccg401_create( struct dc_context *ctx,
drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c +1 -1
@@ -47,7 +47,7 @@ enc1->base.ctx -static void enc3_update_hdmi_info_packet ( +void enc3_update_hdmi_info_packet (struct dcn10_stream_encoder *enc1,uint32_t packet_index,const struct dc_info_packet *info_packet)
drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.h +5 -1
@@ -322,6 +322,10 @@ void enc3_dp_set_dsc_pps_info_packet(struct stream_encoder *enc, bool enable, uint8_t *dsc_packed_pps, - bool immediate_update); + bool immediate_update); +void enc3_update_hdmi_info_packet ( +struct dcn10_stream_encoder *enc1, +uint32_t packet_index, +const struct dc_info_packet *info_packet);#endif /* __DC_DIO_STREAM_ENCODER_DCN30_H__ */
drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c +6 -6
@@ -60,7 +60,7 @@ static void enc401_dp_set_odm_combine( }/* setup stream encoder in dvi mode */ -static void enc401_stream_encoder_dvi_set_stream_attribute ( +void enc401_stream_encoder_dvi_set_stream_attribute (struct stream_encoder *enc,struct dc_crtc_timing *crtc_timing,bool is_dual_link)
@@ -229,7 +229,7 @@ static void enc401_stream_encoder_hdmi_set_stream_attribute(REG_UPDATE (HDMI_GC ,HDMI_GC_AVMUTE ,0 ); } -static void enc401_set_dig_input_mode (struct stream_encoder *enc,unsigned int pix_per_container) +void enc401_set_dig_input_mode (struct stream_encoder *enc,unsigned int pix_per_container) {struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc);
@@ -260,7 +260,7 @@ static bool is_two_pixels_per_containter(const struct dc_crtc_timing *timing)return two_pix; } -static void enc401_stream_encoder_dp_unblank ( +void enc401_stream_encoder_dp_unblank (struct dc_link *link,struct stream_encoder *enc,const struct encoder_unblank_param *param)
@@ -376,7 +376,7 @@ static void enc401_stream_encoder_dp_unblank(/* this function read dsc related register fields to be logged later in dcn10_log_hw_state * into a dcn_dsc_state struct. */ -static void enc401_read_state (struct stream_encoder *enc,struct enc_state *s) +void enc401_read_state (struct stream_encoder *enc,struct enc_state *s) {struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc);
@@ -394,7 +394,7 @@ static void enc401_read_state(struct stream_encoder *enc, struct enc_state *s) } } -static void enc401_stream_encoder_enable ( +void enc401_stream_encoder_enable (struct stream_encoder *enc,enum signal_type signal,bool enable)
@@ -704,7 +704,7 @@ void enc401_stream_encoder_dp_set_stream_attribute( DP_SST_SDP_SPLITTING, enable_sdp_splitting); } -static void enc401_stream_encoder_map_to_link ( +void enc401_stream_encoder_map_to_link (struct stream_encoder *enc,uint32_t stream_enc_inst,uint32_t link_enc_inst)
drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.h +18 -0
@@ -214,4 +214,22 @@ void enc401_stream_encoder_dp_set_stream_attribute(enum dc_color_space output_color_space, bool use_vsc_sdp_for_colorimetry, uint32_t enable_sdp_splitting); +void enc401_stream_encoder_dvi_set_stream_attribute ( +struct stream_encoder *enc, +struct dc_crtc_timing *crtc_timing, +bool is_dual_link); +void enc401_stream_encoder_dp_unblank ( +struct dc_link *link, +struct stream_encoder *enc, +const struct encoder_unblank_param *param); +void enc401_stream_encoder_enable ( +struct stream_encoder *enc, +enum signal_type signal, +bool enable); +void enc401_set_dig_input_mode (struct stream_encoder *enc,unsigned int pix_per_container); +void enc401_stream_encoder_map_to_link ( +struct stream_encoder *enc, +uint32_t stream_enc_inst, +uint32_t link_enc_inst); +void enc401_read_state (struct stream_encoder *enc,struct enc_state *s);#endif /* __DC_DIO_STREAM_ENCODER_DCN401_H__ */
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c +4 -1
@@ -785,7 +785,10 @@ static void dml2_init(const struct dc *in_dc, const struct dml2_configuration_opbool dml2_create (const struct dc *in_dc,const struct dml2_configuration_options *config,struct dml2_context **dml2) { -if ((in_dc->debug.using_dml21) && (in_dc->ctx->dce_version ==DCN_VERSION_4_01 )) +// TODO : Temporarily add DCN_VERSION_3_2 for N-1 validation. Remove DCN_VERSION_3_2 after N-1 validation phase is complete. +if ((in_dc->debug.using_dml21) + && (in_dc->ctx->dce_version ==DCN_VERSION_4_01 + ))return dml21_create (in_dc, dml2, config);// Allocate Mode Lib Ctx
drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c +6 -13
@@ -16,14 +16,7 @@ static void dsc_write_to_registers(struct display_stream_compressor *dsc, const/* Object I/F functions */ //static void dsc401_get_enc_caps(struct dsc_enc_caps *dsc_enc_caps, int pixel_clock_100Hz); -static void dsc401_read_state (struct display_stream_compressor *dsc,struct dcn_dsc_state *s); -static bool dsc401_validate_stream (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg); -static void dsc401_set_config (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg, -struct dsc_optc_config *dsc_optc_cfg);//static bool dsc401_get_packed_pps(struct display_stream_compressor *dsc, const struct dsc_config *dsc_cfg, uint8_t *dsc_packed_pps); -static void dsc401_enable (struct display_stream_compressor *dsc,int opp_pipe); -static void dsc401_disable (struct display_stream_compressor *dsc); -static void dsc401_disconnect (struct display_stream_compressor *dsc);static void dsc401_wait_disconnect_pending_clear (struct display_stream_compressor *dsc);static void dsc401_get_enc_caps (struct dsc_enc_caps *dsc_enc_caps,int pixel_clock_100Hz);
@@ -117,7 +110,7 @@ static void dsc401_get_enc_caps(struct dsc_enc_caps *dsc_enc_caps, int pixel_clo/* this function read dsc related register fields to be logged later in dcn10_log_hw_state * into a dcn_dsc_state struct. */ -static void dsc401_read_state (struct display_stream_compressor *dsc,struct dcn_dsc_state *s) +void dsc401_read_state (struct display_stream_compressor *dsc,struct dcn_dsc_state *s) {struct dcn401_dsc *dsc401 =TO_DCN401_DSC (dsc);
@@ -134,7 +127,7 @@ static void dsc401_read_state(struct display_stream_compressor *dsc, struct dcn_ } -static bool dsc401_validate_stream (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg) +bool dsc401_validate_stream (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg) {struct dsc_optc_config dsc_optc_cfg;struct dcn401_dsc *dsc401 =TO_DCN401_DSC (dsc);
@@ -145,7 +138,7 @@ static bool dsc401_validate_stream(struct display_stream_compressor *dsc, constreturn dsc_prepare_config (dsc_cfg, &dsc401->reg_vals, &dsc_optc_cfg); } -static void dsc401_set_config (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg, +void dsc401_set_config (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg,struct dsc_optc_config *dsc_optc_cfg) {bool is_config_ok;
@@ -160,7 +153,7 @@ static void dsc401_set_config(struct display_stream_compressor *dsc, const strucdsc_write_to_registers (dsc, &dsc401->reg_vals); } -static void dsc401_enable (struct display_stream_compressor *dsc,int opp_pipe) +void dsc401_enable (struct display_stream_compressor *dsc,int opp_pipe) {struct dcn401_dsc *dsc401 =TO_DCN401_DSC (dsc);int dsc_clock_en;
@@ -185,7 +178,7 @@ static void dsc401_enable(struct display_stream_compressor *dsc, int opp_pipe) } -static void dsc401_disable (struct display_stream_compressor *dsc) +void dsc401_disable (struct display_stream_compressor *dsc) {struct dcn401_dsc *dsc401 =TO_DCN401_DSC (dsc);int dsc_clock_en;
@@ -211,7 +204,7 @@ static void dsc401_wait_disconnect_pending_clear(struct display_stream_compressoREG_WAIT (DSCRM_DSC_FORWARD_CONFIG ,DSCRM_DSC_FORWARD_EN_STATUS ,0 ,2 ,50000 ); } -static void dsc401_disconnect (struct display_stream_compressor *dsc) +void dsc401_disconnect (struct display_stream_compressor *dsc) {struct dcn401_dsc *dsc401 =TO_DCN401_DSC (dsc);
drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h +7 -0
@@ -334,5 +334,12 @@ void dsc401_construct(struct dcn401_dsc *dsc,void dsc401_set_fgcg (struct dcn401_dsc *dsc401,bool enable); +void dsc401_read_state (struct display_stream_compressor *dsc,struct dcn_dsc_state *s); +bool dsc401_validate_stream (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg); +void dsc401_set_config (struct display_stream_compressor *dsc,const struct dsc_config *dsc_cfg, +struct dsc_optc_config *dsc_optc_cfg); +void dsc401_enable (struct display_stream_compressor *dsc,int opp_pipe); +void dsc401_disable (struct display_stream_compressor *dsc); +void dsc401_disconnect (struct display_stream_compressor *dsc);#endif
drivers/gpu/drm/amd/display/dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.c +1 -1
@@ -41,7 +41,7 @@#define CTX \ enc3->base.ctx -static bool dcn32_hpo_dp_link_enc_is_in_alt_mode ( +bool dcn32_hpo_dp_link_enc_is_in_alt_mode (struct hpo_dp_link_encoder *enc) {struct dcn31_hpo_dp_link_encoder *enc3 =DCN3_1_HPO_DP_LINK_ENC_FROM_HPO_LINK_ENC (enc);
drivers/gpu/drm/amd/display/dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.h +1 -0
@@ -54,6 +54,7 @@SE_SF (DP_DPHY_SYM320_DP_DPHY_SYM32_VC_RATE_CNTL0 ,STREAM_VC_RATE_Y , mask_sh),\ SE_SF(DP_DPHY_SYM320_DP_DPHY_SYM32_SAT_UPDATE, SAT_UPDATE, mask_sh) +bool dcn32_hpo_dp_link_enc_is_in_alt_mode (struct hpo_dp_link_encoder *enc); void hpo_dp_link_encoder32_construct(struct dcn31_hpo_dp_link_encoder *enc31, struct dc_context *ctx, uint32_t inst,
drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c +7 -7
@@ -46,7 +46,7 @@#define DCN35_CRB_SEGMENT_SIZE_KB 64 -static void dcn35_init_crb (struct hubbub *hubbub) +void dcn35_init_crb (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub2 =TO_DCN20_HUBBUB (hubbub);
@@ -71,7 +71,7 @@ static void dcn35_init_crb(struct hubbub *hubbub)REG_UPDATE (DCHUBBUB_DEBUG_CTRL_0 ,DET_DEPTH ,0x5FF ); } -static void dcn35_program_compbuf_size (struct hubbub *hubbub,unsigned int compbuf_size_kb,bool safe_to_increase) +void dcn35_program_compbuf_size (struct hubbub *hubbub,unsigned int compbuf_size_kb,bool safe_to_increase) {struct dcn20_hubbub *hubbub2 =TO_DCN20_HUBBUB (hubbub);unsigned int compbuf_size_segments = (compbuf_size_kb +DCN35_CRB_SEGMENT_SIZE_KB -1 ) /DCN35_CRB_SEGMENT_SIZE_KB ;
@@ -255,7 +255,7 @@ static bool hubbub35_program_stutter_z8_watermarks(return wm_pending; } -static void hubbub35_get_dchub_ref_freq (struct hubbub *hubbub, +void hubbub35_get_dchub_ref_freq (struct hubbub *hubbub,unsigned int dccg_ref_freq_inKhz,unsigned int *dchub_ref_freq_inKhz) {
@@ -295,7 +295,7 @@ static void hubbub35_get_dchub_ref_freq(struct hubbub *hubbub, } -static bool hubbub35_program_watermarks( +bool hubbub35_program_watermarks( struct hubbub *hubbub, union dcn_watermark_set *watermarks, unsigned int refclk_mhz,
@@ -335,7 +335,7 @@ static bool hubbub35_program_watermarks( }/* Copy values from WM set A to all other sets */ -static void hubbub35_init_watermarks (struct hubbub *hubbub) +void hubbub35_init_watermarks (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub2 =TO_DCN20_HUBBUB (hubbub);uint32_t reg;
@@ -397,7 +397,7 @@ static void hubbub35_init_watermarks(struct hubbub *hubbub) } -static void hubbub35_wm_read_state (struct hubbub *hubbub, +void hubbub35_wm_read_state (struct hubbub *hubbub,struct dcn_hubbub_wm *wm) {struct dcn20_hubbub *hubbub2 =TO_DCN20_HUBBUB (hubbub);
@@ -514,7 +514,7 @@ static void hubbub35_set_fgcg(struct dcn20_hubbub *hubbub2, bool enable)REG_UPDATE (DCHUBBUB_CLOCK_CNTL ,DCHUBBUB_FGCG_REP_DIS , !enable); } -static void hubbub35_init (struct hubbub *hubbub) +void hubbub35_init (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub2 =TO_DCN20_HUBBUB (hubbub);/*Enable clock gaters*/
drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h +16 -0
@@ -152,4 +152,20 @@ void hubbub35_construct(struct dcn20_hubbub *hubbub2,int det_size_kb, int pixel_chunk_size_kb, int config_return_buffer_size_kb); + +void hubbub35_wm_read_state (struct hubbub *hubbub, +struct dcn_hubbub_wm *wm); +void hubbub35_get_dchub_ref_freq (struct hubbub *hubbub, +unsigned int dccg_ref_freq_inKhz, +unsigned int *dchub_ref_freq_inKhz); +bool hubbub35_program_watermarks ( +struct hubbub *hubbub, +union dcn_watermark_set *watermarks, +unsigned int refclk_mhz, +bool safe_to_lower); +void hubbub35_init_watermarks (struct hubbub *hubbub); +void dcn35_program_compbuf_size (struct hubbub *hubbub, +unsigned int compbuf_size_kb,bool safe_to_increase); +void dcn35_init_crb (struct hubbub *hubbub); +void hubbub35_init (struct hubbub *hubbub);#endif
drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h +2 -3
@@ -280,9 +280,8 @@type MCACHEID_MALL_PREF_1H_P0 ;\type MCACHEID_MALL_PREF_2H_P0 ;\type MCACHEID_MALL_PREF_1H_P1 ;\ - type MCACHEID_MALL_PREF_2H_P1 - - +type MCACHEID_MALL_PREF_2H_P1 ;\ + type HUBP_FGCG_REP_DIS struct dcn_hubp2_registers {DCN401_HUBP_REG_COMMON_VARIABLE_LIST ;
drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c +1 -1
@@ -45,7 +45,7 @@ void hubp35_set_fgcg(struct hubp *hubp, bool enable)REG_UPDATE (HUBP_CLK_CNTL ,HUBP_FGCG_REP_DIS , !enable); } -static void hubp35_init (struct hubp *hubp) +void hubp35_init (struct hubp *hubp) {hubp3_init (hubp);
drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.h +1 -0
@@ -72,4 +72,5 @@ void hubp35_program_surface_config(bool horizontal_mirror, unsigned int compat_level); +void hubp35_init (struct hubp *hubp);#endif /* __DC_HUBP_DCN35_H__ */
drivers/gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h +8 -0
@@ -644,10 +644,18 @@ struct dce_hwseq_registers {uint32_t DPP_TOP0_DPP_CRC_CTRL ;uint32_t DPP_TOP0_DPP_CRC_VAL_R_G ;uint32_t DPP_TOP0_DPP_CRC_VAL_B_A ; +uint32_t DPP_TOP0_DPP_CRC_VAL_R ; +uint32_t DPP_TOP0_DPP_CRC_VAL_G ; +uint32_t DPP_TOP0_DPP_CRC_VAL_B ; +uint32_t DPP_TOP0_DPP_CRC_VAL_A ;uint32_t MPC_CRC_CTRL ;uint32_t MPC_CRC_RESULT_GB ;uint32_t MPC_CRC_RESULT_C ;uint32_t MPC_CRC_RESULT_AR ; +uint32_t MPC_CRC_RESULT_R ; +uint32_t MPC_CRC_RESULT_G ; +uint32_t MPC_CRC_RESULT_B ; +uint32_t MPC_CRC_RESULT_A ;uint32_t D1VGA_CONTROL ;uint32_t D2VGA_CONTROL ;uint32_t D3VGA_CONTROL ;
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +2 -1
@@ -2778,7 +2778,8 @@ void dcn20_unblank_stream(struct pipe_ctx *pipe_ctx, }else if (dc_is_dp_signal (pipe_ctx->stream->signal)) {if (is_two_pixels_per_container || params.opp_cnt >1 ) params.timing.pix_clk_100hz /=2 ; - pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine ( +if (pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine) + pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine ( pipe_ctx->stream_res.stream_enc, params.opp_cnt >1 ); pipe_ctx->stream_res.stream_enc->funcs->dp_unblank (link, pipe_ctx->stream_res.stream_enc, ¶ms); }
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +2 -1
@@ -1322,7 +1322,8 @@ void dcn32_unblank_stream(struct pipe_ctx *pipe_ctx, params.timing.pix_clk_100hz /=2 ; params.pix_per_cycle =2 ; } - pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine ( +if (pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine) + pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine ( pipe_ctx->stream_res.stream_enc, params.pix_per_cycle >1 ); pipe_ctx->stream_res.stream_enc->funcs->dp_unblank (link, pipe_ctx->stream_res.stream_enc, ¶ms); }
drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile +1 -1
@@ -50,5 +50,5 @@ MMHUBBUB_DCN35 = dcn35_mmhubbub.o AMD_DAL_MMHUBBUB_DCN35 = $(addprefix $(AMDDALPATH)/dc/mmhubbub/dcn35/,$(MMHUBBUB_DCN35)) AMD_DISPLAY_FILES += $(AMD_DAL_MMHUBBUB_DCN35) - endif +
drivers/gpu/drm/amd/display/dc/mpc/Makefile +1 -1
@@ -68,5 +68,5 @@ MPC_DCN401 = dcn401_mpc.o AMD_DAL_MPC_DCN401 = $(addprefix $(AMDDALPATH)/dc/mpc/dcn401/,$(MPC_DCN401)) AMD_DISPLAY_FILES += $(AMD_DAL_MPC_DCN401) - endif +
drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c +2 -2
@@ -40,14 +40,14 @@#define FN (reg_name, field_name) \ mpc401->mpc_shift->field_name, mpc401->mpc_mask->field_name -static void mpc401_update_3dlut_fast_load_select (struct mpc *mpc,int mpcc_id,int hubp_idx) +void mpc401_update_3dlut_fast_load_select (struct mpc *mpc,int mpcc_id,int hubp_idx) {struct dcn401_mpc *mpc401 =TO_DCN401_MPC (mpc);REG_SET (MPCC_MCM_3DLUT_FAST_LOAD_SELECT [mpcc_id],0 ,MPCC_MCM_3DLUT_FL_SEL , hubp_idx); } -static void mpc401_get_3dlut_fast_load_status (struct mpc *mpc,int mpcc_id,uint32_t *done,uint32_t *soft_underflow,uint32_t *hard_underflow) +void mpc401_get_3dlut_fast_load_status (struct mpc *mpc,int mpcc_id,uint32_t *done,uint32_t *soft_underflow,uint32_t *hard_underflow) {struct dcn401_mpc *mpc401 =TO_DCN401_MPC (mpc);
drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h +4 -1
@@ -63,7 +63,8 @@uint32_t MPC_MCM_SECOND_GAMUT_REMAP_C31_C32_B [MAX_MPCC ]; \uint32_t MPC_MCM_SECOND_GAMUT_REMAP_C33_C34_B [MAX_MPCC ]; \uint32_t MPCC_MCM_3DLUT_FAST_LOAD_SELECT [MAX_MPCC ]; \ - uint32_t MPCC_MCM_3DLUT_FAST_LOAD_STATUS[MAX_MPCC] +uint32_t MPCC_MCM_3DLUT_FAST_LOAD_STATUS [MAX_MPCC ]; \ + uint32_t MPCC_CONTROL2[MAX_MPCC]#define MPC_COMMON_MASK_SH_LIST_DCN4_01 (mask_sh) \ MPC_COMMON_MASK_SH_LIST_DCN32(mask_sh), \
@@ -235,5 +236,7 @@ void mpc401_get_gamut_remap(struct mpc *mpc, int mpcc_id, struct mpc_grph_gamut_adjustment *adjust); +void mpc401_update_3dlut_fast_load_select (struct mpc *mpc,int mpcc_id,int hubp_idx); +void mpc401_get_3dlut_fast_load_status (struct mpc *mpc,int mpcc_id,uint32_t *done,uint32_t *soft_underflow,uint32_t *hard_underflow);#endif
drivers/gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h +11 -3
@@ -168,13 +168,21 @@ struct dcn_optc_registers {uint32_t OTG_CRC_CNTL ;uint32_t OTG_CRC_CNTL2 ;uint32_t OTG_CRC0_DATA_RG ; +uint32_t OTG_CRC1_DATA_RG ; +uint32_t OTG_CRC2_DATA_RG ; +uint32_t OTG_CRC3_DATA_RG ;uint32_t OTG_CRC0_DATA_B ;uint32_t OTG_CRC1_DATA_B ;uint32_t OTG_CRC2_DATA_B ;uint32_t OTG_CRC3_DATA_B ; -uint32_t OTG_CRC1_DATA_RG ; -uint32_t OTG_CRC2_DATA_RG ; -uint32_t OTG_CRC3_DATA_RG ; +uint32_t OTG_CRC0_DATA_R ; +uint32_t OTG_CRC1_DATA_R ; +uint32_t OTG_CRC2_DATA_R ; +uint32_t OTG_CRC3_DATA_R ; +uint32_t OTG_CRC0_DATA_G ; +uint32_t OTG_CRC1_DATA_G ; +uint32_t OTG_CRC2_DATA_G ; +uint32_t OTG_CRC3_DATA_G ;uint32_t OTG_CRC0_WINDOWA_X_CONTROL ;uint32_t OTG_CRC0_WINDOWA_Y_CONTROL ;uint32_t OTG_CRC0_WINDOWB_X_CONTROL ;
drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.c +11 -11
@@ -101,7 +101,7 @@ static uint32_t decide_odm_mem_bit_map(int *opp_id, int opp_cnt, int h_active)return memory_bit_map; } -static void optc401_set_odm_combine (struct timing_generator *optc,int *opp_id, +void optc401_set_odm_combine (struct timing_generator *optc,int *opp_id,int opp_cnt,int segment_width,int last_segment_width) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -162,7 +162,7 @@ static void optc401_set_odm_combine(struct timing_generator *optc, int *opp_id, optc1->opp_count = opp_cnt; } -static void optc401_set_h_timing_div_manual_mode (struct timing_generator *optc,bool manual_mode) +void optc401_set_h_timing_div_manual_mode (struct timing_generator *optc,bool manual_mode) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -177,7 +177,7 @@ static void optc401_set_h_timing_div_manual_mode(struct timing_generator *optc,* * Return: Always returns true */ -static bool optc401_enable_crtc (struct timing_generator *optc) +bool optc401_enable_crtc (struct timing_generator *optc) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -203,7 +203,7 @@ static bool optc401_enable_crtc(struct timing_generator *optc) }/* disable_crtc */ -static bool optc401_disable_crtc (struct timing_generator *optc) +bool optc401_disable_crtc (struct timing_generator *optc) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -234,7 +234,7 @@ static bool optc401_disable_crtc(struct timing_generator *optc)return true; } -static void optc401_phantom_crtc_post_enable (struct timing_generator *optc) +void optc401_phantom_crtc_post_enable (struct timing_generator *optc) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -245,7 +245,7 @@ static void optc401_phantom_crtc_post_enable(struct timing_generator *optc)REG_WAIT (OTG_CLOCK_CONTROL ,OTG_BUSY ,0 ,1 ,100000 ); } -static void optc401_disable_phantom_otg (struct timing_generator *optc) +void optc401_disable_phantom_otg (struct timing_generator *optc) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -259,7 +259,7 @@ static void optc401_disable_phantom_otg(struct timing_generator *optc)REG_UPDATE (OTG_CONTROL ,OTG_MASTER_EN ,0 ); } -static void optc401_set_odm_bypass (struct timing_generator *optc, +void optc401_set_odm_bypass (struct timing_generator *optc,const struct dc_crtc_timing *dc_crtc_timing) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -365,7 +365,7 @@ void optc401_set_drr( } } -static void optc401_set_out_mux (struct timing_generator *optc,enum otg_out_mux_dest dest) +void optc401_set_out_mux (struct timing_generator *optc,enum otg_out_mux_dest dest) {struct optc *optc1 =DCN10TG_FROM_TG (optc);
@@ -396,7 +396,7 @@ void optc401_set_vtotal_min_max(struct timing_generator *optc, int vtotal_min, i } } -static void optc401_program_global_sync( +void optc401_program_global_sync( struct timing_generator *optc, int vready_offset, int vstartup_start,
@@ -430,7 +430,7 @@ static void optc401_program_global_sync(REG_UPDATE (OTG_PSTATE_REGISTER ,OTG_PSTATE_KEEPOUT_START , pstate_keepout); } -static void optc401_set_vupdate_keepout (struct timing_generator *tg,bool enable) +void optc401_set_vupdate_keepout (struct timing_generator *tg,bool enable) {struct optc *optc1 =DCN10TG_FROM_TG (tg);
@@ -442,7 +442,7 @@ static void optc401_set_vupdate_keepout(struct timing_generator *tg, bool enablereturn ; } -static bool optc401_wait_update_lock_status (struct timing_generator *tg,bool locked) +bool optc401_wait_update_lock_status (struct timing_generator *tg,bool locked) {struct optc *optc1 =DCN10TG_FROM_TG (tg);uint32_t lock_status =0 ;
drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h +19 -0
@@ -173,5 +173,24 @@ void optc401_set_drr( const struct drr_params *params);void optc401_set_vtotal_min_max (struct timing_generator *optc,int vtotal_min,int vtotal_max);void optc401_setup_manual_trigger (struct timing_generator *optc); +void optc401_program_global_sync ( +struct timing_generator *optc, +int vready_offset, +int vstartup_start, +int vupdate_offset, +int vupdate_width, +int pstate_keepout); +bool optc401_enable_crtc (struct timing_generator *optc); +bool optc401_disable_crtc (struct timing_generator *optc); +void optc401_phantom_crtc_post_enable (struct timing_generator *optc); +void optc401_disable_phantom_otg (struct timing_generator *optc); +void optc401_set_odm_bypass (struct timing_generator *optc, +const struct dc_crtc_timing *dc_crtc_timing); +void optc401_set_odm_combine (struct timing_generator *optc,int *opp_id, +int opp_cnt,int segment_width,int last_segment_width); +void optc401_set_h_timing_div_manual_mode (struct timing_generator *optc,bool manual_mode); +void optc401_set_out_mux (struct timing_generator *optc,enum otg_out_mux_dest dest); +bool optc401_wait_update_lock_status (struct timing_generator *tg,bool locked); +void optc401_set_vupdate_keepout (struct timing_generator *tg,bool enable);#endif /* __DC_OPTC_DCN401_H__ */
Signature · 1 line
2.43.0
PATCH 8/10 drm/amd/display: Request HW cursor on DCN3.2 with SubVP
In reply to Alex HungFrom: Aric Cyr <[email protected]>
[WHY]
When SubVP is active the HW cursor size is limited to 64x64, and anything larger will force composition which is bad for gaming on DCN3.2 if the game uses a larger cursor.
[HOW]
If HW cursor is requested, typically by a fullscreen game, do not enable SubVP so that up to 256x256 cursor sizes are available for DCN3.2.
--- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +1 -0
@@ -626,6 +626,7 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc,* - Not TMZ surface */ if (pipe->plane_state && !pipe->top_pipe && !pipe->prev_odm_pipe && !dcn32_is_center_timing(pipe) && + !pipe->stream->hw_cursor_req && !(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ) && (!dcn32_is_psr_capable(pipe) || (context->stream_count == 1 && dc->caps.dmub_caps.subvp_psr)) && dc_state_get_pipe_subvp_type(context, pipe) == SUBVP_NONE &&
Signature · 1 line
2.43.0
PATCH 9/10 drm/amd/display: Move SPL to a new path
In reply to Alex HungFrom: Samson Tam <[email protected]>
[WHY & HOW]
- Move SPL from dc/spl to dc/sspl
- Update build files and header paths
- Remove dc/spl files
---
drivers/gpu/drm/amd/display/dc/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/dc.h | 2 --
drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 1 -
drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 1 -
drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 1 -
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +-
drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +-
drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 -
.../gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c | 4 ++--
drivers/gpu/drm/amd/display/dc/{spl => sspl}/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.h | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.c | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.h | 0
.../drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.c | 0
.../drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.h | 0
.../amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.c | 0
.../amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.h | 0
.../gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.c | 0
.../gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.h | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_types.h | 0
.../gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.c | 0
.../gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.h | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_debug.h | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.c | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.h | 0
drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_os_types.h | 0
27 files changed, 6 insertions(+), 12 deletions(-)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/Makefile (96%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_types.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_debug.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_os_types.h (100%)drivers/gpu/drm/amd/display/dc/Makefile +1 -1
@@ -52,7 +52,7 @@ endif DC_LIBS += hdcp ifdef CONFIG_DRM_AMD_DC_FP -DC_LIBS += spl +DC_LIBS += sspl DC_SPL_TRANS += dc_spl_translate.o endif
drivers/gpu/drm/amd/display/dc/dc.h +0 -2
@@ -46,8 +46,6 @@#include "dmub/inc/dmub_cmd.h" -#include "spl/dc_spl_types.h" -struct abm_save_restore ;/* forward declaration */
drivers/gpu/drm/amd/display/dc/dc_spl_translate.c +0 -1
@@ -3,7 +3,6 @@// Copyright 2024 Advanced Micro Devices, Inc. #include "dc_spl_translate.h" -#include "spl/dc_spl_types.h" #include "dcn20/dcn20_dpp.h" #include "dcn32/dcn32_dpp.h" #include "dcn401/dcn401_dpp.h"
drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h +0 -1
@@ -26,7 +26,6 @@#define __DCN20_DPP_H__#include "dcn10/dcn10_dpp.h" -#include "spl/dc_spl_types.h" #define TO_DCN20_DPP (dpp)\ container_of(dpp, struct dcn20_dpp, base)
drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h +0 -1
@@ -27,7 +27,6 @@#include "dcn20/dcn20_dpp.h" #include "dcn30/dcn30_dpp.h" -#include "spl/dc_spl_types.h" bool dpp32_construct(struct dcn3_dpp *dpp3, struct dc_context *ctx,
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -1
@@ -39,7 +39,7 @@#include "panel_cntl.h" #include "dmub/inc/dmub_cmd.h" #include "pg_cntl.h" -#include "spl/dc_spl.h" +#include "sspl/dc_spl.h" #define MAX_CLOCK_SOURCES 7#define MAX_SVP_PHANTOM_STREAMS 2
drivers/gpu/drm/amd/display/dc/inc/hw/transform.h +1 -1
@@ -29,7 +29,7 @@#include "hw_shared.h" #include "dc_hw_types.h" #include "fixed31_32.h" -#include "spl/dc_spl_types.h" +#include "sspl/dc_spl_types.h" #define CSC_TEMPERATURE_MATRIX_SIZE 12
drivers/gpu/drm/amd/display/dc/inc/resource.h +0 -1
@@ -29,7 +29,6 @@#include "core_status.h" #include "dal_asic_id.h" #include "dm_pp_smu.h" -#include "spl/dc_spl.h" #define MEMORY_TYPE_MULTIPLIER_CZ 4#define MEMORY_TYPE_HBM 2
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c +2 -2
@@ -76,8 +76,8 @@#include "dml2/dml2_wrapper.h" -#include "spl/dc_spl_scl_easf_filters.h" -#include "spl/dc_spl_isharp_filters.h" +#include "sspl/dc_spl_scl_easf_filters.h" +#include "sspl/dc_spl_isharp_filters.h" #define DC_LOGGER_INIT (logger)
drivers/gpu/drm/amd/display/dc/sspl/Makefile renamed from drivers/gpu/drm/amd/display/dc/spl/Makefile +1 -1
@@ -25,7 +25,7 @@ SPL = dc_spl.o dc_spl_scl_filters.o dc_spl_scl_easf_filters.o dc_spl_isharp_filters.o dc_spl_filters.o spl_fixpt31_32.o spl_custom_float.o -AMD_DAL_SPL = $(addprefix $(AMDDALPATH)/dc/spl/,$(SPL)) +AMD_DAL_SPL = $(addprefix $(AMDDALPATH)/dc/sspl/,$(SPL)) AMD_DISPLAY_FILES += $(AMD_DAL_SPL)
drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.c renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.h renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.c renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.h renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.c renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.h renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.c renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.h renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h renamed from drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.c renamed from drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.h renamed from drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/spl_debug.h renamed from drivers/gpu/drm/amd/display/dc/spl/spl_debug.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c renamed from drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.c +0 -0
drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h renamed from drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.h +0 -0
drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h renamed from drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h +0 -0
Signature · 1 line
2.43.0
PATCH 10/10 drm/amd/display: 3.2.319
In reply to Alex HungFrom: Taimur Hassan <[email protected]>
- Move SPL to a new path
- Request HW cursor on DCN3.2 with SubVP
- Allow reuse of of DCN4x code
- Enable odm 4:1 when debug key is set
- Fix seamless boot sequence
- Support multiple options during psr entry.
- Revert "Exit idle optimizations before attempt to access PHY"
- Fix out-of-bound accesses
- Fixes for mcache programming in DML21
--- 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
@@ -53,7 +53,7 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.318" +#define DC_VER "3.2.319"#define MAX_SURFACES 4#define MAX_PLANES 6
Signature · 1 line
2.43.0