Skip to content

Commit 880498a

Browse files
Timur Kristófalexdeucher
authored andcommitted
drm/amd/display: Allow constructing DCE6 link encoder without DDC
When the DDC channel ID is set to CHANNEL_ID_UNKNOWN, pass NULL to the AUX regs array. This is necessary to support embedded connectors without DDC. Fixes: 7c15fd8 ("drm/amd/display: dc/dce: add initial DCE6 support (v10)") Link: https://gitlab.freedesktop.org/drm/amd/-/work_items/5192 Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 38a70e5)
1 parent ac27e3f commit 880498a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,8 @@ static struct link_encoder *dce60_link_encoder_create(
753753
enc_init_data,
754754
&link_enc_feature,
755755
&link_enc_regs[link_regs_id],
756-
&link_enc_aux_regs[enc_init_data->channel - 1],
756+
enc_init_data->channel == CHANNEL_ID_UNKNOWN ?
757+
NULL : &link_enc_aux_regs[enc_init_data->channel - 1],
757758
enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs) ?
758759
NULL : &link_enc_hpd_regs[enc_init_data->hpd_source]);
759760
return &enc110->base;

0 commit comments

Comments
 (0)