Skip to content

Commit c471062

Browse files
Timur Kristófgregkh
authored andcommitted
drm/amd/display: Don't warn when missing DCE encoder caps
[ Upstream commit 8246147 ] On some GPUs the VBIOS just doesn't have encoder caps, or maybe not for every encoder. This isn't really a problem and it's handled well, so let's not litter the logs with it. Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Rodrigo Siqueira <siqueira@igalia.com> Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 33e0227) Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent c89a3d2 commit c471062

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,13 +896,13 @@ void dce110_link_encoder_construct(
896896
enc110->base.id, &bp_cap_info);
897897

898898
/* Override features with DCE-specific values */
899-
if (BP_RESULT_OK == result) {
899+
if (result == BP_RESULT_OK) {
900900
enc110->base.features.flags.bits.IS_HBR2_CAPABLE =
901901
bp_cap_info.DP_HBR2_EN;
902902
enc110->base.features.flags.bits.IS_HBR3_CAPABLE =
903903
bp_cap_info.DP_HBR3_EN;
904904
enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
905-
} else {
905+
} else if (result != BP_RESULT_NORECORD) {
906906
DC_LOG_WARNING("%s: Failed to get encoder_cap_info from VBIOS with error code %d!\n",
907907
__func__,
908908
result);
@@ -1798,13 +1798,13 @@ void dce60_link_encoder_construct(
17981798
enc110->base.id, &bp_cap_info);
17991799

18001800
/* Override features with DCE-specific values */
1801-
if (BP_RESULT_OK == result) {
1801+
if (result == BP_RESULT_OK) {
18021802
enc110->base.features.flags.bits.IS_HBR2_CAPABLE =
18031803
bp_cap_info.DP_HBR2_EN;
18041804
enc110->base.features.flags.bits.IS_HBR3_CAPABLE =
18051805
bp_cap_info.DP_HBR3_EN;
18061806
enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
1807-
} else {
1807+
} else if (result != BP_RESULT_NORECORD) {
18081808
DC_LOG_WARNING("%s: Failed to get encoder_cap_info from VBIOS with error code %d!\n",
18091809
__func__,
18101810
result);

0 commit comments

Comments
 (0)