Skip to content

Commit 83e6667

Browse files
Eric Bernsteinalexdeucher
authored andcommitted
drm/amd/display: Remove Assert from dcn10_get_dig_frontend
[Why] In some cases, this function is called when DIG BE is not connected to DIG FE, in which case a value of zero isn't invalid and assert should not be hit. [How] Remove assert and handle ENGINE_ID_UNKNOWN result in calling function. Signed-off-by: Eric Bernstein <eric.bernstein@amd.com> Acked-by: Bindu Ramamurthy <bindu.r@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
1 parent 688f97e commit 83e6667

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ unsigned int dcn10_get_dig_frontend(struct link_encoder *enc)
480480
break;
481481
default:
482482
// invalid source select DIG
483-
ASSERT(false);
484483
result = ENGINE_ID_UNKNOWN;
485484
}
486485

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,8 @@ void dcn30_init_hw(struct dc *dc)
539539

540540
fe = dc->links[i]->link_enc->funcs->get_dig_frontend(
541541
dc->links[i]->link_enc);
542+
if (fe == ENGINE_ID_UNKNOWN)
543+
continue;
542544

543545
for (j = 0; j < dc->res_pool->stream_enc_count; j++) {
544546
if (fe == dc->res_pool->stream_enc[j]->id) {

0 commit comments

Comments
 (0)