From: Tony Cheng <[email protected]> Add an inst member to struct link_encoder, struct stream_encoder and struct hpo_frl_stream_encoder, and populate it in the DCN10 through DCN60 construct paths.
No functional change; the field has no readers yet. Reviewed-by: Jun Lei <[email protected]> Reviewed-by: Alex Hung <[email protected]> Signed-off-by: Tony Cheng <[email protected]> Signed-off-by: George Zhang <[email protected]> --- drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c | 2 ++ drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c | 1 + .../gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.c | 2 ++ .../drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.c | 2 ++ .../gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c | 3 +++ .../drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c | 1 + .../amd/display/dc/hpo/dcn30/dcn30_hpo_frl_stream_encoder.c | 2 ++ .../amd/display/dc/hpo/dcn401/dcn401_hpo_frl_stream_encoder.c | 2 ++ .../amd/display/dc/hpo/dcn42/dcn42_hpo_frl_stream_encoder.c | 2 ++ .../amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c | 2 ++ drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 ++ 28 files changed, 54 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c index aee9a363e336..32e12d894e31 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c @@ -781,6 +781,8 @@ void dcn10_link_encoder_construct( if (enc10->base.ctx->dc->debug.hdmi20_disable) { enc10->base.features.flags.bits.HDMI_6GB_EN = 0; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } bool dcn10_link_encoder_validate_output_with_stream( diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c index d913f065ecca..c937788d0763 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c @@ -1625,5 +1625,7 @@ void dcn10_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = eng_id - ENGINE_ID_DIGA; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.c index 3bd35f3392dc..dbd4c534c5c3 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.c @@ -502,4 +502,6 @@ void dcn20_link_encoder_construct( if (enc10->base.ctx->dc->debug.hdmi20_disable) { enc10->base.features.flags.bits.HDMI_6GB_EN = 0; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c index bec0b4aaeb2b..ac6ca7771d2f 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c @@ -657,5 +657,7 @@ void dcn20_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = eng_id - ENGINE_ID_DIGA; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.c index 8c4010c5b2e7..5fd5158482ea 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.c @@ -456,6 +456,8 @@ void dcn30_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } #define AUX_REG(reg)\ diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c index c14fb51c2611..9757d3bcdf32 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c @@ -899,5 +899,7 @@ void dcn30_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.c index 02fb844670f9..7106669eab5b 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.c @@ -209,4 +209,6 @@ void dcn301_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c index f57f3ba68a02..1b9ba0e9f068 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c @@ -509,6 +509,8 @@ void dcn31_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } void dcn31_link_encoder_construct_minimal( diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c index d1fd5462dca5..482c52c1d7d6 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c @@ -504,5 +504,7 @@ void dcn314_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.c index 68e0dc93ae7d..63990c47ac14 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.c @@ -551,4 +551,6 @@ void dcn32_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c index edafa3808455..3dd8fe423232 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c @@ -491,5 +491,7 @@ void dcn32_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.c index 4108fd0f4380..67d6050d5163 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.c @@ -210,4 +210,6 @@ void dcn321_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.c index 8fa9b8c500f2..9375c9b939be 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.c @@ -290,6 +290,8 @@ void dcn35_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } /* DPIA equivalent of link_transmitter_control. */ diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c index de24dcd27e6c..dabcb45840a7 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c @@ -517,5 +517,7 @@ void dcn35_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c index dad4ef565168..6594fbb3fa43 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c @@ -557,4 +557,6 @@ void dcn401_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c index 79d0c2896d29..4616b6f76aeb 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c @@ -793,6 +793,7 @@ void dcn401_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; } void enc401_set_dynamic_metadata(struct stream_encoder *enc, diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c index 50174aded6aa..3b11be9991c3 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c @@ -223,4 +223,6 @@ void dcn42_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_10G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_12G_CAPABLE = 1; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c index 35845e6dd5aa..b7671d41ea24 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c @@ -581,4 +581,6 @@ void dcn42_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.c index 6fe15324ea50..f65326a0f6d2 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.c @@ -370,4 +370,6 @@ void dcn60_link_encoder_construct( enc10->base.features.flags.bits.IS_FRL_20G_CAPABLE = 1; enc10->base.features.flags.bits.IS_FRL_24G_CAPABLE = 0; } + + enc10->base.inst = (unsigned int)enc10->base.preferred_engine; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.c index b76cc891857d..b645914c1c71 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.c @@ -535,4 +535,6 @@ void dcn60_dio_stream_encoder_construct( enc1->se_shift = se_shift; enc1->se_mask = se_mask; enc1->base.stream_enc_inst = vpg->inst; + enc1->base.inst = enc1->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c index 5b2bba0eff0e..f847fef069c9 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c @@ -27,6 +27,7 @@ #include "dm_services_types.h" #include "virtual_link_encoder.h" +#include "stream_encoder.h" static bool virtual_link_encoder_validate_output_with_stream( struct link_encoder *enc, @@ -167,5 +168,7 @@ bool virtual_link_encoder_construct( enc->preferred_engine = ENGINE_ID_VIRTUAL; + enc->inst = 0; + return true; } diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c index 27448f2b2467..f6b1e2a42baa 100644 --- a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c @@ -190,6 +190,7 @@ bool virtual_stream_encoder_construct( struct dc_context *ctx, struct dc_bios *bp) { + enc->inst = 0; if (!enc) return false; if (!bp) diff --git a/drivers/gpu/drm/amd/display/dc/hpo/dcn30/dcn30_hpo_frl_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/hpo/dcn30/dcn30_hpo_frl_stream_encoder.c index f4c21998d845..f0128c5bf993 100644 --- a/drivers/gpu/drm/amd/display/dc/hpo/dcn30/dcn30_hpo_frl_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/hpo/dcn30/dcn30_hpo_frl_stream_encoder.c @@ -1040,4 +1040,6 @@ void dcn30_hpo_frl_stream_encoder_construct( enc3->hpo_se_shift = hpo_se_shift; enc3->hpo_se_mask = hpo_se_mask; enc3->base.stream_enc_inst = vpg->inst; + enc3->base.inst = enc3->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/hpo/dcn401/dcn401_hpo_frl_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/hpo/dcn401/dcn401_hpo_frl_stream_encoder.c index 85b7a44c0a11..4b14a3bfe56d 100644 --- a/drivers/gpu/drm/amd/display/dc/hpo/dcn401/dcn401_hpo_frl_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/hpo/dcn401/dcn401_hpo_frl_stream_encoder.c @@ -904,4 +904,6 @@ void dcn401_hpo_frl_stream_encoder_construct( enc401->hpo_se_shift = hpo_se_shift; enc401->hpo_se_mask = hpo_se_mask; enc401->base.stream_enc_inst = vpg->inst; + enc401->base.inst = enc401->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_frl_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_frl_stream_encoder.c index 43870d84ca2f..1aed194b58bd 100644 --- a/drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_frl_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_frl_stream_encoder.c @@ -209,4 +209,6 @@ void dcn42_hpo_frl_stream_encoder_construct( enc42->hpo_se_shift = hpo_se_shift; enc42->hpo_se_mask = hpo_se_mask; enc42->base.stream_enc_inst = vpg->inst; + enc42->base.inst = enc42->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c index b5397d6760b1..de42f8c5f7f0 100644 --- a/drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c @@ -231,4 +231,6 @@ void dcn60_hpo_frl_stream_encoder_construct( enc401->hpo_se_shift = hpo_se_shift; enc401->hpo_se_mask = hpo_se_mask; enc401->base.stream_enc_inst = vpg->inst; + enc401->base.inst = enc401->base.stream_enc_inst; + } diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h index 70545df981ef..f3ef5bbfad81 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h @@ -100,6 +100,7 @@ struct link_encoder { struct graphics_object_id connector; uint32_t output_signals; enum engine_id preferred_engine; + unsigned int inst; enum engine_id analog_engine; struct encoder_feature_support features; enum transmitter transmitter; diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h index 2b95cb11eede..5b8688b3aaef 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h @@ -126,6 +126,7 @@ struct stream_encoder { struct dc_bios *bp; enum engine_id id; uint32_t stream_enc_inst; + unsigned int inst; struct vpg *vpg; struct afmt *afmt; struct apg *apg; @@ -319,6 +320,7 @@ struct hpo_frl_stream_encoder { * @stream_enc_inst: Instance ID reference. */ uint32_t stream_enc_inst; + unsigned int inst; /** * @ctx: DC context. -- 2.55.0
