diff options
author | Leo (Hanghong) Ma <hanghong.ma@amd.com> | 2021-10-01 22:36:20 +0800 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2021-10-06 15:50:33 -0400 |
commit | 4874ecf5fd1de008756a76796bf255d3b19715c1 (patch) | |
tree | b71e340b8ed6d622b1e44fb202f038f36880d903 | |
parent | 8da5cbafb2ea1c33964ed6e5c79e9f2ebe001b57 (diff) | |
download | linux-4874ecf5fd1de008756a76796bf255d3b19715c1.tar.bz2 |
drm/amd/display: Fix error in dmesg at boot
[Why]
During DQE's promotion test, error appears in dmesg at boot
on dcn3.1;
[How]
Add NULL pointor check for the pointor to the amdgpu_dm_connector;
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Solomon Chiu <solomon.chiu@amd.com>
Signed-off-by: Leo (Hanghong) Ma <hanghong.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 81bf1e5a64c8..64b9c493dce2 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -1917,7 +1917,7 @@ void blank_all_dp_displays(struct dc *dc, bool hw_init) if ((signal == SIGNAL_TYPE_EDP) || (signal == SIGNAL_TYPE_DISPLAY_PORT)) { - if (hw_init && signal != SIGNAL_TYPE_EDP) { + if (hw_init && signal != SIGNAL_TYPE_EDP && dc->links[i]->priv != NULL) { /* DP 2.0 spec requires that we read LTTPR caps first */ dp_retrieve_lttpr_cap(dc->links[i]); /* if any of the displays are lit up turn them off */ @@ -1943,7 +1943,7 @@ void blank_all_dp_displays(struct dc *dc, bool hw_init) } if (!dc->links[i]->wa_flags.dp_keep_receiver_powered || - (hw_init && signal != SIGNAL_TYPE_EDP)) + (hw_init && signal != SIGNAL_TYPE_EDP && dc->links[i]->priv != NULL)) dp_receiver_power_ctrl(dc->links[i], false); } } |