Commit 83e6667b authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher

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: default avatarEric Bernstein <eric.bernstein@amd.com>
Acked-by: default avatarBindu Ramamurthy <bindu.r@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 688f97ed
...@@ -480,7 +480,6 @@ unsigned int dcn10_get_dig_frontend(struct link_encoder *enc) ...@@ -480,7 +480,6 @@ unsigned int dcn10_get_dig_frontend(struct link_encoder *enc)
break; break;
default: default:
// invalid source select DIG // invalid source select DIG
ASSERT(false);
result = ENGINE_ID_UNKNOWN; result = ENGINE_ID_UNKNOWN;
} }
......
...@@ -539,6 +539,8 @@ void dcn30_init_hw(struct dc *dc) ...@@ -539,6 +539,8 @@ void dcn30_init_hw(struct dc *dc)
fe = dc->links[i]->link_enc->funcs->get_dig_frontend( fe = dc->links[i]->link_enc->funcs->get_dig_frontend(
dc->links[i]->link_enc); dc->links[i]->link_enc);
if (fe == ENGINE_ID_UNKNOWN)
continue;
for (j = 0; j < dc->res_pool->stream_enc_count; j++) { for (j = 0; j < dc->res_pool->stream_enc_count; j++) {
if (fe == dc->res_pool->stream_enc[j]->id) { if (fe == dc->res_pool->stream_enc[j]->id) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment