Add DP 2.0 SST Support
Subsystems (3)
cover Add DP 2.0 SST Support
The patch series adds SST UHBR10 support
Fangzhi Zuo (6):
drm/amd/display: Add DP 2.0 Audio Package Generator drm/amd/display: Add DP 2.0 HPO Stream Encoder drm/amd/display: Add DP 2.0 HPO Link Encoder drm/amd/display: Add DP 2.0 DCCG drm/amd/display: Add DP 2.0 BIOS and DMUB Support drm/amd/display: Add DP 2.0 SST DC Support
.../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + .../drm/amd/display/dc/bios/bios_parser2.c | 8 + .../drm/amd/display/dc/bios/command_table2.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc.c | 17 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 503 +++++++- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1071 +++++++++++++++-- .../drm/amd/display/dc/core/dc_link_hwss.c | 291 ++++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 104 ++ drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 199 ++- drivers/gpu/drm/amd/display/dc/dc_link.h | 3 + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + .../display/dc/dce110/dce110_hw_sequencer.c | 86 +- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 65 + .../amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 26 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 4 + .../display/dc/dcn30/dcn30_dio_link_encoder.c | 4 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 +++ .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 ++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 162 +++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 + .../display/dc/dcn31/dcn31_dio_link_encoder.c | 4 + .../dc/dcn31/dcn31_hpo_dp_link_encoder.c | 620 ++++++++++ .../dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 ++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 761 ++++++++++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 181 +++ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + .../gpu/drm/amd/display/dc/inc/core_types.h | 6 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 21 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 + .../drm/amd/display/dc/inc/hw/link_encoder.h | 89 ++ .../amd/display/dc/inc/hw/stream_encoder.h | 79 ++ .../amd/display/dc/inc/hw/timing_generator.h | 1 + .../amd/display/dc/inc/hw_sequencer_private.h | 1 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 12 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- .../amd/display/include/bios_parser_types.h | 6 + .../gpu/drm/amd/display/include/dpcd_defs.h | 14 +- .../amd/display/include/grph_object_defs.h | 10 + .../drm/amd/display/include/grph_object_id.h | 6 + .../amd/display/include/link_service_types.h | 31 +- .../drm/amd/display/include/logger_types.h | 2 + drivers/gpu/drm/amd/include/atomfirmware.h | 4 + 48 files changed, 5018 insertions(+), 227 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h
Signature · 1 line
2.25.1
PATCH 1/6 drm/amd/display: Add DP 2.0 Audio Package Generator
HW Blocks:
+-----+
| HDA |
+-----+
|
|
HPO ===============|=============
| v
| +-----+
| | APG |
v +-----+--- drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 ++++++++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 38 ++++ 4 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
drivers/gpu/drm/amd/display/dc/dcn31/Makefile +2 -1
@@ -11,7 +11,8 @@ # Makefile for dcn31. DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o \ - dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o + dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ + dcn31_apg.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -msse
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c new file +173 -0
173 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h new file +115 -0
115 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +38 -0
@@ -52,6 +52,7 @@#include "dcn30/dcn30_vpg.h" #include "dcn30/dcn30_afmt.h" #include "dcn30/dcn30_dio_stream_encoder.h" +#include "dcn31/dcn31_apg.h" #include "dcn31/dcn31_dio_link_encoder.h" #include "dce/dce_clock_source.h" #include "dce/dce_audio.h"
@@ -457,6 +458,26 @@ static const struct dcn30_afmt_mask afmt_mask = {DCN3_AFMT_MASK_SH_LIST (_MASK) }; +#define apg_regs (id)\ +[id] = {\ + APG_DCN31_REG_LIST(id)\ +} + +static const struct dcn31_apg_registers apg_regs[] = { +apg_regs (0 ), +apg_regs (1 ), +apg_regs (2 ), +apg_regs (3 ) +}; + +static const struct dcn31_apg_shift apg_shift = { +DCN31_APG_MASK_SH_LIST (__SHIFT) +}; + +static const struct dcn31_apg_mask apg_mask = { +DCN31_APG_MASK_SH_LIST (_MASK) +}; +#define stream_enc_regs (id)\ [id] = {\ SE_DCN3_REG_LIST(id)\
@@ -1260,6 +1281,23 @@ static struct afmt *dcn31_afmt_create(return &afmt3->base; } +static struct apg *dcn31_apg_create ( +struct dc_context *ctx, +uint32_t inst) +{ +struct dcn31_apg *apg31 =kzalloc (sizeof (struct dcn31_apg ),GFP_KERNEL ); + +if (!apg31) +return NULL ; + +apg31_construct (apg31, ctx, inst, + &apg_regs[inst], + &apg_shift, + &apg_mask); + +return &apg31->base; +} +static struct stream_encoder *dcn31_stream_encoder_create (enum engine_id eng_id,struct dc_context *ctx)
Signature · 1 line
2.25.1
PATCH 2/6 drm/amd/display: Add DP 2.0 HPO Stream Encoder
In reply to Fangzhi ZuoHW Blocks:
+--------+ +-----+ +------+
| OPTC | | HDA | | HUBP |
+--------+ +-----+ +------+
| | |
| | |
HPO ====|==========|========|====
| | v |
| | +-----+ |
| | | APG | |
| | +-----+ |
| | | |
v v v v
+----------------------+
| HPO Stream Encoder |
+----------------------+--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 35 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 761 ++++++++++++++++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 85 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 4 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + .../amd/display/dc/inc/hw/stream_encoder.h | 79 ++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 + .../amd/display/include/grph_object_defs.h | 10 + .../drm/amd/display/include/grph_object_id.h | 6 + 11 files changed, 1227 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +35 -0
@@ -466,6 +466,41 @@ void dcn10_log_hw_state(struct dc *dc,log_mpc_crc (dc, log_ctx); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + { +int hpo_dp_link_enc_count =0 ; + +if (pool->hpo_dp_stream_enc_count >0 ) { +DTN_INFO ("DP HPO S_ENC: Enabled OTG Format Depth Vid SDP Compressed Link\n" ); +for (i =0 ; i < pool->hpo_dp_stream_enc_count; i++) { +struct hpo_dp_stream_encoder_state hpo_dp_se_state = {0 }; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc = pool->hpo_dp_stream_enc[i]; + +if (hpo_dp_stream_enc && hpo_dp_stream_enc->funcs->read_state) { + hpo_dp_stream_enc->funcs->read_state (hpo_dp_stream_enc, &hpo_dp_se_state); + +DTN_INFO ("[%d]: %d %d %6s %d %d %d %d %d\n" , + hpo_dp_stream_enc->id -ENGINE_ID_HPO_DP_0 , + hpo_dp_se_state.stream_enc_enabled, + hpo_dp_se_state.otg_inst, + (hpo_dp_se_state.pixel_encoding ==0 ) ?"4:4:4" : + ((hpo_dp_se_state.pixel_encoding ==1 ) ?"4:2:2" : + (hpo_dp_se_state.pixel_encoding ==2 ) ?"4:2:0" :"Y-Only" ), + (hpo_dp_se_state.component_depth ==0 ) ?6 : + ((hpo_dp_se_state.component_depth ==1 ) ?8 : + (hpo_dp_se_state.component_depth ==2 ) ?10 :12 ), + hpo_dp_se_state.vid_stream_enabled, + hpo_dp_se_state.sdp_enabled, + hpo_dp_se_state.compressed_format, + hpo_dp_se_state.mapped_to_link_enc); + } + } + +DTN_INFO ("\n" ); + } + } +#endif +DTN_INFO_END (); }
drivers/gpu/drm/amd/display/dc/dcn31/Makefile +1 -1
@@ -12,7 +12,7 @@ DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o \ dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ - dcn31_apg.o + dcn31_apg.o dcn31_hpo_dp_stream_encoder.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -msse
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c new file +761 -0
761 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h new file +241 -0
241 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +85 -0
127 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +4 -0
@@ -246,6 +246,8 @@ struct resource_pool {*/ unsigned int dig_link_enc_count; +unsigned int hpo_dp_stream_enc_count; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc[MAX_HPO_DP2_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )struct dc_3dlut *mpc_lut[MAX_PIPES ];struct dc_transfer_func *mpc_shaper[MAX_PIPES ];
@@ -298,6 +300,7 @@ struct stream_resource {struct display_stream_compressor *dsc;struct timing_generator *tg;struct stream_encoder *stream_enc; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc;struct audio *audio;struct pixel_clk_params pix_clk_params;
@@ -388,6 +391,7 @@ struct resource_context {struct link_enc_assignment link_enc_assignments[MAX_PIPES ];/* List of available link encoders. Uses engine ID as encoder identifier. */ enum engine_id link_enc_avail[MAX_DIG_LINK_ENCODERS ]; +bool is_hpo_dp_stream_enc_acquired[MAX_HPO_DP2_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )bool is_mpc_3dlut_acquired[MAX_PIPES ];#endif
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +1 -0
@@ -38,6 +38,7 @@#define MAX_PIPES 6#define MAX_DIG_LINK_ENCODERS 7#define MAX_DWB_PIPES 1 +#define MAX_HPO_DP2_ENCODERS 4struct gamma_curve {uint32_t offset;
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +79 -0
83 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/resource.h +4 -0
@@ -49,6 +49,7 @@ struct resource_caps {int num_vmid;int num_dsc;unsigned int num_dig_link_enc;// Total number of DIGs (digital encoders) in DIO (Display Input/Output). +int num_hpo_dp_stream_encoder;int num_mpc_3dlut; };
@@ -68,6 +69,9 @@ struct resource_create_funcs {struct stream_encoder *(*create_stream_encoder)(enum engine_id eng_id,struct dc_context *ctx); +struct hpo_dp_stream_encoder *(*create_hpo_dp_stream_encoder)( +enum engine_id eng_id,struct dc_context *ctx); +struct dce_hwseq *(*create_hwseq)(struct dc_context *ctx); };
drivers/gpu/drm/amd/display/include/grph_object_defs.h +10 -0
@@ -140,6 +140,16 @@ enum sync_source { SYNC_SOURCE_DUAL_GPU_PIN }; +enum tx_ffe_id { +TX_FFE0 =0 , +TX_FFE1 , +TX_FFE2 , +TX_FFE3 , + TX_FFE_DeEmphasis_Only, + TX_FFE_PreShoot_Only, + TX_FFE_No_FFE, +}; +/* connector sizes in millimeters - from BiosParserTypes.hpp */ #define CONNECTOR_SIZE_DVI 40#define CONNECTOR_SIZE_VGA 32
drivers/gpu/drm/amd/display/include/grph_object_id.h +6 -0
@@ -184,6 +184,12 @@ enum engine_id {ENGINE_ID_DACA ,ENGINE_ID_DACB ,ENGINE_ID_VCE ,/* wireless display pseudo-encoder */ +ENGINE_ID_HPO_0 , +ENGINE_ID_HPO_1 , +ENGINE_ID_HPO_DP_0 , +ENGINE_ID_HPO_DP_1 , +ENGINE_ID_HPO_DP_2 , +ENGINE_ID_HPO_DP_3 ,ENGINE_ID_VIRTUAL , ENGINE_ID_COUNT,
Signature · 1 line
2.25.1
Re: [PATCH 2/6] drm/amd/display: Add DP 2.0 HPO Stream Encoder
Quoted 41 lines · Fangzhi Zuo
HW Blocks:
+--------+ +-----+ +------+ | OPTC | | HDA | | HUBP | +--------+ +-----+ +------+ | | | | | | HPO ====|==========|========|==== | | v | | | +-----+ | | | | APG | | | | +-----+ | | | | | v v v v +----------------------+ | HPO Stream Encoder | +----------------------+Signed-off-by Fangzhi Zuo <[email protected]>--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 35 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 761 ++++++++++++++++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 85 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 4 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + .../amd/display/dc/inc/hw/stream_encoder.h | 79 ++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 + .../amd/display/include/grph_object_defs.h | 10 + .../drm/amd/display/include/grph_object_id.h | 6 + 11 files changed, 1227 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.hdrivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +0
-0
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c void dcn10_log_hw_state(struct dc *dc, · line 469
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1
-0@@ -466,6 +466,41 @@ void dcn10_log_hw_state(struct dc *dc,log_mpc_crc (dc, log_ctx); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 )
CONFIG_DRM_AMD_DC_DCN3_1 was merged into CONFIG_DRM_AMD_DC_DCN a while ago. This check should be removed or changed to CONFIG_DRM_AMD_DC_DCN depending on the circumstances.
Alex
Re: [PATCH 2/6] drm/amd/display: Add DP 2.0 HPO Stream Encoder
In reply to Fangzhi ZuoQuoted 235 lines · Fangzhi Zuo
HW Blocks:
+--------+ +-----+ +------+ | OPTC | | HDA | | HUBP | +--------+ +-----+ +------+ | | | | | | HPO ====|==========|========|==== | | v | | | +-----+ | | | | APG | | | | +-----+ | | | | | v v v v +----------------------+ | HPO Stream Encoder | +----------------------+Signed-off-by Fangzhi Zuo <[email protected]>--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 35 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 761 ++++++++++++++++++ .../dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 85 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 4 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + .../amd/display/dc/inc/hw/stream_encoder.h | 79 ++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 + .../amd/display/include/grph_object_defs.h | 10 + .../drm/amd/display/include/grph_object_id.h | 6 + 11 files changed, 1227 insertions(+), 1 deletion(-)create mode 100644
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.ccreate mode 100644drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.hdrivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +35
-0@@ -466,6 +466,41 @@ void dcn10_log_hw_state(struct dc *dc,log_mpc_crc (dc, log_ctx); +#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) + { +int hpo_dp_link_enc_count =0 ; + +if (pool->hpo_dp_stream_enc_count >0 ) { +DTN_INFO ("DP HPO S_ENC: Enabled OTG Format Depth Vid SDP Compressed Link\n" ); +for (i =0 ; i < pool->hpo_dp_stream_enc_count; i++) { +struct hpo_dp_stream_encoder_state hpo_dp_se_state = {0 }; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc = pool->hpo_dp_stream_enc[i]; + +if (hpo_dp_stream_enc && hpo_dp_stream_enc->funcs->read_state) { + hpo_dp_stream_enc->funcs->read_state (hpo_dp_stream_enc, &hpo_dp_se_state); + +DTN_INFO ("[%d]: %d %d %6s %d %d %d %d %d\n" , + hpo_dp_stream_enc->id -ENGINE_ID_HPO_DP_0 , + hpo_dp_se_state.stream_enc_enabled, + hpo_dp_se_state.otg_inst, + (hpo_dp_se_state.pixel_encoding ==0 ) ?"4:4:4" : + ((hpo_dp_se_state.pixel_encoding ==1 ) ?"4:2:2" : + (hpo_dp_se_state.pixel_encoding ==2 ) ?"4:2:0" :"Y-Only" ), + (hpo_dp_se_state.component_depth ==0 ) ?6 : + ((hpo_dp_se_state.component_depth ==1 ) ?8 : + (hpo_dp_se_state.component_depth ==2 ) ?10 :12 ), + hpo_dp_se_state.vid_stream_enabled, + hpo_dp_se_state.sdp_enabled, + hpo_dp_se_state.compressed_format, + hpo_dp_se_state.mapped_to_link_enc); + } + } + +DTN_INFO ("\n" ); + } + } +#endif +DTN_INFO_END (); }drivers/gpu/drm/amd/display/dc/dcn31/Makefile +1
-1@@ -12,7 +12,7 @@ DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o \ dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ - dcn31_apg.o + dcn31_apg.o dcn31_hpo_dp_stream_encoder.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -mssedrivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c new file +135
-0@@ -0,0 +1,761 @@ +/* +* Copyright 2019 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#include "dc_bios_types.h" +#include "dcn31_hpo_dp_stream_encoder.h" +#include "reg_helper.h" +#include "dc_link.h" + +#define DC_LOGGER \ + enc3->base.ctx->logger + +#define REG (reg)\ + (enc3->regs->reg) + +#undef FN +#define FN (reg_name, field_name) \ + enc3->hpo_se_shift->field_name, enc3->hpo_se_mask->field_name + +#define CTX \ + enc3->base.ctx + + +enum dp2_pixel_encoding { +DP_SYM32_ENC_PIXEL_ENCODING_RGB_YCBCR444 , +DP_SYM32_ENC_PIXEL_ENCODING_YCBCR422 , +DP_SYM32_ENC_PIXEL_ENCODING_YCBCR420 , +DP_SYM32_ENC_PIXEL_ENCODING_Y_ONLY +}; + +enum dp2_uncompressed_component_depth { +DP_SYM32_ENC_COMPONENT_DEPTH_6BPC , +DP_SYM32_ENC_COMPONENT_DEPTH_8BPC , +DP_SYM32_ENC_COMPONENT_DEPTH_10BPC , +DP_SYM32_ENC_COMPONENT_DEPTH_12BPC +}; + + +static void dcn31_hpo_dp_stream_enc_enable_stream ( +struct hpo_dp_stream_encoder *enc) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Enable all clocks in the DP_STREAM_ENC */ +REG_UPDATE (DP_STREAM_ENC_CLOCK_CONTROL , +DP_STREAM_ENC_CLOCK_EN ,1 ); + +/* Assert reset to the DP_SYM32_ENC logic */ +REG_UPDATE (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_RESET ,1 ); +/* Wait for reset to complete (to assert) */ +REG_WAIT (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_RESET_DONE ,1 , +1 ,10 ); + +/* De-assert reset to the DP_SYM32_ENC logic */ +REG_UPDATE (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_RESET ,0 ); +/* Wait for reset to de-assert */ +REG_WAIT (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_RESET_DONE ,0 , +1 ,10 ); + +/* Enable idle pattern generation */ +REG_UPDATE (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_ENABLE ,1 ); +} + +static void dcn31_hpo_dp_stream_enc_dp_unblank ( +struct hpo_dp_stream_encoder *enc, +uint32_t stream_source) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Set the input mux for video stream source */ +REG_UPDATE (DP_STREAM_ENC_INPUT_MUX_CONTROL , +DP_STREAM_ENC_INPUT_MUX_PIXEL_STREAM_SOURCE_SEL , stream_source); + +/* Enable video transmission in main framer */ +REG_UPDATE (DP_SYM32_ENC_VID_STREAM_CONTROL , +VID_STREAM_ENABLE ,1 ); + +/* Reset and Enable Pixel to Symbol FIFO */ +REG_UPDATE (DP_SYM32_ENC_VID_FIFO_CONTROL , +PIXEL_TO_SYMBOL_FIFO_RESET ,1 ); +REG_WAIT (DP_SYM32_ENC_VID_FIFO_CONTROL , +PIXEL_TO_SYMBOL_FIFO_RESET_DONE ,1 , +1 ,10 ); +REG_UPDATE (DP_SYM32_ENC_VID_FIFO_CONTROL , +PIXEL_TO_SYMBOL_FIFO_RESET ,0 ); +REG_WAIT (DP_SYM32_ENC_VID_FIFO_CONTROL ,/* Disable Clock Ramp Adjuster FIFO */ +PIXEL_TO_SYMBOL_FIFO_RESET_DONE ,0 , +1 ,10 ); +REG_UPDATE (DP_SYM32_ENC_VID_FIFO_CONTROL , +PIXEL_TO_SYMBOL_FIFO_ENABLE ,1 ); + +/* Reset and Enable Clock Ramp Adjuster FIFO */ +REG_UPDATE (DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0 , +FIFO_RESET ,1 ); +REG_WAIT (DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0 , +FIFO_RESET_DONE ,1 , +1 ,10 ); +REG_UPDATE (DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0 , +FIFO_RESET ,0 ); +REG_WAIT (DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0 , +FIFO_RESET_DONE ,0 , +1 ,10 ); + +/* For Debug -- Enable CRC */ +REG_UPDATE_2 (DP_SYM32_ENC_VID_CRC_CONTROL , +CRC_ENABLE ,1 , +CRC_CONT_MODE_ENABLE ,1 ); + +#ifdef DIAGS_BUILD
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c line 145
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c new file +10
-0+/* Workaround for FPGA HPO capture DP link data: +* HPO capture will enable FIFO at same time as starting capture +* This workaround is required to get a capture from start of frame +*/ +if (IS_FPGA_MAXIMUS_DC (enc->ctx->dce_environment)) { +if (enc->ctx->dc->debug.fpga_hpo_capture_en) { +return ; + } + } +#endif
This chunk of code should be removed, it'll never be defined upstream.
Quoted 1,191 lines
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c new file +616
-0+ +REG_UPDATE (DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0 , +FIFO_ENABLE ,1 ); +} + +static void dcn31_hpo_dp_stream_enc_dp_blank ( +struct hpo_dp_stream_encoder *enc) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Disable video transmission */ +REG_UPDATE (DP_SYM32_ENC_VID_STREAM_CONTROL , +VID_STREAM_ENABLE ,0 ); + +/* Wait for video stream transmission disabled +* Larger delay to wait until VBLANK - use max retry of +* 10us*5000=50ms. This covers 41.7ms of minimum 24 Hz mode + +* a little more because we may not trust delay accuracy. +*/ +//REG_WAIT(DP_SYM32_ENC_VID_STREAM_CONTROL, +// VID_STREAM_STATUS, 0, +// 10, 5000); + +/* Disable SDP tranmission */ +REG_UPDATE (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE ,0 ); + +/* Disable Pixel to Symbol FIFO */ +REG_UPDATE (DP_SYM32_ENC_VID_FIFO_CONTROL , +PIXEL_TO_SYMBOL_FIFO_ENABLE ,0 ); + +/* Disable Clock Ramp Adjuster FIFO */ +REG_UPDATE (DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0 , +FIFO_ENABLE ,0 ); +} + +static void dcn31_hpo_dp_stream_enc_disable ( +struct hpo_dp_stream_encoder *enc) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Disable DP_SYM32_ENC */ +REG_UPDATE (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_ENABLE ,0 ); + +/* Disable clocks in the DP_STREAM_ENC */ +REG_UPDATE (DP_STREAM_ENC_CLOCK_CONTROL , +DP_STREAM_ENC_CLOCK_EN ,0 ); +} + +static void dcn31_hpo_dp_stream_enc_set_stream_attribute ( +struct hpo_dp_stream_encoder *enc, +struct dc_crtc_timing *crtc_timing, +enum dc_color_space output_color_space, +bool use_vsc_sdp_for_colorimetry, +bool compressed_format, +bool double_buffer_en) +{ +enum dp2_pixel_encoding pixel_encoding; +enum dp2_uncompressed_component_depth component_depth; +uint32_t h_active_start; +uint32_t v_active_start; +uint32_t h_blank; +uint32_t h_back_porch; +uint32_t h_width; +uint32_t v_height; +unsigned long long v_freq; +uint8_t misc0 =0 ; +uint8_t misc1 =0 ; +uint8_t hsp; +uint8_t vsp; + +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); +struct dc_crtc_timing hw_crtc_timing = *crtc_timing; + +/* MISC0[0] = 0 video and link clocks are asynchronous +* MISC1[0] = 0 interlace not supported +* MISC1[2:1] = 0 stereo field is handled by hardware +* MISC1[5:3] = 0 Reserved +*/ + +/* Interlaced not supported */ +if (hw_crtc_timing.flags.INTERLACE) { +BREAK_TO_DEBUGGER (); + } + +/* Double buffer enable for MSA and pixel format registers +* Only double buffer for changing stream attributes for active streams +* Do not double buffer when initially enabling a stream +*/ +REG_UPDATE (DP_SYM32_ENC_VID_MSA_DOUBLE_BUFFER_CONTROL , +MSA_DOUBLE_BUFFER_ENABLE , double_buffer_en); +REG_UPDATE (DP_SYM32_ENC_VID_PIXEL_FORMAT_DOUBLE_BUFFER_CONTROL , +PIXEL_FORMAT_DOUBLE_BUFFER_ENABLE , double_buffer_en); + +/* Pixel Encoding */ +switch (hw_crtc_timing.pixel_encoding) { +case PIXEL_ENCODING_YCBCR422 : + pixel_encoding =DP_SYM32_ENC_PIXEL_ENCODING_YCBCR422 ; + misc0 = misc0 |0x2 ;// MISC0[2:1] = 01 +break ; +case PIXEL_ENCODING_YCBCR444 : + pixel_encoding =DP_SYM32_ENC_PIXEL_ENCODING_RGB_YCBCR444 ; + misc0 = misc0 |0x4 ;// MISC0[2:1] = 10 + +if (hw_crtc_timing.flags.Y_ONLY) { + pixel_encoding =DP_SYM32_ENC_PIXEL_ENCODING_Y_ONLY ; +if (hw_crtc_timing.display_color_depth !=COLOR_DEPTH_666 ) { +/* HW testing only, no use case yet. +* Color depth of Y-only could be +* 8, 10, 12, 16 bits +*/ + misc1 = misc1 |0x80 ;// MISC1[7] = 1 + } + } +break ; +case PIXEL_ENCODING_YCBCR420 : + pixel_encoding =DP_SYM32_ENC_PIXEL_ENCODING_YCBCR420 ; + misc1 = misc1 |0x40 ;// MISC1[6] = 1 +break ; +case PIXEL_ENCODING_RGB : +default : + pixel_encoding =DP_SYM32_ENC_PIXEL_ENCODING_RGB_YCBCR444 ; +break ; + } + +/* For YCbCr420 and BT2020 Colorimetry Formats, VSC SDP shall be used. +* When MISC1, bit 6, is Set to 1, a Source device uses a VSC SDP to indicate the +* Pixel Encoding/Colorimetry Format and that a Sink device shall ignore MISC1, bit 7, +* and MISC0, bits 7:1 (MISC1, bit 7, and MISC0, bits 7:1, become "don't care"). +*/ +if (use_vsc_sdp_for_colorimetry) + misc1 = misc1 |0x40 ; +else + misc1 = misc1 & ~0x40 ; + +/* Color depth */ +switch (hw_crtc_timing.display_color_depth) { +case COLOR_DEPTH_666 : + component_depth =DP_SYM32_ENC_COMPONENT_DEPTH_6BPC ; +// MISC0[7:5] = 000 +break ; +case COLOR_DEPTH_888 : + component_depth =DP_SYM32_ENC_COMPONENT_DEPTH_8BPC ; + misc0 = misc0 |0x20 ;// MISC0[7:5] = 001 +break ; +case COLOR_DEPTH_101010 : + component_depth =DP_SYM32_ENC_COMPONENT_DEPTH_10BPC ; + misc0 = misc0 |0x40 ;// MISC0[7:5] = 010 +break ; +case COLOR_DEPTH_121212 : + component_depth =DP_SYM32_ENC_COMPONENT_DEPTH_12BPC ; + misc0 = misc0 |0x60 ;// MISC0[7:5] = 011 +break ; +default : + component_depth =DP_SYM32_ENC_COMPONENT_DEPTH_6BPC ; +break ; + } + +REG_UPDATE_3 (DP_SYM32_ENC_VID_PIXEL_FORMAT , +PIXEL_ENCODING_TYPE , compressed_format, +UNCOMPRESSED_PIXEL_ENCODING , pixel_encoding, +UNCOMPRESSED_COMPONENT_DEPTH , component_depth); + +switch (output_color_space) { +case COLOR_SPACE_SRGB : + misc1 = misc1 & ~0x80 ;/* bit7 = 0*/ +break ; +case COLOR_SPACE_SRGB_LIMITED : + misc0 = misc0 |0x8 ;/* bit3=1 */ + misc1 = misc1 & ~0x80 ;/* bit7 = 0*/ +break ; +case COLOR_SPACE_YCBCR601 : +case COLOR_SPACE_YCBCR601_LIMITED : + misc0 = misc0 |0x8 ;/* bit3=1, bit4=0 */ + misc1 = misc1 & ~0x80 ;/* bit7 = 0*/ +if (hw_crtc_timing.pixel_encoding ==PIXEL_ENCODING_YCBCR422 ) + misc0 = misc0 |0x2 ;/* bit2=0, bit1=1 */ +else if (hw_crtc_timing.pixel_encoding ==PIXEL_ENCODING_YCBCR444 ) + misc0 = misc0 |0x4 ;/* bit2=1, bit1=0 */ +break ; +case COLOR_SPACE_YCBCR709 : +case COLOR_SPACE_YCBCR709_LIMITED : + misc0 = misc0 |0x18 ;/* bit3=1, bit4=1 */ + misc1 = misc1 & ~0x80 ;/* bit7 = 0*/ +if (hw_crtc_timing.pixel_encoding ==PIXEL_ENCODING_YCBCR422 ) + misc0 = misc0 |0x2 ;/* bit2=0, bit1=1 */ +else if (hw_crtc_timing.pixel_encoding ==PIXEL_ENCODING_YCBCR444 ) + misc0 = misc0 |0x4 ;/* bit2=1, bit1=0 */ +break ; +case COLOR_SPACE_2020_RGB_LIMITEDRANGE : +case COLOR_SPACE_2020_RGB_FULLRANGE : +case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_XR_RGB : +case COLOR_SPACE_MSREF_SCRGB : +case COLOR_SPACE_ADOBERGB : +case COLOR_SPACE_DCIP3 : +case COLOR_SPACE_XV_YCC_709 : +case COLOR_SPACE_XV_YCC_601 : +case COLOR_SPACE_DISPLAYNATIVE : +case COLOR_SPACE_DOLBYVISION : +case COLOR_SPACE_APPCTRL : +case COLOR_SPACE_CUSTOMPOINTS : +case COLOR_SPACE_UNKNOWN : +case COLOR_SPACE_YCBCR709_BLACK : +/* do nothing */ +break ; + } + +/* calculate from vesa timing parameters +* h_active_start related to leading edge of sync +*/ + h_blank = hw_crtc_timing.h_total - hw_crtc_timing.h_border_left - + hw_crtc_timing.h_addressable - hw_crtc_timing.h_border_right; + + h_back_porch = h_blank - hw_crtc_timing.h_front_porch - + hw_crtc_timing.h_sync_width; + +/* start at beginning of left border */ + h_active_start = hw_crtc_timing.h_sync_width + h_back_porch; + + v_active_start = hw_crtc_timing.v_total - hw_crtc_timing.v_border_top - + hw_crtc_timing.v_addressable - hw_crtc_timing.v_border_bottom - + hw_crtc_timing.v_front_porch; + + h_width = hw_crtc_timing.h_border_left + hw_crtc_timing.h_addressable + hw_crtc_timing.h_border_right; + v_height = hw_crtc_timing.v_border_top + hw_crtc_timing.v_addressable + hw_crtc_timing.v_border_bottom; + hsp = hw_crtc_timing.flags.HSYNC_POSITIVE_POLARITY ?0x80 :0 ; + vsp = hw_crtc_timing.flags.VSYNC_POSITIVE_POLARITY ?0x80 :0 ; + v_freq = hw_crtc_timing.pix_clk_100hz *100 ; + +/* MSA Packet Mapping to 32-bit Link Symbols - DP2 spec, section 2.7.4.1 +* +* Lane 0 Lane 1 Lane 2 Lane 3 +* MSA[0] = { 0, 0, 0, VFREQ[47:40]} +* MSA[1] = { 0, 0, 0, VFREQ[39:32]} +* MSA[2] = { 0, 0, 0, VFREQ[31:24]} +* MSA[3] = { HTotal[15:8], HStart[15:8], HWidth[15:8], VFREQ[23:16]} +* MSA[4] = { HTotal[ 7:0], HStart[ 7:0], HWidth[ 7:0], VFREQ[15: 8]} +* MSA[5] = { VTotal[15:8], VStart[15:8], VHeight[15:8], VFREQ[ 7: 0]} +* MSA[6] = { VTotal[ 7:0], VStart[ 7:0], VHeight[ 7:0], MISC0[ 7: 0]} +* MSA[7] = { HSP|HSW[14:8], VSP|VSW[14:8], 0, MISC1[ 7: 0]} +* MSA[8] = { HSW[ 7:0], VSW[ 7:0], 0, 0} +*/ +REG_SET_4 (DP_SYM32_ENC_VID_MSA0 ,0 , +MSA_DATA_LANE_0 ,0 , +MSA_DATA_LANE_1 ,0 , +MSA_DATA_LANE_2 ,0 , +MSA_DATA_LANE_3 , v_freq >>40 ); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA1 ,0 , +MSA_DATA_LANE_0 ,0 , +MSA_DATA_LANE_1 ,0 , +MSA_DATA_LANE_2 ,0 , +MSA_DATA_LANE_3 , (v_freq >>32 ) &0xff ); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA2 ,0 , +MSA_DATA_LANE_0 ,0 , +MSA_DATA_LANE_1 ,0 , +MSA_DATA_LANE_2 ,0 , +MSA_DATA_LANE_3 , (v_freq >>24 ) &0xff ); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA3 ,0 , +MSA_DATA_LANE_0 , hw_crtc_timing.h_total >>8 , +MSA_DATA_LANE_1 , h_active_start >>8 , +MSA_DATA_LANE_2 , h_width >>8 , +MSA_DATA_LANE_3 , (v_freq >>16 ) &0xff ); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA4 ,0 , +MSA_DATA_LANE_0 , hw_crtc_timing.h_total &0xff , +MSA_DATA_LANE_1 , h_active_start &0xff , +MSA_DATA_LANE_2 , h_width &0xff , +MSA_DATA_LANE_3 , (v_freq >>8 ) &0xff ); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA5 ,0 , +MSA_DATA_LANE_0 , hw_crtc_timing.v_total >>8 , +MSA_DATA_LANE_1 , v_active_start >>8 , +MSA_DATA_LANE_2 , v_height >>8 , +MSA_DATA_LANE_3 , v_freq &0xff ); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA6 ,0 , +MSA_DATA_LANE_0 , hw_crtc_timing.v_total &0xff , +MSA_DATA_LANE_1 , v_active_start &0xff , +MSA_DATA_LANE_2 , v_height &0xff , +MSA_DATA_LANE_3 , misc0); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA7 ,0 , +MSA_DATA_LANE_0 , hsp | (hw_crtc_timing.h_sync_width >>8 ), +MSA_DATA_LANE_1 , vsp | (hw_crtc_timing.v_sync_width >>8 ), +MSA_DATA_LANE_2 ,0 , +MSA_DATA_LANE_3 , misc1); + +REG_SET_4 (DP_SYM32_ENC_VID_MSA8 ,0 , +MSA_DATA_LANE_0 , hw_crtc_timing.h_sync_width &0xff , +MSA_DATA_LANE_1 , hw_crtc_timing.v_sync_width &0xff , +MSA_DATA_LANE_2 ,0 , +MSA_DATA_LANE_3 ,0 ); +} + +static void dcn31_hpo_dp_stream_enc_update_dp_info_packets ( +struct hpo_dp_stream_encoder *enc, +const struct encoder_info_frame *info_frame) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); +uint32_t dmdata_packet_enabled =0 ; +bool sdp_stream_enable = false; + +if (info_frame->vsc.valid) { + enc->vpg->funcs->update_generic_info_packet ( + enc->vpg, +0 ,/* packetIndex */ + &info_frame->vsc); + sdp_stream_enable = true; + } +if (info_frame->spd.valid) { + enc->vpg->funcs->update_generic_info_packet ( + enc->vpg, +2 ,/* packetIndex */ + &info_frame->spd); + sdp_stream_enable = true; + } +if (info_frame->hdrsmd.valid) { + enc->vpg->funcs->update_generic_info_packet ( + enc->vpg, +3 ,/* packetIndex */ + &info_frame->hdrsmd); + sdp_stream_enable = true; + } +/* enable/disable transmission of packet(s). +* If enabled, packet transmission begins on the next frame +*/ +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL0 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , info_frame->vsc.valid); +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL2 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , info_frame->spd.valid); +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL3 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , info_frame->hdrsmd.valid); + +/* check if dynamic metadata packet transmission is enabled */ +REG_GET (DP_SYM32_ENC_SDP_METADATA_PACKET_CONTROL , +METADATA_PACKET_ENABLE , &dmdata_packet_enabled); + +/* Enable secondary data path */ +REG_UPDATE (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE ,1 ); +} + +static void dcn31_hpo_dp_stream_enc_stop_dp_info_packets ( +struct hpo_dp_stream_encoder *enc) +{ +/* stop generic packets on DP */ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); +uint32_t asp_enable =0 ; +uint32_t atp_enable =0 ; +uint32_t aip_enable =0 ; +uint32_t acm_enable =0 ; + +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL0 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE ,0 ); +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL2 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE ,0 ); +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL3 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE ,0 ); + +/* Disable secondary data path if audio is also disabled */ +REG_GET_4 (DP_SYM32_ENC_SDP_AUDIO_CONTROL0 , +ASP_ENABLE , &asp_enable, +ATP_ENABLE , &atp_enable, +AIP_ENABLE , &aip_enable, +ACM_ENABLE , &acm_enable); +if (!(asp_enable || atp_enable || aip_enable || acm_enable)) +REG_UPDATE (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE ,0 ); +} + +static uint32_t hpo_dp_is_gsp_enabled ( +struct hpo_dp_stream_encoder *enc) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); +uint32_t gsp0_enabled =0 ; +uint32_t gsp2_enabled =0 ; +uint32_t gsp3_enabled =0 ; +uint32_t gsp11_enabled =0 ; + +REG_GET (DP_SYM32_ENC_SDP_GSP_CONTROL0 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , &gsp0_enabled); +REG_GET (DP_SYM32_ENC_SDP_GSP_CONTROL2 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , &gsp2_enabled); +REG_GET (DP_SYM32_ENC_SDP_GSP_CONTROL3 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , &gsp3_enabled); +REG_GET (DP_SYM32_ENC_SDP_GSP_CONTROL11 ,GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE , &gsp11_enabled); + +return (gsp0_enabled || gsp2_enabled || gsp3_enabled || gsp11_enabled); +} + +static void dcn31_hpo_dp_stream_enc_set_dsc_pps_info_packet ( +struct hpo_dp_stream_encoder *enc, +bool enable, +uint8_t *dsc_packed_pps) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +if (enable) { +struct dc_info_packet pps_sdp; +int i; + +/* Configure for PPS packet size (128 bytes) */ +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL11 , +GSP_PAYLOAD_SIZE ,3 ); + +/* Load PPS into infoframe (SDP) registers */ + pps_sdp.valid = true; + pps_sdp.hb0 =0 ; + pps_sdp.hb1 =DC_DP_INFOFRAME_TYPE_PPS ; + pps_sdp.hb2 =127 ; + pps_sdp.hb3 =0 ; + +for (i =0 ; i <4 ; i++) { +memcpy (pps_sdp.sb, &dsc_packed_pps[i *32 ],32 ); + enc3->base.vpg->funcs->update_generic_info_packet ( + enc3->base.vpg, +11 + i, + &pps_sdp); + } + +/* SW should make sure VBID[6] update line number is bigger +* than PPS transmit line number +*/ +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL11 , +GSP_TRANSMISSION_LINE_NUMBER ,2 ); + +REG_UPDATE_2 (DP_SYM32_ENC_VID_VBID_CONTROL , +VBID_6_COMPRESSEDSTREAM_FLAG_SOF_REFERENCE ,0 , +VBID_6_COMPRESSEDSTREAM_FLAG_LINE_NUMBER ,3 ); + +/* Send PPS data at the line number specified above. */ +REG_UPDATE (DP_SYM32_ENC_SDP_GSP_CONTROL11 , +GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE ,1 ); +REG_UPDATE (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE ,1 ); + }else { +/* Disable Generic Stream Packet 11 (GSP) transmission */ +REG_UPDATE_2 (DP_SYM32_ENC_SDP_GSP_CONTROL11 , +GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE ,0 , +GSP_PAYLOAD_SIZE ,0 ); + } +} + +static void dcn31_hpo_dp_stream_enc_map_stream_to_link ( +struct hpo_dp_stream_encoder *enc, +uint32_t stream_enc_inst, +uint32_t link_enc_inst) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +ASSERT (stream_enc_inst <4 && link_enc_inst <2 ); + +switch (stream_enc_inst) { +case 0 : +REG_UPDATE (DP_STREAM_MAPPER_CONTROL0 , +DP_STREAM_LINK_TARGET , link_enc_inst); +break ; +case 1 : +REG_UPDATE (DP_STREAM_MAPPER_CONTROL1 , +DP_STREAM_LINK_TARGET , link_enc_inst); +break ; +case 2 : +REG_UPDATE (DP_STREAM_MAPPER_CONTROL2 , +DP_STREAM_LINK_TARGET , link_enc_inst); +break ; +case 3 : +REG_UPDATE (DP_STREAM_MAPPER_CONTROL3 , +DP_STREAM_LINK_TARGET , link_enc_inst); +break ; + } +} + +static void dcn31_hpo_dp_stream_enc_mute_control ( +struct hpo_dp_stream_encoder *enc, +bool mute) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +ASSERT (enc->apg); + enc->apg->funcs->audio_mute_control (enc->apg, mute); +} + +static void dcn31_hpo_dp_stream_enc_audio_setup ( +struct hpo_dp_stream_encoder *enc, +unsigned int az_inst, +struct audio_info *info) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Set the input mux for video stream source */ +REG_UPDATE (DP_STREAM_ENC_AUDIO_CONTROL , +DP_STREAM_ENC_INPUT_MUX_AUDIO_STREAM_SOURCE_SEL , az_inst); + +ASSERT (enc->apg); + enc->apg->funcs->se_audio_setup (enc->apg, az_inst, info); +} + +static void dcn31_hpo_dp_stream_enc_audio_enable ( +struct hpo_dp_stream_encoder *enc) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Enable Audio packets */ +REG_UPDATE (DP_SYM32_ENC_SDP_AUDIO_CONTROL0 ,ASP_ENABLE ,1 ); + +/* Program the ATP and AIP next */ +REG_UPDATE_2 (DP_SYM32_ENC_SDP_AUDIO_CONTROL0 , +ATP_ENABLE ,1 , +AIP_ENABLE ,1 ); + +/* Enable secondary data path */ +REG_UPDATE (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE ,1 ); + +/* Enable APG block */ + enc->apg->funcs->enable_apg (enc->apg); +} + +static void dcn31_hpo_dp_stream_enc_audio_disable ( +struct hpo_dp_stream_encoder *enc) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +/* Disable Audio packets */ +REG_UPDATE_4 (DP_SYM32_ENC_SDP_AUDIO_CONTROL0 , +ASP_ENABLE ,0 , +ATP_ENABLE ,0 , +AIP_ENABLE ,0 , +ACM_ENABLE ,0 ); + +/* Disable STP Stream Enable if other SDP GSP are also disabled */ +if (!(hpo_dp_is_gsp_enabled (enc))) +REG_UPDATE (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE ,0 ); + +/* Disable APG block */ + enc->apg->funcs->disable_apg (enc->apg); +} + +static void dcn31_hpo_dp_stream_enc_read_state ( +struct hpo_dp_stream_encoder *enc, +struct hpo_dp_stream_encoder_state *s) +{ +struct dcn31_hpo_dp_stream_encoder *enc3 =DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (enc); + +REG_GET (DP_SYM32_ENC_CONTROL , +DP_SYM32_ENC_ENABLE , &s->stream_enc_enabled); +REG_GET (DP_SYM32_ENC_VID_STREAM_CONTROL , +VID_STREAM_ENABLE , &s->vid_stream_enabled); +REG_GET (DP_STREAM_ENC_INPUT_MUX_CONTROL , +DP_STREAM_ENC_INPUT_MUX_PIXEL_STREAM_SOURCE_SEL , &s->otg_inst); + +REG_GET_3 (DP_SYM32_ENC_VID_PIXEL_FORMAT , +PIXEL_ENCODING_TYPE , &s->compressed_format, +UNCOMPRESSED_PIXEL_ENCODING , &s->pixel_encoding, +UNCOMPRESSED_COMPONENT_DEPTH , &s->component_depth); + +REG_GET (DP_SYM32_ENC_SDP_CONTROL , +SDP_STREAM_ENABLE , &s->sdp_enabled); + +switch (enc->inst) { +case 0 : +REG_GET (DP_STREAM_MAPPER_CONTROL0 , +DP_STREAM_LINK_TARGET , &s->mapped_to_link_enc); +break ; +case 1 : +REG_GET (DP_STREAM_MAPPER_CONTROL1 , +DP_STREAM_LINK_TARGET , &s->mapped_to_link_enc); +break ; +case 2 : +REG_GET (DP_STREAM_MAPPER_CONTROL2 , +DP_STREAM_LINK_TARGET , &s->mapped_to_link_enc); +break ; +case 3 : +REG_GET (DP_STREAM_MAPPER_CONTROL3 , +DP_STREAM_LINK_TARGET , &s->mapped_to_link_enc); +break ; + } +} + +static const struct hpo_dp_stream_encoder_funcs dcn30_str_enc_funcs = { + .enable_stream = dcn31_hpo_dp_stream_enc_enable_stream, + .dp_unblank = dcn31_hpo_dp_stream_enc_dp_unblank, + .dp_blank = dcn31_hpo_dp_stream_enc_dp_blank, + .disable = dcn31_hpo_dp_stream_enc_disable, + .set_stream_attribute = dcn31_hpo_dp_stream_enc_set_stream_attribute, + .update_dp_info_packets = dcn31_hpo_dp_stream_enc_update_dp_info_packets, + .stop_dp_info_packets = dcn31_hpo_dp_stream_enc_stop_dp_info_packets, + .dp_set_dsc_pps_info_packet = dcn31_hpo_dp_stream_enc_set_dsc_pps_info_packet, + .map_stream_to_link = dcn31_hpo_dp_stream_enc_map_stream_to_link, + .audio_mute_control = dcn31_hpo_dp_stream_enc_mute_control, + .dp_audio_setup = dcn31_hpo_dp_stream_enc_audio_setup, + .dp_audio_enable = dcn31_hpo_dp_stream_enc_audio_enable, + .dp_audio_disable = dcn31_hpo_dp_stream_enc_audio_disable, + .read_state = dcn31_hpo_dp_stream_enc_read_state, +}; + +void dcn31_hpo_dp_stream_encoder_construct ( +struct dcn31_hpo_dp_stream_encoder *enc3, +struct dc_context *ctx, +struct dc_bios *bp, +uint32_t inst, +enum engine_id eng_id, +struct vpg *vpg, +struct apg *apg, +const struct dcn31_hpo_dp_stream_encoder_registers *regs, +const struct dcn31_hpo_dp_stream_encoder_shift *hpo_se_shift, +const struct dcn31_hpo_dp_stream_encoder_mask *hpo_se_mask) +{ + enc3->base.funcs = &dcn30_str_enc_funcs; + enc3->base.ctx = ctx; + enc3->base.inst = inst; + enc3->base.id = eng_id; + enc3->base.bp = bp; + enc3->base.vpg = vpg; + enc3->base.apg = apg; + enc3->regs = regs; + enc3->hpo_se_shift = hpo_se_shift; + enc3->hpo_se_mask = hpo_se_mask; +}drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h new file +241
-0@@ -0,0 +1,241 @@ +/* +* Copyright 2019 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#ifndef __DAL_DCN31_HPO_DP_STREAM_ENCODER_H__ +#define __DAL_DCN31_HPO_DP_STREAM_ENCODER_H__ + +#include "dcn30/dcn30_vpg.h" +#include "dcn31/dcn31_apg.h" +#include "stream_encoder.h" + + +#define DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (hpo_dp_stream_encoder)\ + container_of(hpo_dp_stream_encoder, struct dcn31_hpo_dp_stream_encoder, base) + + +/* Define MSA_DATA_LANE_[0-3] fields to make programming easier */ +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_0__SHIFT 0x0 +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_1__SHIFT 0x8 +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_2__SHIFT 0x10 +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_3__SHIFT 0x18 +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_0_MASK 0x000000FFL +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_1_MASK 0x0000FF00L +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_2_MASK 0x00FF0000L +#define DP_SYM32_ENC_VID_MSA__MSA_DATA_LANE_3_MASK 0xFF000000L + + +#define DCN3_1_HPO_DP_STREAM_ENC_REG_LIST (id) \ + SR(DP_STREAM_MAPPER_CONTROL0),\ + SR(DP_STREAM_MAPPER_CONTROL1),\ + SR(DP_STREAM_MAPPER_CONTROL2),\ + SR(DP_STREAM_MAPPER_CONTROL3),\ + SRI(DP_STREAM_ENC_CLOCK_CONTROL, DP_STREAM_ENC, id),\ + SRI(DP_STREAM_ENC_INPUT_MUX_CONTROL, DP_STREAM_ENC, id),\ + SRI(DP_STREAM_ENC_AUDIO_CONTROL, DP_STREAM_ENC, id),\ + SRI(DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0, DP_STREAM_ENC, id),\ + SRI(DP_SYM32_ENC_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_PIXEL_FORMAT, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_PIXEL_FORMAT_DOUBLE_BUFFER_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA0, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA1, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA2, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA3, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA4, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA5, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA6, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA7, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA8, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_MSA_DOUBLE_BUFFER_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_FIFO_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_STREAM_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_VBID_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_GSP_CONTROL0, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_GSP_CONTROL2, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_GSP_CONTROL3, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_GSP_CONTROL5, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_GSP_CONTROL11, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_METADATA_PACKET_CONTROL, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_SDP_AUDIO_CONTROL0, DP_SYM32_ENC, id),\ + SRI(DP_SYM32_ENC_VID_CRC_CONTROL, DP_SYM32_ENC, id) + +#define DCN3_1_HPO_DP_STREAM_ENC_REGS \ + uint32_t DP_STREAM_MAPPER_CONTROL0;\ + uint32_t DP_STREAM_MAPPER_CONTROL1;\ + uint32_t DP_STREAM_MAPPER_CONTROL2;\ + uint32_t DP_STREAM_MAPPER_CONTROL3;\ + uint32_t DP_STREAM_ENC_CLOCK_CONTROL;\ + uint32_t DP_STREAM_ENC_INPUT_MUX_CONTROL;\ + uint32_t DP_STREAM_ENC_AUDIO_CONTROL;\ + uint32_t DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0;\ + uint32_t DP_SYM32_ENC_CONTROL;\ + uint32_t DP_SYM32_ENC_VID_PIXEL_FORMAT;\ + uint32_t DP_SYM32_ENC_VID_PIXEL_FORMAT_DOUBLE_BUFFER_CONTROL;\ + uint32_t DP_SYM32_ENC_VID_MSA0;\ + uint32_t DP_SYM32_ENC_VID_MSA1;\ + uint32_t DP_SYM32_ENC_VID_MSA2;\ + uint32_t DP_SYM32_ENC_VID_MSA3;\ + uint32_t DP_SYM32_ENC_VID_MSA4;\ + uint32_t DP_SYM32_ENC_VID_MSA5;\ + uint32_t DP_SYM32_ENC_VID_MSA6;\ + uint32_t DP_SYM32_ENC_VID_MSA7;\ + uint32_t DP_SYM32_ENC_VID_MSA8;\ + uint32_t DP_SYM32_ENC_VID_MSA_CONTROL;\ + uint32_t DP_SYM32_ENC_VID_MSA_DOUBLE_BUFFER_CONTROL;\ + uint32_t DP_SYM32_ENC_VID_FIFO_CONTROL;\ + uint32_t DP_SYM32_ENC_VID_STREAM_CONTROL;\ + uint32_t DP_SYM32_ENC_VID_VBID_CONTROL;\ + uint32_t DP_SYM32_ENC_SDP_CONTROL;\ + uint32_t DP_SYM32_ENC_SDP_GSP_CONTROL0;\ + uint32_t DP_SYM32_ENC_SDP_GSP_CONTROL2;\ + uint32_t DP_SYM32_ENC_SDP_GSP_CONTROL3;\ + uint32_t DP_SYM32_ENC_SDP_GSP_CONTROL5;\ + uint32_t DP_SYM32_ENC_SDP_GSP_CONTROL11;\ + uint32_t DP_SYM32_ENC_SDP_METADATA_PACKET_CONTROL;\ + uint32_t DP_SYM32_ENC_SDP_AUDIO_CONTROL0;\ + uint32_t DP_SYM32_ENC_VID_CRC_CONTROL + + +#define DCN3_1_HPO_DP_STREAM_ENC_MASK_SH_LIST (mask_sh)\ + SE_SF(DP_STREAM_MAPPER_CONTROL0, DP_STREAM_LINK_TARGET, mask_sh),\ + SE_SF(DP_STREAM_ENC0_DP_STREAM_ENC_CLOCK_CONTROL, DP_STREAM_ENC_CLOCK_EN, mask_sh),\ + SE_SF(DP_STREAM_ENC0_DP_STREAM_ENC_INPUT_MUX_CONTROL, DP_STREAM_ENC_INPUT_MUX_PIXEL_STREAM_SOURCE_SEL, mask_sh),\ + SE_SF(DP_STREAM_ENC0_DP_STREAM_ENC_AUDIO_CONTROL, DP_STREAM_ENC_INPUT_MUX_AUDIO_STREAM_SOURCE_SEL, mask_sh),\ + SE_SF(DP_STREAM_ENC0_DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0, FIFO_RESET, mask_sh),\ + SE_SF(DP_STREAM_ENC0_DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0, FIFO_RESET_DONE, mask_sh),\ + SE_SF(DP_STREAM_ENC0_DP_STREAM_ENC_CLOCK_RAMP_ADJUSTER_FIFO_STATUS_CONTROL0, FIFO_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_CONTROL, DP_SYM32_ENC_RESET, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_CONTROL, DP_SYM32_ENC_RESET_DONE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_CONTROL, DP_SYM32_ENC_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_PIXEL_FORMAT, PIXEL_ENCODING_TYPE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_PIXEL_FORMAT, UNCOMPRESSED_PIXEL_ENCODING, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_PIXEL_FORMAT, UNCOMPRESSED_COMPONENT_DEPTH, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_PIXEL_FORMAT_DOUBLE_BUFFER_CONTROL, PIXEL_FORMAT_DOUBLE_BUFFER_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_MSA_DOUBLE_BUFFER_CONTROL, MSA_DOUBLE_BUFFER_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC_VID_MSA, MSA_DATA_LANE_0, mask_sh),\ + SE_SF(DP_SYM32_ENC_VID_MSA, MSA_DATA_LANE_1, mask_sh),\ + SE_SF(DP_SYM32_ENC_VID_MSA, MSA_DATA_LANE_2, mask_sh),\ + SE_SF(DP_SYM32_ENC_VID_MSA, MSA_DATA_LANE_3, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_FIFO_CONTROL, PIXEL_TO_SYMBOL_FIFO_RESET, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_FIFO_CONTROL, PIXEL_TO_SYMBOL_FIFO_RESET_DONE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_FIFO_CONTROL, PIXEL_TO_SYMBOL_FIFO_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_STREAM_CONTROL, VID_STREAM_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_STREAM_CONTROL, VID_STREAM_STATUS, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_VBID_CONTROL, VBID_6_COMPRESSEDSTREAM_FLAG_SOF_REFERENCE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_VBID_CONTROL, VBID_6_COMPRESSEDSTREAM_FLAG_LINE_NUMBER, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_CONTROL, SDP_STREAM_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_GSP_CONTROL0, GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_GSP_CONTROL0, GSP_PAYLOAD_SIZE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_GSP_CONTROL0, GSP_TRANSMISSION_LINE_NUMBER, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_GSP_CONTROL5, GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_GSP_CONTROL5, GSP_TRANSMISSION_LINE_NUMBER, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_GSP_CONTROL5, GSP_SOF_REFERENCE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_METADATA_PACKET_CONTROL, METADATA_PACKET_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, AUDIO_MUTE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, ASP_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, ATP_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, AIP_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0, ACM_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_ENABLE, mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_CONT_MODE_ENABLE, mask_sh) + + +#define DCN3_1_HPO_DP_STREAM_ENC_REG_FIELD_LIST (type) \ + type DP_STREAM_LINK_TARGET;\ + type DP_STREAM_ENC_CLOCK_EN;\ + type DP_STREAM_ENC_INPUT_MUX_PIXEL_STREAM_SOURCE_SEL;\ + type DP_STREAM_ENC_INPUT_MUX_AUDIO_STREAM_SOURCE_SEL;\ + type FIFO_RESET;\ + type FIFO_RESET_DONE;\ + type FIFO_ENABLE;\ + type DP_SYM32_ENC_RESET;\ + type DP_SYM32_ENC_RESET_DONE;\ + type DP_SYM32_ENC_ENABLE;\ + type PIXEL_ENCODING_TYPE;\ + type UNCOMPRESSED_PIXEL_ENCODING;\ + type UNCOMPRESSED_COMPONENT_DEPTH;\ + type PIXEL_FORMAT_DOUBLE_BUFFER_ENABLE;\ + type MSA_DOUBLE_BUFFER_ENABLE;\ + type MSA_DATA_LANE_0;\ + type MSA_DATA_LANE_1;\ + type MSA_DATA_LANE_2;\ + type MSA_DATA_LANE_3;\ + type PIXEL_TO_SYMBOL_FIFO_RESET;\ + type PIXEL_TO_SYMBOL_FIFO_RESET_DONE;\ + type PIXEL_TO_SYMBOL_FIFO_ENABLE;\ + type VID_STREAM_ENABLE;\ + type VID_STREAM_STATUS;\ + type VBID_6_COMPRESSEDSTREAM_FLAG_SOF_REFERENCE;\ + type VBID_6_COMPRESSEDSTREAM_FLAG_LINE_NUMBER;\ + type SDP_STREAM_ENABLE;\ + type AUDIO_MUTE;\ + type ASP_ENABLE;\ + type ATP_ENABLE;\ + type AIP_ENABLE;\ + type ACM_ENABLE;\ + type GSP_VIDEO_CONTINUOUS_TRANSMISSION_ENABLE;\ + type GSP_PAYLOAD_SIZE;\ + type GSP_TRANSMISSION_LINE_NUMBER;\ + type GSP_SOF_REFERENCE;\ + type METADATA_PACKET_ENABLE;\ + type CRC_ENABLE;\ + type CRC_CONT_MODE_ENABLE + + +struct dcn31_hpo_dp_stream_encoder_registers { +DCN3_1_HPO_DP_STREAM_ENC_REGS ; +}; + +struct dcn31_hpo_dp_stream_encoder_shift { +DCN3_1_HPO_DP_STREAM_ENC_REG_FIELD_LIST (uint8_t ); +}; + +struct dcn31_hpo_dp_stream_encoder_mask { +DCN3_1_HPO_DP_STREAM_ENC_REG_FIELD_LIST (uint32_t ); +}; + +struct dcn31_hpo_dp_stream_encoder { +struct hpo_dp_stream_encoder base; +const struct dcn31_hpo_dp_stream_encoder_registers *regs; +const struct dcn31_hpo_dp_stream_encoder_shift *hpo_se_shift; +const struct dcn31_hpo_dp_stream_encoder_mask *hpo_se_mask; +}; + + +void dcn31_hpo_dp_stream_encoder_construct ( +struct dcn31_hpo_dp_stream_encoder *enc3, +struct dc_context *ctx, +struct dc_bios *bp, +uint32_t inst, +enum engine_id eng_id, +struct vpg *vpg, +struct apg *apg, +const struct dcn31_hpo_dp_stream_encoder_registers *regs, +const struct dcn31_hpo_dp_stream_encoder_shift *hpo_se_shift, +const struct dcn31_hpo_dp_stream_encoder_mask *hpo_se_mask); + + +#endif // __DAL_DCN31_HPO_STREAM_ENCODER_H__ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +85
-0@@ -52,6 +52,7 @@#include "dcn30/dcn30_vpg.h" #include "dcn30/dcn30_afmt.h" #include "dcn30/dcn30_dio_stream_encoder.h" +#include "dcn31/dcn31_hpo_dp_stream_encoder.h" #include "dcn31/dcn31_apg.h" #include "dcn31/dcn31_dio_link_encoder.h" #include "dce/dce_clock_source.h" @@ -564,6 +565,26 @@ static const struct dcn10_link_enc_mask le_mask = { DPP_REG_LIST_DCN30(id),\ } +#define hpo_dp_stream_encoder_reg_list (id)\ +[id] = {\ + DCN3_1_HPO_DP_STREAM_ENC_REG_LIST(id)\ +} + +static const struct dcn31_hpo_dp_stream_encoder_registers hpo_dp_stream_enc_regs[] = { +hpo_dp_stream_encoder_reg_list (0 ), +hpo_dp_stream_encoder_reg_list (1 ), +hpo_dp_stream_encoder_reg_list (2 ), +hpo_dp_stream_encoder_reg_list (3 ), +}; + +static const struct dcn31_hpo_dp_stream_encoder_shift hpo_dp_se_shift = { +DCN3_1_HPO_DP_STREAM_ENC_MASK_SH_LIST (__SHIFT) +}; + +static const struct dcn31_hpo_dp_stream_encoder_mask hpo_dp_se_mask = { +DCN3_1_HPO_DP_STREAM_ENC_MASK_SH_LIST (_MASK) +}; +static const struct dcn3_dpp_registers dpp_regs[] = {dpp_regs (0 ),dpp_regs (1 ),@@ -900,6 +921,7 @@ static const struct resource_caps res_cap_dcn31 = { .num_audio = 5, .num_stream_encoder = 5, .num_dig_link_enc = 5, + .num_hpo_dp_stream_encoder = 4, .num_pll = 5, .num_dwb = 1, .num_ddc = 5,@@ -1330,6 +1352,52 @@ static struct stream_encoder *dcn31_stream_encoder_create(return &enc1->base; } +static struct hpo_dp_stream_encoder *dcn31_hpo_dp_stream_encoder_create ( +enum engine_id eng_id, +struct dc_context *ctx) +{ +struct dcn31_hpo_dp_stream_encoder *hpo_dp_enc31; +struct vpg *vpg; +struct apg *apg; +uint32_t hpo_dp_inst; +uint32_t vpg_inst; +uint32_t apg_inst; + +ASSERT ((eng_id >=ENGINE_ID_HPO_DP_0 ) && (eng_id <=ENGINE_ID_HPO_DP_3 )); + hpo_dp_inst = eng_id -ENGINE_ID_HPO_DP_0 ; + +/* Mapping of VPG register blocks to HPO DP block instance: +* VPG[6] -> HPO_DP[0] +* VPG[7] -> HPO_DP[1] +* VPG[8] -> HPO_DP[2] +* VPG[9] -> HPO_DP[3] +*/ + vpg_inst = hpo_dp_inst +6 ; + +/* Mapping of APG register blocks to HPO DP block instance: +* APG[0] -> HPO_DP[0] +* APG[1] -> HPO_DP[1] +* APG[2] -> HPO_DP[2] +* APG[3] -> HPO_DP[3] +*/ + apg_inst = hpo_dp_inst; + +/* allocate HPO stream encoder and create VPG sub-block */ + hpo_dp_enc31 =kzalloc (sizeof (struct dcn31_hpo_dp_stream_encoder ),GFP_KERNEL ); + vpg =dcn31_vpg_create (ctx, vpg_inst); + apg =dcn31_apg_create (ctx, apg_inst); + +if (!hpo_dp_enc31 || !vpg || !apg) +return NULL ; + +dcn31_hpo_dp_stream_encoder_construct (hpo_dp_enc31, ctx, ctx->dc_bios, + hpo_dp_inst, eng_id, vpg, apg, + &hpo_dp_stream_enc_regs[hpo_dp_inst], + &hpo_dp_se_shift, &hpo_dp_se_mask); + +return &hpo_dp_enc31->base; +} +static struct dce_hwseq *dcn31_hwseq_create (struct dc_context *ctx) {@@ -1347,6 +1415,7 @@ static const struct resource_create_funcs res_create_funcs = { .read_dce_straps = read_dce_straps, .create_audio = dcn31_create_audio, .create_stream_encoder = dcn31_stream_encoder_create, + .create_hpo_dp_stream_encoder = dcn31_hpo_dp_stream_encoder_create, .create_hwseq = dcn31_hwseq_create, };@@ -1354,6 +1423,7 @@ static const struct resource_create_funcs res_create_maximus_funcs = { .read_dce_straps = NULL, .create_audio = NULL, .create_stream_encoder = NULL, + .create_hpo_dp_stream_encoder = dcn31_hpo_dp_stream_encoder_create, .create_hwseq = dcn31_hwseq_create, };@@ -1376,6 +1446,21 @@ static void dcn31_resource_destruct(struct dcn31_resource_pool *pool) } } +for (i =0 ; i < pool->base.hpo_dp_stream_enc_count; i++) { +if (pool->base.hpo_dp_stream_enc[i] !=NULL ) { +if (pool->base.hpo_dp_stream_enc[i]->vpg !=NULL ) { +kfree (DCN30_VPG_FROM_VPG (pool->base.hpo_dp_stream_enc[i]->vpg)); + pool->base.hpo_dp_stream_enc[i]->vpg =NULL ; + } +if (pool->base.hpo_dp_stream_enc[i]->apg !=NULL ) { +kfree (DCN31_APG_FROM_APG (pool->base.hpo_dp_stream_enc[i]->apg)); + pool->base.hpo_dp_stream_enc[i]->apg =NULL ; + } +kfree (DCN3_1_HPO_DP_STREAM_ENC_FROM_HPO_STREAM_ENC (pool->base.hpo_dp_stream_enc[i])); + pool->base.hpo_dp_stream_enc[i] =NULL ; + } + } +for (i =0 ; i < pool->base.res_cap->num_dsc; i++) {if (pool->base.dscs[i] !=NULL )dcn20_dsc_destroy (&pool->base.dscs[i]);drivers/gpu/drm/amd/display/dc/inc/core_types.h +4
-0@@ -246,6 +246,8 @@ struct resource_pool {*/ unsigned int dig_link_enc_count; +unsigned int hpo_dp_stream_enc_count; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc[MAX_HPO_DP2_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )struct dc_3dlut *mpc_lut[MAX_PIPES ];struct dc_transfer_func *mpc_shaper[MAX_PIPES ];@@ -298,6 +300,7 @@ struct stream_resource {struct display_stream_compressor *dsc;struct timing_generator *tg;struct stream_encoder *stream_enc; +struct hpo_dp_stream_encoder *hpo_dp_stream_enc;struct audio *audio;struct pixel_clk_params pix_clk_params;@@ -388,6 +391,7 @@ struct resource_context {struct link_enc_assignment link_enc_assignments[MAX_PIPES ];/* List of available link encoders. Uses engine ID as encoder identifier. */ enum engine_id link_enc_avail[MAX_DIG_LINK_ENCODERS ]; +bool is_hpo_dp_stream_enc_acquired[MAX_HPO_DP2_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )bool is_mpc_3dlut_acquired[MAX_PIPES ];#endif drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +1
-0@@ -38,6 +38,7 @@#define MAX_PIPES 6#define MAX_DIG_LINK_ENCODERS 7#define MAX_DWB_PIPES 1 +#define MAX_HPO_DP2_ENCODERS 4struct gamma_curve {uint32_t offset;drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +79
-0@@ -242,4 +242,83 @@ struct stream_encoder_funcs { struct stream_encoder *enc); }; +struct hpo_dp_stream_encoder_state { +uint32_t stream_enc_enabled; +uint32_t vid_stream_enabled; +uint32_t otg_inst; +uint32_t pixel_encoding; +uint32_t component_depth; +uint32_t compressed_format; +uint32_t sdp_enabled; +uint32_t mapped_to_link_enc; +}; + +struct hpo_dp_stream_encoder { +const struct hpo_dp_stream_encoder_funcs *funcs; +struct dc_context *ctx; +struct dc_bios *bp; +uint32_t inst; +enum engine_id id; +struct vpg *vpg; +struct apg *apg; +}; + +struct hpo_dp_stream_encoder_funcs { +void (*enable_stream)( +struct hpo_dp_stream_encoder *enc); + +void (*dp_unblank)( +struct hpo_dp_stream_encoder *enc, +uint32_t stream_source); + +void (*dp_blank)( +struct hpo_dp_stream_encoder *enc); + +void (*disable)( +struct hpo_dp_stream_encoder *enc); + +void (*set_stream_attribute)( +struct hpo_dp_stream_encoder *enc, +struct dc_crtc_timing *crtc_timing, +enum dc_color_space output_color_space, +bool use_vsc_sdp_for_colorimetry, +bool compressed_format, +bool double_buffer_en); + +void (*update_dp_info_packets)( +struct hpo_dp_stream_encoder *enc, +const struct encoder_info_frame *info_frame); + +void (*stop_dp_info_packets)( +struct hpo_dp_stream_encoder *enc); + +void (*dp_set_dsc_pps_info_packet)( +struct hpo_dp_stream_encoder *enc, +bool enable, +uint8_t *dsc_packed_pps); + +void (*map_stream_to_link)( +struct hpo_dp_stream_encoder *enc, +uint32_t stream_enc_inst, +uint32_t link_enc_inst); + +void (*audio_mute_control)( +struct hpo_dp_stream_encoder *enc,bool mute); + +void (*dp_audio_setup)( +struct hpo_dp_stream_encoder *enc, +unsigned int az_inst, +struct audio_info *info); + +void (*dp_audio_enable)( +struct hpo_dp_stream_encoder *enc); + +void (*dp_audio_disable)( +struct hpo_dp_stream_encoder *enc); + +void (*read_state)( +struct hpo_dp_stream_encoder *enc, +struct hpo_dp_stream_encoder_state *state); +}; +#endif /* STREAM_ENCODER_H_ */ drivers/gpu/drm/amd/display/dc/inc/resource.h +4
-0@@ -49,6 +49,7 @@ struct resource_caps {int num_vmid;int num_dsc;unsigned int num_dig_link_enc;// Total number of DIGs (digital encoders) in DIO (Display Input/Output). +int num_hpo_dp_stream_encoder;int num_mpc_3dlut; };@@ -68,6 +69,9 @@ struct resource_create_funcs {struct stream_encoder *(*create_stream_encoder)(enum engine_id eng_id,struct dc_context *ctx); +struct hpo_dp_stream_encoder *(*create_hpo_dp_stream_encoder)( +enum engine_id eng_id,struct dc_context *ctx); +struct dce_hwseq *(*create_hwseq)(struct dc_context *ctx); };drivers/gpu/drm/amd/display/include/grph_object_defs.h +10
-0@@ -140,6 +140,16 @@ enum sync_source { SYNC_SOURCE_DUAL_GPU_PIN }; +enum tx_ffe_id { +TX_FFE0 =0 , +TX_FFE1 , +TX_FFE2 , +TX_FFE3 , + TX_FFE_DeEmphasis_Only, + TX_FFE_PreShoot_Only, + TX_FFE_No_FFE, +}; +/* connector sizes in millimeters - from BiosParserTypes.hpp */ #define CONNECTOR_SIZE_DVI 40#define CONNECTOR_SIZE_VGA 32drivers/gpu/drm/amd/display/include/grph_object_id.h +6
-0@@ -184,6 +184,12 @@ enum engine_id {ENGINE_ID_DACA ,ENGINE_ID_DACB ,ENGINE_ID_VCE ,/* wireless display pseudo-encoder */ +ENGINE_ID_HPO_0 , +ENGINE_ID_HPO_1 , +ENGINE_ID_HPO_DP_0 , +ENGINE_ID_HPO_DP_1 , +ENGINE_ID_HPO_DP_2 , +ENGINE_ID_HPO_DP_3 ,ENGINE_ID_VIRTUAL , ENGINE_ID_COUNT,
PATCH 3/6 drm/amd/display: Add DP 2.0 HPO Link Encoder
In reply to Fangzhi ZuoHW Blocks:
+--------+ +-----+ +------+
| OPTC | | HDA | | HUBP |
+--------+ +-----+ +------+
| | |
| | |
HPO ====|==========|========|====
| | v |
| | +-----+ |
| | | APG | |
| | +-----+ |
| | | |
| v v v
| +---------------------+
| | HPO Stream Encoder |
| +---------------------+
| |
| v
| +--------------------+
| | HPO Link Encoder |
v +--------------------+--- drivers/gpu/drm/amd/display/dc/dc_link.h | 2 + .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 34 +- drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../display/dc/dcn31/dcn31_dio_link_encoder.c | 4 + .../dc/dcn31/dcn31_hpo_dp_link_encoder.c | 620 ++++++++++++++++++ .../dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 +++++++ .../drm/amd/display/dc/dcn31/dcn31_resource.c | 50 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 2 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + .../drm/amd/display/dc/inc/hw/link_encoder.h | 85 +++ drivers/gpu/drm/amd/display/dc/inc/resource.h | 5 + .../amd/display/include/link_service_types.h | 13 +- 12 files changed, 1036 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h
drivers/gpu/drm/amd/display/dc/dc_link.h +2 -0
@@ -45,6 +45,8 @@ struct dc_link_status {struct link_mst_stream_allocation {/* DIG front */ const struct stream_encoder *stream_enc; +/* HPO DP Stream Encoder */ +const struct hpo_dp_stream_encoder *hpo_dp_stream_enc;/* associate DRM payload table with DC stream encoder */ uint8_t vcp_id;/* number of slots required for the DP stream in transport packet */
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +32 -2
@@ -466,7 +466,6 @@ void dcn10_log_hw_state(struct dc *dc,log_mpc_crc (dc, log_ctx); -#if defined(CONFIG_DRM_AMD_DC_DCN3_1 ) {int hpo_dp_link_enc_count =0 ;
@@ -498,8 +497,39 @@ void dcn10_log_hw_state(struct dc *dc,DTN_INFO ("\n" ); } + +/* log DP HPO L_ENC section if any hpo_dp_link_enc exists */ +for (i =0 ; i < dc->link_count; i++) +if (dc->links[i]->hpo_dp_link_enc) + hpo_dp_link_enc_count++; + +if (hpo_dp_link_enc_count) { +DTN_INFO ("DP HPO L_ENC: Enabled Mode Lanes Stream Slots VC Rate X VC Rate Y\n" ); + +for (i =0 ; i < dc->link_count; i++) { +struct hpo_dp_link_encoder *hpo_dp_link_enc = dc->links[i]->hpo_dp_link_enc; +struct hpo_dp_link_enc_state hpo_dp_le_state = {0 }; + +if (hpo_dp_link_enc && hpo_dp_link_enc->funcs->read_state) { + hpo_dp_link_enc->funcs->read_state (hpo_dp_link_enc, &hpo_dp_le_state); +DTN_INFO ("[%d]: %d %6s %d %d %d %d %d\n" , + hpo_dp_link_enc->inst, + hpo_dp_le_state.link_enc_enabled, + (hpo_dp_le_state.link_mode ==0 ) ?"TPS1" : + (hpo_dp_le_state.link_mode ==1 ) ?"TPS2" : + (hpo_dp_le_state.link_mode ==2 ) ?"ACTIVE" :"TEST" , + hpo_dp_le_state.lane_count, + hpo_dp_le_state.stream_src[0 ], + hpo_dp_le_state.slot_count[0 ], + hpo_dp_le_state.vc_rate_x[0 ], + hpo_dp_le_state.vc_rate_y[0 ]); +DTN_INFO ("\n" ); + } + } + +DTN_INFO ("\n" ); + } } -#endif DTN_INFO_END (); }
drivers/gpu/drm/amd/display/dc/dcn31/Makefile +1 -1
@@ -12,7 +12,7 @@ DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o \ dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ - dcn31_apg.o dcn31_hpo_dp_stream_encoder.o + dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o ifdef CONFIG_X86 CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -msse
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c +4 -0
@@ -320,6 +320,10 @@ void dcn31_link_encoder_construct( enc10->base.features.flags.bits.IS_HBR3_CAPABLE = bp_cap_info.DP_HBR3_EN; enc10->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN; + enc10->base.features.flags.bits.IS_DP2_CAPABLE = bp_cap_info.IS_DP2_CAPABLE; + enc10->base.features.flags.bits.IS_UHBR10_CAPABLE = bp_cap_info.DP_UHBR10_EN; + enc10->base.features.flags.bits.IS_UHBR13_5_CAPABLE = bp_cap_info.DP_UHBR13_5_EN; + enc10->base.features.flags.bits.IS_UHBR20_CAPABLE = bp_cap_info.DP_UHBR20_EN; enc10->base.features.flags.bits.DP_IS_USB_C = bp_cap_info.DP_IS_USB_C; }else {
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c new file +620 -0
620 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h new file +222 -0
222 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +50 -0
92 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +2 -0
@@ -248,6 +248,8 @@ struct resource_pool {unsigned int hpo_dp_stream_enc_count;struct hpo_dp_stream_encoder *hpo_dp_stream_enc[MAX_HPO_DP2_ENCODERS ]; +unsigned int hpo_dp_link_enc_count; +struct hpo_dp_link_encoder *hpo_dp_link_enc[MAX_HPO_DP2_LINK_ENCODERS ];#if defined(CONFIG_DRM_AMD_DC_DCN )struct dc_3dlut *mpc_lut[MAX_PIPES ];struct dc_transfer_func *mpc_shaper[MAX_PIPES ];
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +1 -0
@@ -39,6 +39,7 @@#define MAX_DIG_LINK_ENCODERS 7#define MAX_DWB_PIPES 1#define MAX_HPO_DP2_ENCODERS 4 +#define MAX_HPO_DP2_LINK_ENCODERS 2struct gamma_curve {uint32_t offset;
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +85 -0
89 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/resource.h +5 -0
@@ -50,6 +50,7 @@ struct resource_caps {int num_dsc;unsigned int num_dig_link_enc;// Total number of DIGs (digital encoders) in DIO (Display Input/Output). int num_hpo_dp_stream_encoder; +int num_hpo_dp_link_encoder;int num_mpc_3dlut; };
@@ -72,6 +73,10 @@ struct resource_create_funcs {struct hpo_dp_stream_encoder *(*create_hpo_dp_stream_encoder)(enum engine_id eng_id,struct dc_context *ctx); +struct hpo_dp_link_encoder *(*create_hpo_dp_link_encoder)( +uint8_t inst, +struct dc_context *ctx); +struct dce_hwseq *(*create_hwseq)(struct dc_context *ctx); };
drivers/gpu/drm/amd/display/include/link_service_types.h +12 -1
@@ -114,13 +114,24 @@ enum dp_test_pattern {DP_TEST_PATTERN_CP2520_2 ,DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE =DP_TEST_PATTERN_CP2520_2 ,DP_TEST_PATTERN_CP2520_3 , + DP_TEST_PATTERN_128b_132b_TPS1, + DP_TEST_PATTERN_128b_132b_TPS2, +DP_TEST_PATTERN_PRBS9 , +DP_TEST_PATTERN_PRBS11 , +DP_TEST_PATTERN_PRBS15 , +DP_TEST_PATTERN_PRBS23 , +DP_TEST_PATTERN_PRBS31 , +DP_TEST_PATTERN_264BIT_CUSTOM , +DP_TEST_PATTERN_SQUARE_PULSE ,/* Link Training Patterns */ DP_TEST_PATTERN_TRAINING_PATTERN1 ,DP_TEST_PATTERN_TRAINING_PATTERN2 ,DP_TEST_PATTERN_TRAINING_PATTERN3 ,DP_TEST_PATTERN_TRAINING_PATTERN4 , -DP_TEST_PATTERN_PHY_PATTERN_END =DP_TEST_PATTERN_TRAINING_PATTERN4 , + DP_TEST_PATTERN_128b_132b_TPS1_TRAINING_MODE, + DP_TEST_PATTERN_128b_132b_TPS2_TRAINING_MODE, +DP_TEST_PATTERN_PHY_PATTERN_END = DP_TEST_PATTERN_128b_132b_TPS2_TRAINING_MODE,/* link test patterns*/ DP_TEST_PATTERN_COLOR_SQUARES,
Signature · 1 line
2.25.1
PATCH 4/6 drm/amd/display: Add DP 2.0 DCCG
In reply to Fangzhi ZuoHW Blocks:
+--------+ +-----+ +------+
| OPTC | | HDA | | HUBP |
+--------+ +-----+ +------+
| | |
| | |
HPO ====|==========|========|====
| | v |
| | +-----+ |
| | | APG | |
| | +-----+ |
| | | |
| v v v
| +---------------------+
| | HPO Stream Encoder |
| +---------------------+
| |
| v
| +--------------------+
| | HPO Link Encoder |
| +--------------------+
| |
v ===============|=============
v
+------------------+
| DIO Output Mux |
+------------------+
|
v
+-----+
| PHY |
+-----+
| PHYD32CLK[0]
v
+------+
| DCCG |
+------+
|
v
SYMCLK32--- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 162 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 ++ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 21 +++ .../amd/display/dc/inc/hw/timing_generator.h | 1 + 4 files changed, 202 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +162 -0
@@ -42,6 +42,155 @@#define DC_LOGGER \ dccg->ctx->logger +void dccg31_set_dpstreamclk ( +struct dccg *dccg, +enum hdmistreamclk_source src, +int otg_inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* enabled to select one of the DTBCLKs for pipe */ +switch (otg_inst) { +case 0 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE0_EN , (src ==REFCLK ) ?0 :1 ); +break ; +case 1 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE1_EN , (src ==REFCLK ) ?0 :1 ); +break ; +case 2 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE2_EN , (src ==REFCLK ) ?0 :1 ); +break ; +case 3 : +REG_UPDATE (DPSTREAMCLK_CNTL , +DPSTREAMCLK_PIPE3_EN , (src ==REFCLK ) ?0 :1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_enable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst, +enum phyd32clk_clock_source phyd32clk) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* select one of the PHYD32CLKs as the source for symclk32_se */ +switch (hpo_se_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE0_SRC_SEL , phyd32clk, +SYMCLK32_SE0_EN ,1 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE1_SRC_SEL , phyd32clk, +SYMCLK32_SE1_EN ,1 ); +break ; +case 2 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE2_SRC_SEL , phyd32clk, +SYMCLK32_SE2_EN ,1 ); +break ; +case 3 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE3_SRC_SEL , phyd32clk, +SYMCLK32_SE3_EN ,1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_disable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* set refclk as the source for symclk32_se */ +switch (hpo_se_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE0_SRC_SEL ,0 , +SYMCLK32_SE0_EN ,0 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE1_SRC_SEL ,0 , +SYMCLK32_SE1_EN ,0 ); +break ; +case 2 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE2_SRC_SEL ,0 , +SYMCLK32_SE2_EN ,0 ); +break ; +case 3 : +REG_UPDATE_2 (SYMCLK32_SE_CNTL , +SYMCLK32_SE3_SRC_SEL ,0 , +SYMCLK32_SE3_EN ,0 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_enable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* select one of the PHYD32CLKs as the source for symclk32_le */ +switch (hpo_le_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE0_SRC_SEL , phyd32clk, +SYMCLK32_LE0_EN ,1 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE1_SRC_SEL , phyd32clk, +SYMCLK32_LE1_EN ,1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + +void dccg31_disable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* set refclk as the source for symclk32_le */ +switch (hpo_le_inst) { +case 0 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE0_SRC_SEL ,0 , +SYMCLK32_LE0_EN ,0 ); +break ; +case 1 : +REG_UPDATE_2 (SYMCLK32_LE_CNTL , +SYMCLK32_LE1_SRC_SEL ,0 , +SYMCLK32_LE1_EN ,0 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} + void dccg31_set_physymclk( struct dccg *dccg, int phy_inst,
@@ -241,12 +390,25 @@ static void dccg31_set_dispclk_change_mode(void dccg31_init (struct dccg *dccg) { +/* Set HPO stream encoder to use refclk to avoid case where PHY is +* disabled and SYMCLK32 for HPO SE is sourced from PHYD32CLK which +* will cause DCN to hang. +*/ +dccg31_disable_symclk32_se (dccg,0 ); +dccg31_disable_symclk32_se (dccg,1 ); +dccg31_disable_symclk32_se (dccg,2 ); +dccg31_disable_symclk32_se (dccg,3 ); }static const struct dccg_funcs dccg31_funcs = { .update_dpp_dto = dccg2_update_dpp_dto, .get_dccg_ref_freq = dccg31_get_dccg_ref_freq, .dccg_init = dccg31_init, + .set_dpstreamclk = dccg31_set_dpstreamclk, + .enable_symclk32_se = dccg31_enable_symclk32_se, + .disable_symclk32_se = dccg31_disable_symclk32_se, + .enable_symclk32_le = dccg31_enable_symclk32_le, + .disable_symclk32_le = dccg31_disable_symclk32_le, .set_physymclk = dccg31_set_physymclk, .set_dtbclk_dto = dccg31_set_dtbclk_dto, .set_audio_dtbclk_dto = dccg31_set_audio_dtbclk_dto,
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h +18 -0
@@ -130,6 +130,24 @@ struct dccg *dccg31_create(void dccg31_init (struct dccg *dccg); +void dccg31_enable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst, +enum phyd32clk_clock_source phyd32clk); + +void dccg31_disable_symclk32_se ( +struct dccg *dccg, +int hpo_se_inst); + +void dccg31_enable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk); + +void dccg31_disable_symclk32_le ( +struct dccg *dccg, +int hpo_le_inst); + void dccg31_set_physymclk( struct dccg *dccg, int phy_inst,
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +21 -0
@@ -79,7 +79,28 @@ struct dccg_funcs {void (*otg_drop_pixel)(struct dccg *dccg,uint32_t otg_inst);void (*dccg_init)(struct dccg *dccg); +void (*set_dpstreamclk)( +struct dccg *dccg, +enum hdmistreamclk_source src, +int otg_inst); + +void (*enable_symclk32_se)( +struct dccg *dccg, +int hpo_se_inst, +enum phyd32clk_clock_source phyd32clk); + +void (*disable_symclk32_se)( +struct dccg *dccg, +int hpo_se_inst); + +void (*enable_symclk32_le)( +struct dccg *dccg, +int hpo_le_inst, +enum phyd32clk_clock_source phyd32clk); +void (*disable_symclk32_le)( +struct dccg *dccg, +int hpo_le_inst); void (*set_physymclk)( struct dccg *dccg, int phy_inst,
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +1 -0
@@ -100,6 +100,7 @@ enum crc_selection {enum otg_out_mux_dest {OUT_MUX_DIO =0 , +OUT_MUX_HPO_DP =2 , };enum h_timing_div_mode {
Signature · 1 line
2.25.1
PATCH 5/6 drm/amd/display: Add DP 2.0 BIOS and DMUB Support
In reply to Fangzhi ZuoParse DP2 encoder caps and hpo instance from bios
--- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 ++++++++ drivers/gpu/drm/amd/display/dc/bios/command_table2.c | 6 ++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 ++++ drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 ++++ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 2 +- drivers/gpu/drm/amd/display/include/bios_parser_types.h | 6 ++++++ drivers/gpu/drm/amd/include/atomfirmware.h | 4 ++++ 7 files changed, 33 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +8 -0
@@ -1604,6 +1604,14 @@ static enum bp_result bios_parser_get_encoder_cap_info( ATOM_ENCODER_CAP_RECORD_HBR3_EN) ? 1 : 0; info->HDMI_6GB_EN = (record->encodercaps & ATOM_ENCODER_CAP_RECORD_HDMI6Gbps_EN) ?1 :0 ; + info->IS_DP2_CAPABLE = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_DP2 ) ?1 :0 ; + info->DP_UHBR10_EN = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_UHBR10_EN ) ?1 :0 ; + info->DP_UHBR13_5_EN = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_UHBR13_5_EN ) ?1 :0 ; + info->DP_UHBR20_EN = (record->encodercaps & +ATOM_ENCODER_CAP_RECORD_UHBR20_EN ) ?1 :0 ; info->DP_IS_USB_C = (record->encodercaps &ATOM_ENCODER_CAP_RECORD_USB_C_TYPE ) ?1 :0 ;
drivers/gpu/drm/amd/display/dc/bios/command_table2.c +6 -0
@@ -340,6 +340,11 @@ static enum bp_result transmitter_control_v1_7(const struct command_table_helper *cmd = bp->cmd_helper;struct dmub_dig_transmitter_control_data_v1_7 dig_v1_7 = {0 }; +uint8_t hpo_instance = (uint8_t )cntl->hpo_engine_id -ENGINE_ID_HPO_0 ; + +if (dc_is_dp_signal (cntl->signal)) + hpo_instance = (uint8_t )cntl->hpo_engine_id -ENGINE_ID_HPO_DP_0 ; + dig_v1_7.phyid = cmd->phy_id_to_atom (cntl->transmitter); dig_v1_7.action = (uint8_t )cntl->action;
@@ -353,6 +358,7 @@ static enum bp_result transmitter_control_v1_7( dig_v1_7.hpdsel = cmd->hpd_sel_to_atom (cntl->hpd_sel); dig_v1_7.digfe_sel = cmd->dig_encoder_sel_to_atom (cntl->engine_id); dig_v1_7.connobj_id = (uint8_t )cntl->connector_obj_id.id; + dig_v1_7.HPO_instance = hpo_instance; dig_v1_7.symclk_units.symclk_10khz = cntl->pixel_clock/10 ; if (cntl->action == TRANSMITTER_CONTROL_ENABLE ||
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c +4 -0
@@ -192,6 +192,10 @@ void dcn30_link_encoder_construct( enc10->base.features.flags.bits.IS_HBR3_CAPABLE = bp_cap_info.DP_HBR3_EN; enc10->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN; + enc10->base.features.flags.bits.IS_DP2_CAPABLE = bp_cap_info.IS_DP2_CAPABLE; + enc10->base.features.flags.bits.IS_UHBR10_CAPABLE = bp_cap_info.DP_UHBR10_EN; + enc10->base.features.flags.bits.IS_UHBR13_5_CAPABLE = bp_cap_info.DP_UHBR13_5_EN; + enc10->base.features.flags.bits.IS_UHBR20_CAPABLE = bp_cap_info.DP_UHBR20_EN; enc10->base.features.flags.bits.DP_IS_USB_C = bp_cap_info.DP_IS_USB_C; }else {
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +4 -0
@@ -59,6 +59,10 @@ struct encoder_feature_support { uint32_t IS_TPS3_CAPABLE:1; uint32_t IS_TPS4_CAPABLE:1; uint32_t HDMI_6GB_EN:1; + uint32_t IS_DP2_CAPABLE:1; + uint32_t IS_UHBR10_CAPABLE:1; + uint32_t IS_UHBR13_5_CAPABLE:1; + uint32_t IS_UHBR20_CAPABLE:1; uint32_t DP_IS_USB_C:1; } bits;uint32_t raw;
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +1 -1
@@ -959,7 +959,7 @@ struct dmub_dig_transmitter_control_data_v1_7 {uint8_t hpdsel;/**< =1: HPD1, =2: HPD2, ..., =6: HPD6, =0: HPD is not assigned */ uint8_t digfe_sel;/**< DIG front-end selection, bit0 means DIG0 FE is enabled */ uint8_t connobj_id;/**< Connector Object Id defined in ObjectId.h */ -uint8_t reserved0;/**< For future use */ +uint8_t HPO_instance;/**< HPO instance (0: inst0, 1: inst1) */ uint8_t reserved1;/**< For future use */ uint8_t reserved2[3 ];/**< For future use */ uint32_t reserved3[11 ];/**< For future use */
drivers/gpu/drm/amd/display/include/bios_parser_types.h +6 -0
@@ -152,6 +152,8 @@ struct bp_transmitter_control {enum signal_type signal;enum dc_color_depth color_depth;/* not used for DCE6.0 */ enum hpd_source_id hpd_sel;/* ucHPDSel, used for DCe6.0 */ +enum tx_ffe_id txffe_sel;/* used for DCN3 */ +enum engine_id hpo_engine_id;/* used for DCN3 */ struct graphics_object_id connector_obj_id;/* symClock; in 10kHz, pixel clock, in HDMI deep color mode, it should * be pixel clock * deep_color_ratio (in KHz)
@@ -319,6 +321,10 @@ struct bp_encoder_cap_info { uint32_t DP_HBR2_EN:1; uint32_t DP_HBR3_EN:1; uint32_t HDMI_6GB_EN:1; + uint32_t IS_DP2_CAPABLE:1; + uint32_t DP_UHBR10_EN:1; + uint32_t DP_UHBR13_5_EN:1; + uint32_t DP_UHBR20_EN:1; uint32_t DP_IS_USB_C:1; uint32_t RESERVED:27; };
drivers/gpu/drm/amd/include/atomfirmware.h +4 -0
@@ -768,6 +768,10 @@ enum atom_encoder_caps_defATOM_ENCODER_CAP_RECORD_HBR2_EN =0x02 ,// DP1.2 HBR2 setting is qualified and HBR2 can be enabled ATOM_ENCODER_CAP_RECORD_HDMI6Gbps_EN =0x04 ,// HDMI2.0 6Gbps enable or not. ATOM_ENCODER_CAP_RECORD_HBR3_EN =0x08 ,// DP1.3 HBR3 is supported by board. +ATOM_ENCODER_CAP_RECORD_DP2 =0x10 ,// DP2 is supported by ASIC/board. +ATOM_ENCODER_CAP_RECORD_UHBR10_EN =0x20 ,// DP2.0 UHBR10 settings is supported by board +ATOM_ENCODER_CAP_RECORD_UHBR13_5_EN =0x40 ,// DP2.0 UHBR13.5 settings is supported by board +ATOM_ENCODER_CAP_RECORD_UHBR20_EN =0x80 ,// DP2.0 UHBR20 settings is supported by board ATOM_ENCODER_CAP_RECORD_USB_C_TYPE =0x100, // the DP connector is a USB-C type. };
Signature · 1 line
2.25.1
PATCH 6/6 drm/amd/display: Add DP 2.0 SST DC Support
In reply to Fangzhi Zuo1. Retrieve 128/132b link cap.
2. 128/132b link training and payload allocation.
3. UHBR10 link rate support.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc.c | 17 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 503 +++++++- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 1071 +++++++++++++++-- .../drm/amd/display/dc/core/dc_link_hwss.c | 291 ++++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 104 ++ drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 199 ++- drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + .../display/dc/dce110/dce110_hw_sequencer.c | 86 +- .../amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 26 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 4 + .../drm/amd/display/dc/dcn31/dcn31_resource.c | 18 +- drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 22 + .../amd/display/dc/inc/hw_sequencer_private.h | 1 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + .../gpu/drm/amd/display/include/dpcd_defs.h | 14 +- .../amd/display/include/link_service_types.h | 18 +- .../drm/amd/display/include/logger_types.h | 2 + 23 files changed, 2201 insertions(+), 229 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -0
@@ -751,3 +751,9 @@ void dm_helpers_mst_enable_stream_features(const struct dc_stream_state *stream) &new_downspread.raw, sizeof(new_downspread)); } + +void dm_set_phyd32clk (struct dc_context *ctx,int freq_khz) +{ +// FPGA programming for this clock in diags framework that +// needs to go through dm layer, therefore leave dummy interace here +}
drivers/gpu/drm/amd/display/dc/core/dc.c +17 -0
@@ -186,6 +186,7 @@ static bool create_links(int i;int connectors_num;struct dc_bios *bios = dc->ctx->dc_bios; +int dp_hpo_link_count =0 ; dc->link_count =0 ;
@@ -255,6 +256,22 @@ static bool create_links( goto failed_alloc; } +if (IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment) && + dc->caps.dp_hpo && + link->dc->res_pool->res_cap->num_hpo_dp_link_encoder >0 ) { +/* FPGA case - Allocate HPO DP link encoder */ +if (i < link->dc->res_pool->res_cap->num_hpo_dp_link_encoder) { + link->hpo_dp_link_enc = link->dc->res_pool->hpo_dp_link_enc[i]; + +if (link->hpo_dp_link_enc ==NULL ) { +BREAK_TO_DEBUGGER (); + goto failed_alloc; + } + link->hpo_dp_link_enc->hpd_source = link->link_enc->hpd_source; + link->hpo_dp_link_enc->transmitter = link->link_enc->transmitter; + } + } + link->link_status.dpcd_caps = &link->dpcd_caps; enc_init.ctx = dc->ctx;
drivers/gpu/drm/amd/display/dc/core/dc_link.c +452 -51
657 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +964 -107
1,441 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +261 -30
374 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +104 -0
149 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +15 -2
@@ -183,6 +183,7 @@ struct dc_caps {unsigned int cursor_cache_size;struct dc_plane_cap planes[MAX_PLANES ];struct dc_color_caps color; +bool dp_hpo;bool vbios_lttpr_aware;bool vbios_lttpr_enable; };
@@ -289,7 +290,13 @@ struct dc_cap_funcs {struct link_training_settings ; - +union allow_lttpr_non_transparent_mode { +struct { +bool DP1_4A :1 ; +bool DP2_0 :1 ; + } bits; +unsigned char raw; +};/* Structure to hold configuration flags set by dm at dc creation. */ struct dc_config {bool gpu_vm_support;
@@ -302,7 +309,7 @@ struct dc_config {bool edp_no_power_sequencing;bool force_enum_edp;bool forced_clocks; -bool allow_lttpr_non_transparent_mode; +union allow_lttpr_non_transparent_mode allow_lttpr_non_transparent_mode;bool multi_mon_pp_mclk_switch;bool disable_dmcu;bool enable_4to1MPC;
@@ -614,6 +621,8 @@ struct dc_debug_options {bool enable_dmcub_surface_flip;bool usbc_combo_phy_reset_wa;bool enable_dram_clock_change_one_display_vactive; +/* TODO - remove once tested */ +bool legacy_dp2_lt;union mem_low_power_enable_options enable_mem_low_power;bool force_vblank_alignment;
@@ -1146,6 +1155,10 @@ struct dpcd_caps {struct dc_lttpr_caps lttpr_caps;struct psr_caps psr_caps; +union dp_128b_132b_supported_link_rates dp_128b_132b_supported_link_rates; +union dp_main_line_channel_coding_cap channel_coding_cap; +union dp_sink_video_fallback_formats fallback_formats; +union dp_fec_capability1 fec_cap1; };union dpcd_sink_ext_caps {
drivers/gpu/drm/amd/display/dc/dc_dp_types.h +190 -9
278 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc_link.h +1 -0
@@ -152,6 +152,7 @@ struct dc_link {struct panel_cntl *panel_cntl;struct link_encoder *link_enc; +struct hpo_dp_link_encoder *hpo_dp_link_enc;struct graphics_object_id link_id;/* Endpoint type distinguishes display endpoints which do not have entries * in the BIOS connector table from those that do. Helps when tracking link
drivers/gpu/drm/amd/display/dc/dc_types.h +15 -0
@@ -395,9 +395,23 @@ struct dc_lttpr_caps {uint8_t max_link_rate;uint8_t phy_repeater_cnt;uint8_t max_ext_timeout; +union dp_main_link_channel_coding_lttpr_cap main_link_channel_coding; +union dp_128b_132b_supported_lttpr_link_rates supported_128b_132b_rates;uint8_t aux_rd_interval[MAX_REPEATER_CNT -1 ]; };
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +67 -19
86 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +9 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +22 -4
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +4 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +13 -5
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dm_cp_psp.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dm_helpers.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +22 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer_private.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/resource.h +3 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/include/dpcd_defs.h +13 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/include/link_service_types.h +17 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/include/logger_types.h +2 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.