drm/amd/display: Do not warn NULL dc_sink if forcing connector
authorVictor Lu <victorchengchi.lu@amd.com>
Tue, 29 Sep 2020 20:03:10 +0000 (16:03 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 2 Nov 2020 20:31:37 +0000 (15:31 -0500)
[why]
There is a DRM_ERROR when the dc_sink is NULL and
there should not be this warning when the connector
is forced.

[how]
Do not warn if dc_sink is NULL if the connector
is forced.

Signed-off-by: Victor Lu <victorchengchi.lu@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 0448835..170beee 100644 (file)
@@ -5833,7 +5833,8 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec
 
        dc_sink = to_amdgpu_dm_connector(connector)->dc_sink;
 
-       if (dc_sink == NULL) {
+       if (dc_sink == NULL && aconnector->base.force != DRM_FORCE_ON_DIGITAL &&
+                               aconnector->base.force != DRM_FORCE_ON) {
                DRM_ERROR("dc_sink is NULL!\n");
                goto fail;
        }