Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_connectors.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 65d1b23..b9c11c2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -1414,10 +1414,12 @@ out:
                pm_runtime_put_autosuspend(connector->dev->dev);
        }
 
-       drm_dp_set_subconnector_property(&amdgpu_connector->base,
-                                        ret,
-                                        amdgpu_dig_connector->dpcd,
-                                        amdgpu_dig_connector->downstream_ports);
+       if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+           connector->connector_type == DRM_MODE_CONNECTOR_eDP)
+               drm_dp_set_subconnector_property(&amdgpu_connector->base,
+                                                ret,
+                                                amdgpu_dig_connector->dpcd,
+                                                amdgpu_dig_connector->downstream_ports);
        return ret;
 }