]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/display: Don't report fake sink as connected
authorHarry Wentland <harry.wentland@amd.com>
Thu, 17 Aug 2017 18:58:07 +0000 (14:58 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 21 Oct 2017 20:40:27 +0000 (16:40 -0400)
This was missed in the previous fake sink change. The fake sink
allows us to enable a pipe with a disconnected display. We
shouldn't report it as connected.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 8cc228ebdc9a67c92d2f9aacb777476de6110256..75212f74f027b62e2271088a2717bd57e38ef0b7 100644 (file)
@@ -2453,7 +2453,8 @@ amdgpu_dm_connector_detect(struct drm_connector *connector, bool force)
         * 2. This interface *is called* in context of user-mode ioctl. Which
         * makes it a bad place for *any* MST-related activit. */
 
-       if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
+       if (aconnector->base.force == DRM_FORCE_UNSPECIFIED &&
+           !aconnector->fake_enable)
                connected = (aconnector->dc_sink != NULL);
        else
                connected = (aconnector->base.force == DRM_FORCE_ON);