Commit 8246147f authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

drm/amd/display: Don't warn when missing DCE encoder caps 



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: default avatarTimur Kristóf <timur.kristof@gmail.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <siqueira@igalia.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 33e0227e)
parent 7d07140d

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

+4 −4
Original line number Diff line number Diff line
@@ -896,13 +896,13 @@ void dce110_link_encoder_construct( 
						enc110->base.id, &bp_cap_info);



	/* Override features with DCE-specific values */

	if (BP_RESULT_OK == result) {

	if (result == BP_RESULT_OK) {

		enc110->base.features.flags.bits.IS_HBR2_CAPABLE =

				bp_cap_info.DP_HBR2_EN;

		enc110->base.features.flags.bits.IS_HBR3_CAPABLE =

				bp_cap_info.DP_HBR3_EN;

		enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;

	} else {

	} else if (result != BP_RESULT_NORECORD) {

		DC_LOG_WARNING("%s: Failed to get encoder_cap_info from VBIOS with error code %d!\n",

				__func__,

				result);
@@ -1798,13 +1798,13 @@ void dce60_link_encoder_construct( 
						enc110->base.id, &bp_cap_info);



	/* Override features with DCE-specific values */

	if (BP_RESULT_OK == result) {

	if (result == BP_RESULT_OK) {

		enc110->base.features.flags.bits.IS_HBR2_CAPABLE =

				bp_cap_info.DP_HBR2_EN;

		enc110->base.features.flags.bits.IS_HBR3_CAPABLE =

				bp_cap_info.DP_HBR3_EN;

		enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;

	} else {

	} else if (result != BP_RESULT_NORECORD) {

		DC_LOG_WARNING("%s: Failed to get encoder_cap_info from VBIOS with error code %d!\n",

				__func__,

				result);