summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhan liu <zhan.liu@amd.com>2019-11-01 22:47:00 -0400
committerZhan liu <zhan.liu@amd.com>2019-11-01 22:47:00 -0400
commit7af3b66aba4c3982167d540c01ea71735e9a1264 (patch)
treedd69a52f793cbdefa28f266d356a8c6e3fafc2fb
parent52f70af32a6cef1ec5735145486d9154ab1248ac (diff)
drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14amd-mainline-dkms-5.0
[Why] Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is no ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related issues (e.g. HDMI S3 resume failure, HDMI pink screen on boot) will be observed. [How] If "eng_id" is larger than ENGINE_ID_DIGD, then add "eng_id" by 1. Signed-off-by: Zhan Liu <zhan.liu@amd.com> Reviewed-by: Hersen Wu <hersenxs.wu@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index d6f88b0e7fc7..dddfd3ecc276 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1119,6 +1119,11 @@ struct stream_encoder *dcn20_stream_encoder_create(
if (!enc1)
return NULL;
+ if (ASICREV_IS_NAVI14_M(ctx->asic_id.hw_internal_rev)) {
+ if (eng_id >= ENGINE_ID_DIGD)
+ eng_id++;
+ }
+
dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
&stream_enc_regs[eng_id],
&se_shift, &se_mask);